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

Didier Raboud odyx-guest at alioth.debian.org
Mon Aug 10 18:52:04 UTC 2009


Author: odyx-guest
Date: 2009-08-10 18:52:02 +0000 (Mon, 10 Aug 2009)
New Revision: 15612

Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff
Log:
kdeadmin: Update patch 03_stick_to_qt.diff and explain it a little better.



Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-08-10 18:35:39 UTC (rev 15611)
+++ trunk/packages/kdeadmin/debian/changelog	2009-08-10 18:52:02 UTC (rev 15612)
@@ -1,11 +1,13 @@
-kdeadmin (4:4.3.0-2) UNRELEASED; urgency=high
+kdeadmin (4:4.3.0-2) UNRELEASED; urgency=low
 
   * 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 patch 03_stick_to_qt.diff to avoid a "missing kpushbutton" crash
-    (Closes: #540735)
-    - Set urgency high for RC bugfixing.
+  * 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
     due to type mismatch.
 

Modified: trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff	2009-08-10 18:35:39 UTC (rev 15611)
+++ trunk/packages/kdeadmin/debian/patches/03_stick_to_qt.diff	2009-08-10 18:52:02 UTC (rev 15612)
@@ -1,13 +1,15 @@
 Description: Disable KDE-specific custom-widgets. pykdeuic.py and kde4.py are
  not found, not used and it simply fails.
+ - 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.
 Origin: vendor
 Author: Didier Raboud <didier at raboud.com>
 Bug: http://bugs.debian.org/540735
 Last-Update: 2009-08-10
 Index: kdeadmin-4.3.0/system-config-printer-kde/system-config-printer.ui
 ===================================================================
---- kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer.ui	2009-08-10 13:58:13.000000000 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer.ui	2009-08-10 14:00:07.000000000 +0200
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/system-config-printer.ui	2009-08-10 20:42:41.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/system-config-printer.ui	2009-08-10 20:47:43.000000000 +0200
 @@ -68,7 +68,7 @@
         <item>
          <layout class="QGridLayout" name="gridLayout">
@@ -182,3 +184,93 @@
   <resources/>
   <connections/>
  </ui>
+Index: kdeadmin-4.3.0/system-config-printer-kde/ipp-browse-dialog.ui
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/ipp-browse-dialog.ui	2009-08-10 20:48:20.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/ipp-browse-dialog.ui	2009-08-10 20:48:29.000000000 +0200
+@@ -38,7 +38,7 @@
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+-     <widget class="KPushButton" name="btnIPPBrowseRefresh" >
++     <widget class="QPushButton" name="btnIPPBrowseRefresh" >
+       <property name="text" >
+        <string>Refresh</string>
+       </property>
+@@ -58,7 +58,7 @@
+      </spacer>
+     </item>
+     <item>
+-     <widget class="KPushButton" name="btnIPPBrowseOk" >
++     <widget class="QPushButton" name="btnIPPBrowseOk" >
+       <property name="text" >
+        <string>Ok</string>
+       </property>
+@@ -68,7 +68,7 @@
+      </widget>
+     </item>
+     <item>
+-     <widget class="KPushButton" name="btnIPPBrowseCancel" >
++     <widget class="QPushButton" name="btnIPPBrowseCancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+@@ -112,13 +112,6 @@
+    </column>
+   </widget>
+  </widget>
+- <customwidgets>
+-  <customwidget>
+-   <class>KPushButton</class>
+-   <extends>QPushButton</extends>
+-   <header>kpushbutton.h</header>
+-  </customwidget>
+- </customwidgets>
+  <resources/>
+  <connections/>
+ </ui>
+Index: kdeadmin-4.3.0/system-config-printer-kde/smb-browse-dialog.ui
+===================================================================
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/smb-browse-dialog.ui	2009-08-10 20:47:56.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/smb-browse-dialog.ui	2009-08-10 20:48:14.000000000 +0200
+@@ -38,7 +38,7 @@
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+-     <widget class="KPushButton" name="btnSMBBrowseRefresh" >
++     <widget class="QPushButton" name="btnSMBBrowseRefresh" >
+       <property name="text" >
+        <string>Refresh</string>
+       </property>
+@@ -58,7 +58,7 @@
+      </spacer>
+     </item>
+     <item>
+-     <widget class="KPushButton" name="btnSMBBrowseOk" >
++     <widget class="QPushButton" name="btnSMBBrowseOk" >
+       <property name="text" >
+        <string>Ok</string>
+       </property>
+@@ -68,7 +68,7 @@
+      </widget>
+     </item>
+     <item>
+-     <widget class="KPushButton" name="btnSMBBrowseCancel" >
++     <widget class="QPushButton" name="btnSMBBrowseCancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+@@ -112,13 +112,6 @@
+    </column>
+   </widget>
+  </widget>
+- <customwidgets>
+-  <customwidget>
+-   <class>KPushButton</class>
+-   <extends>QPushButton</extends>
+-   <header>kpushbutton.h</header>
+-  </customwidget>
+- </customwidgets>
+  <resources/>
+  <connections/>
+ </ui>




More information about the pkg-kde-commits mailing list