Date: Monday, May 23, 2011 @ 16:09:09 Author: andrea Revision: 124663
KDE 4.7beta1 Added: kdebase-workspace/kde-unstable/ Modified: kdebase-workspace/kde-unstable/PKGBUILD Deleted: kdebase-workspace/kde-unstable/nm-09.patch -------------+ PKGBUILD | 30 ++++++++++++++++-------------- nm-09.patch | 34 ---------------------------------- 2 files changed, 16 insertions(+), 48 deletions(-) Modified: kde-unstable/PKGBUILD =================================================================== --- trunk/PKGBUILD 2011-05-23 20:07:48 UTC (rev 124662) +++ kde-unstable/PKGBUILD 2011-05-23 20:09:09 UTC (rev 124663) @@ -3,7 +3,8 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=kdebase-workspace -pkgver=4.6.3 +_pkgname=kde-workspace +pkgver=4.6.80 pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') @@ -13,11 +14,11 @@ # note on libxdamage: # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate' +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' - 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez' - 'python2' 'kdebindings-python') + 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager') +# 'kdebindings-python') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') install="${pkgname}.install" @@ -26,35 +27,36 @@ 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver') options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"; +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"; 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'nm-09.patch') -sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${_pkgname}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch - patch -p1 -i ${srcdir}/nm-09.patch cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_Prison=OFF \ + -DKWIN_MOBILE_EFFECTS=OFF make } Deleted: kde-unstable/nm-09.patch =================================================================== --- trunk/nm-09.patch 2011-05-23 20:07:48 UTC (rev 124662) +++ kde-unstable/nm-09.patch 2011-05-23 20:09:09 UTC (rev 124663) @@ -1,34 +0,0 @@ ---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29 03:43:20.321994578 -0700 -+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29 03:43:33.271995023 -0700 -@@ -17,7 +17,7 @@ - add_subdirectory(networkmanager-0.6) - endif (NM_0_6) - -- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7) -+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7) - if (NM_0_7) - message(STATUS "Will build networkmanager-0.7") - set(HAVE_NETWORKMANAGER TRUE) ---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~ 2011-04-29 03:32:33.838644845 -0700 -+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-29 03:40:52.308657544 -0700 -@@ -118,16 +118,16 @@ - uint deviceType = devIface.deviceType(); - NMNetworkInterface * createdInterface = 0; - switch ( deviceType ) { -- case DEVICE_TYPE_802_3_ETHERNET: -+ case NM_DEVICE_TYPE_ETHERNET: - createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager - break; -- case DEVICE_TYPE_802_11_WIRELESS: -+ case NM_DEVICE_TYPE_WIFI: - createdInterface = new NMWirelessNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_GSM: -+ case 3: - createdInterface = new NMGsmNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_CDMA: -+ case 4: - createdInterface = new NMCdmaNetworkInterface(uni, this, 0); - break; - /*
