diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD index 3da719e0c..e5ba77759 100644 --- a/kdebase-workspace/PKGBUILD +++ b/kdebase-workspace/PKGBUILD @@ -35,7 +35,7 @@ license=('GPL' 'LGPL' 'FDL') options=('docs' '!splithdr' 'splitdbg' 'log') # NOTE keep in sync with kdebase-workspace-depends -depends=('polkit-kde' "kdepimlibs>=${_kdever}" 'qimageblitz' +depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" 'qimageblitz' 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit" 'libxdamage' 'xorg-utils' 'libxrandr') # "kdepim-runtime>=${_kdever}" @@ -225,7 +225,7 @@ package_kdebase-workspace() # FIXME don't find google-gadgets and gpsd can't be build cos of liblesstif # NOTE keep in sync with depends - depends=('polkit-kde' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qimageblitz' + depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qimageblitz' 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit" 'libxdamage' 'xorg-utils' 'libxrandr') # "kdepim-runtime>=${_kdever}" diff --git a/support-pkg-polkit-kde/PKGBUILD b/support-pkg-polkit-kde-agent/PKGBUILD similarity index 70% rename from support-pkg-polkit-kde/PKGBUILD rename to support-pkg-polkit-kde-agent/PKGBUILD index ac69ec5c1..538eb2fc2 100644 --- a/support-pkg-polkit-kde/PKGBUILD +++ b/support-pkg-polkit-kde-agent/PKGBUILD @@ -7,29 +7,26 @@ # include global config source ../_buildscripts/${current_repo}-${_arch}-cfg.conf -pkgname=polkit-kde -pkgver=0.95.1 -pkgrel=3 +pkgname=polkit-kde-agent +pkgver=0.99.0 +pkgrel=1 pkgdesc='KDE PolicyKit Authentication Agent' arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL') depends=('kdelibs') +replaces=('polkit-kde') makedepends=('cmake' 'automoc4') groups=("kde-uninstall" "kde-support") -source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2" - 'xdg-path.patch' - 'gcc45.patch') -md5sums=('68e40d2a43335cb5876a1c8bc51c461b' - '84d4873e60c1b628bcbaaf38c7ab2f44' - 'f00a359d35bfbedb47662341d5fd160e') +source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2') + +md5sums=('a02d3fddc6270a88bceaf3ba604c92f8') build() { cd ${srcdir}/${pkgname}-1-${pkgver} - patch -p0 -i ${srcdir}/xdg-path.patch || return 1 - patch -p0 -i ${srcdir}/gcc45.patch || return 1 + cd .. - mkdir build + mkdir -p build cd build export XDG_CONFIG_DIRS=/etc/xdg cmake ../${pkgname}-1-${pkgver} \ diff --git a/support-pkg-polkit-kde/gcc45.patch b/support-pkg-polkit-kde/gcc45.patch deleted file mode 100644 index 478b1660c..000000000 --- a/support-pkg-polkit-kde/gcc45.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/AuthDialog.cpp 2010-04-10 10:13:18.634941750 +0200 -+++ agent/AuthDialog.cpp 2010-04-10 10:13:56.021565836 +0200 -@@ -169,7 +169,7 @@ - foreach(PolkitQt1::Identity *identity, identities) { - // First check to see if the user is valid - qDebug() << "User: " << identity; -- KUser user = KUser::KUser(identity->toString().remove("unix-user:")); -+ KUser user = KUser(identity->toString().remove("unix-user:")); - if (!user.isValid()) { - kWarning() << "User invalid: " << user.loginName(); - continue; diff --git a/support-pkg-polkit-kde/xdg-path.patch b/support-pkg-polkit-kde/xdg-path.patch deleted file mode 100644 index 872523bb3..000000000 --- a/support-pkg-polkit-kde/xdg-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/CMakeLists.txt 2009-12-23 12:31:29.000000000 +0100 -+++ agent/CMakeLists.txt 2010-02-10 21:26:05.183779591 +0100 -@@ -18,8 +18,8 @@ - - install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR}) - --# Install .desktop file to the XDG_CONFIG_DIRS if exists, to the /etc/xdg/autostart otherwise --set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS}) -+# Install .desktop file to the XDG_CONFIG_DIRS/autostart if exists, to the /etc/xdg/autostart otherwise -+set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS}/autostart) - if (DESKTOP_INSTALL_DIR) - else (DESKTOP_INSTALL_DIR) - set (DESKTOP_INSTALL_DIR /etc/xdg/autostart)