[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fix-krunner-crash.patch)

[Andrea Scarpino]

Date: Wednesday, June 6, 2012 @ 12:14:35
  Author: andrea
Revision: 160828

KDE 4.8.4

Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/fix-krunner-crash.patch

-+
 PKGBUILD|   16 ++--
 fix-krunner-crash.patch |   13 -
 2 files changed, 6 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-06 16:14:32 UTC (rev 160827)
+++ PKGBUILD2012-06-06 16:14:35 UTC (rev 160828)
@@ -4,8 +4,8 @@
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.8.3
-pkgrel=2
+pkgver=4.8.4
+pkgrel=1
 pkgdesc=KDE Base Workspace
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,7 +18,7 @@
  'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
  'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
  'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst'
- 'xorg-xrandr' 'xorg-xmessage')
+ 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat')
 makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 install=${pkgname}.install
@@ -29,17 +29,15 @@
 options=('emptydirs')
 
source=(http://download.kde.org/stable/${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=('39ea3b9cc8e393ca1fd96238bce882b9ce58f58c'
   '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: fix-krunner-crash.patch
===
--- fix-krunner-crash.patch 2012-06-06 16:14:32 UTC (rev 160827)
+++ fix-krunner-crash.patch 2012-06-06 16:14:35 UTC (rev 160828)
@@ -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/trunk (PKGBUILD fix-krunner-crash.patch)

[Andrea Scarpino]

Date: Wednesday, May 9, 2012 @ 04:39:14
  Author: andrea
Revision: 158757

upgpkg: kdebase-workspace 4.8.3-2

Fix krunner crash with glibc 2.15 (FS#29467)

Added:
  kdebase-workspace/trunk/fix-krunner-crash.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

-+
 PKGBUILD|   10 +++---
 fix-krunner-crash.patch |   13 +
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-09 08:13:22 UTC (rev 158756)
+++ PKGBUILD2012-05-09 08:39:14 UTC (rev 158757)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE Base Workspace
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -29,7 +29,8 @@
 options=('emptydirs')
 
source=(http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz;
 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+'fix-krunner-crash.patch')
 sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
   '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
   '712a90999bd429883dcef5dcaf288aace332ced8'
@@ -37,13 +38,16 @@
   '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
   'd7b5883f7e65c6839b1f65f94d58026673dd0226'
   'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3'
-  'd509dac592bd8b310df27991b208c95b6d907514')
+  'd509dac592bd8b310df27991b208c95b6d907514'
+  'f898561d2b32dead8195f0610141edf7d423d46c')
 
 build() {
cd ${srcdir}/${_pkgname}-${pkgver}
patch -p1 -i ${srcdir}/kdm-xinitrd.patch
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

Added: fix-krunner-crash.patch
===
--- fix-krunner-crash.patch (rev 0)
+++ fix-krunner-crash.patch 2012-05-09 08:39:14 UTC (rev 158757)
@@ -0,0 +1,13 @@
+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);