[arch-commits] Commit in kdeadmin/repos/extra-i686 (2 files)

[Andrea Scarpino]

    Date: Thursday, July 29, 2010 @ 06:53:10
  Author: andrea
Revision: 86331

fix printer configuration KCM module (FS#20180)

Added:
  kdeadmin/repos/extra-i686/fix-system-config-printer-kde-pyqt4.7.4.patch
Modified:
  kdeadmin/repos/extra-i686/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |    9 ++++++---
 fix-system-config-printer-kde-pyqt4.7.4.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-29 10:53:03 UTC (rev 86330)
+++ PKGBUILD	2010-07-29 10:53:10 UTC (rev 86331)
@@ -7,7 +7,7 @@
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
 pkgver=4.4.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -15,13 +15,16 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdepimlibs' 'kdebase-runtime'
              'kdebindings-python' 'system-config-printer-common' 'kdepim-runtime')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-	'fix-syslog-path.patch')
+	'fix-syslog-path.patch'
+	'fix-system-config-printer-kde-pyqt4.7.4.patch')
 sha1sums=('b9d80b5db7dbcd00503688a02facce81f2fc0442'
-          'c9e7839ba3dd7be15ce140cfebc57c0f57871fdf')
+          'c9e7839ba3dd7be15ce140cfebc57c0f57871fdf'
+	  'ef1803589bc9b2f252a99c51f523eefc878e1b0a')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 	patch -p1 -i ${srcdir}/fix-syslog-path.patch || return 1
+	patch -Np3 -i ${srcdir}/fix-system-config-printer-kde-pyqt4.7.4.patch
 
 	cd ${srcdir}
 	mkdir build

Added: fix-system-config-printer-kde-pyqt4.7.4.patch
===================================================================
--- fix-system-config-printer-kde-pyqt4.7.4.patch	                        (rev 0)
+++ fix-system-config-printer-kde-pyqt4.7.4.patch	2010-07-29 10:53:10 UTC (rev 86331)
@@ -0,0 +1,20 @@
+--- trunk/KDE/kdeadmin/system-config-printer-kde/system-config-printer-kde.py	2010/07/28 12:28:36	1156005
++++ trunk/KDE/kdeadmin/system-config-printer-kde/system-config-printer-kde.py	2010/07/28 12:30:01	1156006
+@@ -101,7 +101,7 @@
+     def __init__(self, component_data, parent, gui):
+         KCModule.__init__(self, component_data, parent)
+ 
+-        uic.loadUi(APPDIR + "/" + "system-config-printer.ui", self)
++        uic.loadUi(unicode(APPDIR + "/" + "system-config-printer.ui"), self)
+         self.setButtons(KCModule.Apply)
+         self.gui = gui
+         
+@@ -2046,7 +2046,7 @@
+         self.WaitWindow = QMessageBox(self.mainapp)
+         self.WaitWindow.setStandardButtons(QMessageBox.NoButton)
+ 
+-        uic.loadUi(APPDIR + "/" + "new-printer.ui", self)
++        uic.loadUi(unicode(APPDIR + "/" + "new-printer.ui"), self)
+ 
+         self.btnNPBack.setIcon(KIcon("go-previous"))
+         self.btnNPForward.setIcon(KIcon("go-next"))