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

[Ronald van Haren]

    Date: Wednesday, August 4, 2010 @ 04:11:11
  Author: ronald
Revision: 86778

remove patch, new source file includes patch

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-04 01:43:56 UTC (rev 86777)
+++ PKGBUILD	2010-08-04 08:11:11 UTC (rev 86778)
@@ -25,16 +25,10 @@
 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"
-	'fix-printer-applet-pyqt4.7.4.patch')
-sha1sums=('a7852a334b47068bf02de51e3dbce804397f0c1c'
-	'4353600f87ee04d6ee4bcd9100ad788661eccc7c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('19a8299cc26f0853a1e5a161d604847f6d5be80d')
 
 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

Deleted: fix-printer-applet-pyqt4.7.4.patch
===================================================================
--- fix-printer-applet-pyqt4.7.4.patch	2010-08-04 01:43:56 UTC (rev 86777)
+++ fix-printer-applet-pyqt4.7.4.patch	2010-08-04 08:11:11 UTC (rev 86778)
@@ -1,15 +0,0 @@
---- 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)