[arch-commits] Commit in kdeadmin/trunk (PKGBUILD fix-when-accessing-the-KCM.patch)

[Andrea Scarpino]

    Date: Friday, March 26, 2010 @ 15:19:16
  Author: andrea
Revision: 73491

updated to KDE 4.4.2

Modified:
  kdeadmin/trunk/PKGBUILD
Deleted:
  kdeadmin/trunk/fix-when-accessing-the-KCM.patch

----------------------------------+
 PKGBUILD                         |   15 +++++----------
 fix-when-accessing-the-KCM.patch |   11 -----------
 2 files changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-26 19:19:10 UTC (rev 73490)
+++ PKGBUILD	2010-03-26 19:19:16 UTC (rev 73491)
@@ -6,8 +6,8 @@
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.4.1
-pkgrel=2
+pkgver=4.4.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -15,19 +15,14 @@
 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-when-accessing-the-KCM.patch')
-md5sums=('6a69c96bf7ad38ea78972e926a2281e7'
-         '41b71823c7a33975ec08aaf75d67a374'
-	 '3d79416bd7ac5a04f3ceae5529279c50')
+	'fix-syslog-path.patch')
+md5sums=('92d80ac84525c8160f42bf54ee6351df'
+         '41b71823c7a33975ec08aaf75d67a374')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 	patch -p1 -i ${srcdir}/fix-syslog-path.patch || return 1
 
-	# fixed in 4.4.2
-	patch -Np3 -i ${srcdir}/fix-when-accessing-the-KCM.patch || return 1
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Deleted: fix-when-accessing-the-KCM.patch
===================================================================
--- fix-when-accessing-the-KCM.patch	2010-03-26 19:19:10 UTC (rev 73490)
+++ fix-when-accessing-the-KCM.patch	2010-03-26 19:19:16 UTC (rev 73491)
@@ -1,11 +0,0 @@
---- trunk/KDE/kdeadmin/system-config-printer-kde/options.py	2010/01/25 07:05:28	1079837
-+++ trunk/KDE/kdeadmin/system-config-printer-kde/options.py	2010/03/04 20:36:46	1098974
-@@ -133,7 +133,7 @@
-                 self.widget.clear()
-                 if type(supported) == list:
-                     for each in supported:
--                        self.widget.addItem(self.combobox_dict[each])
-+                        self.widget.addItem(each)
-                 else:
-                     self.widget.addItem(self.combobox_dict[supported])
-             elif (type(self.widget) == QComboBox and