rev 10218 - in trunk/packages/qt4-x11/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-21 16:22:19 +0000 (Mon, 21 Apr 2008)
New Revision: 10218

Added:
   trunk/packages/qt4-x11/debian/patches/16_always_init_prtxcursor.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Fix initialization of X11->ptrXcursorLibraryLoadCursor when libxcursor1 is not installed on the system (Closes grave: #476608)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-21 13:06:57 UTC (rev 10217)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-21 16:22:19 UTC (rev 10218)
@@ -32,8 +32,11 @@
     the specific plugin(s). Finally, this resolves circular dependencies among
     libqt4-sql and its plugins.
   * Add myself to Uploaders.
+  * Add 16_always_init_prtxcursor.diff, which properly initializes
+    X11->ptrXcursorLibraryLoadCursor to NULL when Xcursor library is not
+    available on the system. (Closes: #476608)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Apr 2008 13:24:08 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Apr 2008 19:17:19 +0300
 
 qt4-x11 (4.4.0~rc1-4) unstable; urgency=low
 

Added: trunk/packages/qt4-x11/debian/patches/16_always_init_prtxcursor.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_always_init_prtxcursor.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/16_always_init_prtxcursor.diff	2008-04-21 16:22:19 UTC (rev 10218)
@@ -0,0 +1,11 @@
+--- qt4-x11-4.4.0~rc1.orig/src/gui/kernel/qapplication_x11.cpp	2008-04-21 19:11:01.000000000 +0300
++++ qt4-x11-4.4.0~rc1/src/gui/kernel/qapplication_x11.cpp	2008-04-21 19:13:17.000000000 +0300
+@@ -1778,6 +1778,8 @@
+         if (xcursorLib.load()) {
+             X11->ptrXcursorLibraryLoadCursor =
+                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
++        } else {
++            X11->ptrXcursorLibraryLoadCursor = NULL;
+         }
+ #else
+         X11->ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-04-21 13:06:57 UTC (rev 10217)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-04-21 16:22:19 UTC (rev 10218)
@@ -26,6 +26,7 @@
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
+16_always_init_prtxcursor.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff