[arch-commits] Commit in kdeutils/trunk (PKGBUILD fix-printer-applet-pyqt4.7.4.patch)

[Andrea Scarpino]

    Date: Friday, July 30, 2010 @ 13:11:29
  Author: andrea
Revision: 86364

fix printer applet with PyQt 4.7.4

Added:
  kdeutils/trunk/fix-printer-applet-pyqt4.7.4.patch
Modified:
  kdeutils/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   10 ++++++++--
 fix-printer-applet-pyqt4.7.4.patch |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-30 12:54:50 UTC (rev 86363)
+++ PKGBUILD	2010-07-30 17:11:29 UTC (rev 86364)
@@ -25,10 +25,16 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'docbook-xsl' 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a7852a334b47068bf02de51e3dbce804397f0c1c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+	'fix-printer-applet-pyqt4.7.4.patch')
+sha1sums=('a7852a334b47068bf02de51e3dbce804397f0c1c'
+	'4353600f87ee04d6ee4bcd9100ad788661eccc7c')
 
 build() {
+	# Already fixed in 4.5.1
+	cd ${srcdir}/${pkgbase}-${pkgver}
+	patch -Np4 -i ${srcdir}/fix-printer-applet-pyqt4.7.4.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build

Added: fix-printer-applet-pyqt4.7.4.patch
===================================================================
--- fix-printer-applet-pyqt4.7.4.patch	                        (rev 0)
+++ fix-printer-applet-pyqt4.7.4.patch	2010-07-30 17:11:29 UTC (rev 86364)
@@ -0,0 +1,15 @@
+--- branches/KDE/4.5/kdeutils/printer-applet/printer-applet.py	2010/07/29 11:37:43	1156612
++++ branches/KDE/4.5/kdeutils/printer-applet/printer-applet.py	2010/07/29 11:38:09	1156613
+@@ -237,10 +237,10 @@
+             APPDIR = file.left(file.lastIndexOf('/'))
+ 
+         self.mainWindow = MainWindow()
+-        uic.loadUi(APPDIR + '/' + "printer-applet.ui", self.mainWindow)
++        uic.loadUi(unicode(APPDIR + '/' + "printer-applet.ui"), self.mainWindow)
+ 
+         self.printersWindow = PrintersWindow(self)
+-        uic.loadUi(APPDIR + '/' + "printer-applet-printers.ui", self.printersWindow)
++        uic.loadUi(unicode(APPDIR + '/' + "printer-applet-printers.ui"), self.printersWindow)
+ 
+         self.sysTray = KStatusNotifierItem(self.mainWindow)
+         self.sysTray.setCategory(KStatusNotifierItem.Hardware)