[arch-commits] Commit in kdebase-workspace (3 files)
Date: Friday, May 25, 2012 @ 15:59:17 Author: andrea Revision: 159532 KDE 4.9 Added: kdebase-workspace/kde-unstable/ Modified: kdebase-workspace/kde-unstable/PKGBUILD Deleted: kdebase-workspace/kde-unstable/fix-krunner-crash.patch -+ PKGBUILD| 24 ++-- fix-krunner-crash.patch | 13 - 2 files changed, 10 insertions(+), 27 deletions(-) Modified: kde-unstable/PKGBUILD === --- trunk/PKGBUILD 2012-05-25 14:33:21 UTC (rev 159498) +++ kde-unstable/PKGBUILD 2012-05-25 19:59:17 UTC (rev 159532) @@ -4,11 +4,11 @@ pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.8.3 -pkgrel=2 -pkgdesc=KDE Base Workspace +pkgver=4.8.80 +pkgrel=1 +pkgdesc=Provides the interface and basic tools for the KDE workspace arch=('i686' 'x86_64') -url='http://www.kde.org' +url='https://projects.kde.org/projects/kde/kde-workspace' license=('GPL' 'LGPL' 'FDL') groups=('kde') # note on libxdamage: @@ -17,8 +17,8 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' - 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' - 'xorg-xrandr' 'xorg-xmessage') + 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' + 'xorg-xmessage' 'libusb-compat') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install=${pkgname}.install @@ -27,19 +27,17 @@ 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver') options=('emptydirs') -source=(http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz; +source=(http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz; 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' -'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' -'fix-krunner-crash.patch') -sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2' +'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('4d07acfeddf522d6354bb4ee9330cdf0be8d06de' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3' - 'd509dac592bd8b310df27991b208c95b6d907514' - 'f898561d2b32dead8195f0610141edf7d423d46c') + 'd509dac592bd8b310df27991b208c95b6d907514') build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -47,8 +45,6 @@ patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch -patch -p1 -i ${srcdir}/fix-krunner-crash.patch - cd ${srcdir} mkdir build cd build Deleted: kde-unstable/fix-krunner-crash.patch === --- trunk/fix-krunner-crash.patch 2012-05-25 14:33:21 UTC (rev 159498) +++ kde-unstable/fix-krunner-crash.patch2012-05-25 19:59:17 UTC (rev 159532) @@ -1,13 +0,0 @@ -diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp -index ee55571..2f45153 100644 a/libs/plasmagenericshell/panelshadows.cpp -+++ b/libs/plasmagenericshell/panelshadows.cpp -@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString element) - { - #ifdef Q_WS_X11 - QPixmap pix = q-pixmap(element); --if (pix.handle() == 0) { -+if (!pix.isNull() pix.handle() == 0) { - Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32); - QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared); - tempPix.fill(Qt::transparent);
[arch-commits] Commit in kdebase-workspace (3 files)
Date: Thursday, September 8, 2011 @ 05:01:46 Author: andrea Revision: 137511 Enable Fake NetworkManager-0.9 solid module (FS#25923) Modified: kdebase-workspace/repos/extra-i686/PKGBUILD kdebase-workspace/repos/extra-x86_64/PKGBUILD kdebase-workspace/trunk/PKGBUILD -+ repos/extra-i686/PKGBUILD |6 +++--- repos/extra-x86_64/PKGBUILD |6 +++--- trunk/PKGBUILD | 36 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) Modified: repos/extra-i686/PKGBUILD === --- repos/extra-i686/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510) +++ repos/extra-i686/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511) @@ -5,7 +5,7 @@ pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=2 +pkgrel=4 pkgdesc=KDE Base Workspace arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,7 +17,8 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -55,7 +56,6 @@ -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ --DWITH_NetworkManager=OFF \ -DKWIN_MOBILE_EFFECTS=OFF \ -DWITH_OpenGLES=OFF \ -DKWIN_BUILD_WITH_OPENGLES=OFF Modified: repos/extra-x86_64/PKGBUILD === --- repos/extra-x86_64/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510) +++ repos/extra-x86_64/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511) @@ -5,7 +5,7 @@ pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=2 +pkgrel=4 pkgdesc=KDE Base Workspace arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,7 +17,8 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'i + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -55,7 +56,6 @@ -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ --DWITH_NetworkManager=OFF \ -DKWIN_MOBILE_EFFECTS=OFF \ -DWITH_OpenGLES=OFF \ -DKWIN_BUILD_WITH_OPENGLES=OFF Modified: trunk/PKGBUILD === --- trunk/PKGBUILD 2011-09-08 07:55:21 UTC (rev 137510) +++ trunk/PKGBUILD 2011-09-08 09:01:46 UTC (rev 137511) @@ -5,7 +5,7 @@ pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=3 +pkgrel=5 pkgdesc=KDE Base Workspace arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,7 +17,8 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'libegl') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -40,12 +41,12 @@ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3') build() { - 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 + 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 - cd ${srcdir} + cd ${srcdir} mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -55,23 +56,22 @@ -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ -
[arch-commits] Commit in kdebase-workspace (3 files)
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 pie...@archlinux.de 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' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3' - '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3') 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.patch2011-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
[arch-commits] Commit in kdebase-workspace (3 files)
Date: Wednesday, January 26, 2011 @ 19:57:51 Author: andrea Revision: 107781 cleanup Deleted: kdebase-workspace/kde-unstable/ kdebase-workspace/repos/kde-unstable-i686/ kdebase-workspace/repos/kde-unstable-x86_64/
[arch-commits] Commit in kdebase-workspace (3 files)
Date: Sunday, May 23, 2010 @ 20:50:32 Author: andrea Revision: 80932 first set of KDE 4.5 tarballs (4.4.80) Added: kdebase-workspace/kde-unstable/ Modified: kdebase-workspace/kde-unstable/PKGBUILD Deleted: kdebase-workspace/kde-unstable/screensaver-sleep.patch -+ PKGBUILD| 25 - screensaver-sleep.patch | 12 2 files changed, 12 insertions(+), 25 deletions(-) Modified: kde-unstable/PKGBUILD === --- trunk/PKGBUILD 2010-05-20 13:36:36 UTC (rev 80615) +++ kde-unstable/PKGBUILD 2010-05-24 00:50:32 UTC (rev 80932) @@ -1,9 +1,10 @@ # $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $ -# Maintainer: Pierre Schmitz pie...@archlinux.de +# Maintainer: Andrea Scarpino and...@archlinux.org +# Contributor: Pierre Schmitz pie...@archlinux.de pkgname=kdebase-workspace -pkgver=4.4.3 -pkgrel=2 +pkgver=4.4.80 +pkgrel=1 pkgdesc=KDE Base Workspace arch=('i686' 'x86_64') url='http://www.kde.org' @@ -13,10 +14,10 @@ # not detected by namcap because libgl depends on it # but nvidia providing libgl does not depend on libxdamage depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime' 'qimageblitz' - 'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' - 'libxdamage' 'xorg-utils' 'libxrandr') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python' - 'kdebindings-ruby') + 'libxxf86misc' 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage' +'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python') +# 'kdebindings-ruby') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde') install='kdebase-workspace.install' @@ -24,25 +25,23 @@ 'etc/pam.d/kde' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver') -source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2; +source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2; 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' -'fixpath.patch' 'terminate-server.patch' 'screensaver-sleep.patch') -sha1sums=('efd427dfe8b7beebdfe162006689871c61991336' +'fixpath.patch' 'terminate-server.patch') +sha1sums=('a31fcf38d6779139f01cab3116940789078d62fd' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3' - 'd676932e89f201d1f381615651761af1badb88be') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1 patch -p0 -i ${srcdir}/fixpath.patch || return 1 patch -p0 -i ${srcdir}/terminate-server.patch || return 1 -patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426 cd ${srcdir} mkdir build Deleted: kde-unstable/screensaver-sleep.patch === --- trunk/screensaver-sleep.patch 2010-05-20 13:36:36 UTC (rev 80615) +++ kde-unstable/screensaver-sleep.patch2010-05-24 00:50:32 UTC (rev 80932) @@ -1,12 +0,0 @@ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig 2010-04-29 21:54:40.0 +0200 -+++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp 2010-05-09 17:06:54.0 +0200 -@@ -571,7 +571,7 @@ - - void PowerDevilDaemon::buttonPressed(int but) - { --if (!checkIfCurrentSessionActive() || d-screenSaverIface-GetActive()) { -+if (!checkIfCurrentSessionActive()) { - return; - } - -