[arch-commits] Commit in kdebase-workspace (3 files)

[Andrea Scarpino]

    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'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          '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.patch	2012-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);