rev 15616 - in trunk/packages/kdeadmin/debian: . patches

[Didier Raboud]

Author: odyx-guest
Date: 2009-08-10 21:56:49 +0000 (Mon, 10 Aug 2009)
New Revision: 15616

Added:
   trunk/packages/kdeadmin/debian/patches/03_fix_runtime_fail_type_mismatch.diff
Removed:
   trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff
   trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff
Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/series
Log:
kdeadmin: Remove dirty 03_stick_to_qt.diff

- Rename 04_* to 03_* and update changelog accordingly.

Finally 540735 should probably be fixed in python-qt4.

[23:43] <OdyX> I linked/copied /usr/lib/pymodules/python2.5/PyQt4/uic/widget-plugins/kde4.py{,c} to /usr/share/python-qt4/widget-plugins 
[23:44] <OdyX> and it works !
[23:45] <pusling> interesting. must be something about some search paths maybe in qt ?
[23:45] <pusling> pyqt
[23:45] <OdyX> yeah... don't know...
[23:45] <OdyX> but it makes my dirty 03_* patch obsolete if I can find where this is to be fixed...
[23:46] <OdyX> this is probably in bindings...
[23:48] <pusling> it could be in pyqt the issue is, if it doesn't look up the right paths.



Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-08-10 20:13:37 UTC (rev 15615)
+++ trunk/packages/kdeadmin/debian/changelog	2009-08-10 21:56:49 UTC (rev 15616)
@@ -3,12 +3,7 @@
   * Refresh 01_system_config_printer_kde_cupsutils.diff to correctly import 
     options.py.
   * Add DEP-3 header to 02_kuser_first_uid_gid_fix.diff 
-  * Add bastard patch 03_stick_to_qt.diff to avoid a "missing kpushbutton" crash
-    (Closes: #540735).
-    - This patch is inherently broken as it forces the use of PyQT4 instead of 
-      upstream's use of PyKDE4.
-    - This is (IMHO) due to kde-bindings doing something false with python-kde4.
-  * Add patch 04_fix_runtime_fail_type_mismatch.diff to fix a runtime failure
+  * Add patch 03_fix_runtime_fail_type_mismatch.diff to fix a runtime failure
     due to type mismatch.
 
  -- Didier Raboud <didier at raboud.com>  Sat, 08 Aug 2009 21:42:18 +0200

Copied: trunk/packages/kdeadmin/debian/patches/03_fix_runtime_fail_type_mismatch.diff (from rev 15615, trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff)
===================================================================
--- trunk/packages/kdeadmin/debian/patches/03_fix_runtime_fail_type_mismatch.diff	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/patches/03_fix_runtime_fail_type_mismatch.diff	2009-08-10 21:56:49 UTC (rev 15616)
@@ -0,0 +1,33 @@
+Description: s-c-p-k fails with a type mismatch error - fix that.
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-10
+Index: kdeadmin-4.3.0/system-config-printer-kde/options.py
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/options.py        2009-08-10 15:18:28.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/options.py        2009-08-10 17:54:35.000000000 +0200
+@@ -131,14 +131,20 @@
+             if (type(self.widget) == QComboBox and
+                 self.ipp_type == str):
+                 self.widget.clear()
+-                for each in supported:
+-                    self.widget.addItem(each)
++                if type(supported) == list:
++                        for each in supported:
++                                self.widget.addItem(each)
++                else:
++                        self.widget.addItem(supported)
+             elif (type(self.widget) == QComboBox and
+                   self.ipp_type == int and
+                   self.combobox_map != None):
+                 self.widget.clear()
+-                for each in supported:
+-                    self.widget.addItem(self.combobox_dict[each])
++                if type(supported) == list:
++                        for each in supported:
++                                self.widget.addItem(self.combobox_dict[each])
++                else:
++                        self.widget.addItem(self.combobox_dict[supported])
+         if original_value != None:
+             self.original_value = self.ipp_type (original_value)
+             self.set_widget_value (self.original_value)

Modified: trunk/packages/kdeadmin/debian/patches/series
===================================================================
--- trunk/packages/kdeadmin/debian/patches/series	2009-08-10 20:13:37 UTC (rev 15615)
+++ trunk/packages/kdeadmin/debian/patches/series	2009-08-10 21:56:49 UTC (rev 15616)
@@ -1,4 +1,3 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
-03_stick_to_qt.diff
-04_fix_runtime_fail_type_mismatch.diff
+03_fix_runtime_fail_type_mismatch.diff