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

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-27 01:29:00 +0000 (Sun, 27 Apr 2008)
New Revision: 10294

Added:
   trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
   trunk/packages/qt4-x11/debian/rules
Log:
* Resurrect & extend my previous patch for #476608.
* Link against Xfixes, Xcursor, Xinemara instread of dlopening them, because the latter requires the user to have respective -dev packages installed.
* Optimize qmake (-O0 is policy violation).

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-26 22:52:19 UTC (rev 10293)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-27 01:29:00 UTC (rev 10294)
@@ -32,8 +32,19 @@
     the specific plugin(s). Finally, this resolves circular dependencies among
     libqt4-sql and its plugins.
   * Add myself to Uploaders.
+  * Add 16_always_init_qt_x11data_ptrx.diff, which ensures that X11->ptrX*
+    are properly initialized when Xcursor, Xinerama, Xfixes are not available
+    in default "runtime" configuration  (Closes: #476608).
+  * Pass -xfixes -xcursor -xinerama to configure because default "runtime"
+    configuration requires a user to have libxfixes-dev, libxcursor-dev and
+    libxinerama-dev installed to enable features requires respective X
+    libraries (QLibrary simply searches for "lib*.so"). This change in
+    configuration makes 16 patch irrelevant for Debian, but I'm leaving it
+    as it's still the fix for the crashes which might occur on default Qt 4.4
+    configutions.
+  * Optimize qmake: pass -optimized-qmake to configure.
 
- -- 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>  Sun, 27 Apr 2008 04:15:28 +0300
 
 qt4-x11 (4.4.0~rc1-4) unstable; urgency=low
 

Added: trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff	2008-04-27 01:29:00 UTC (rev 10294)
@@ -0,0 +1,33 @@
+--- qt4-x11-4.4.0~rc1.orig/src/gui/kernel/qapplication_x11.cpp	2008-04-21 19:16:19.000000000 +0300
++++ qt4-x11-4.4.0~rc1/src/gui/kernel/qapplication_x11.cpp	2008-04-27 03:40:39.000000000 +0300
+@@ -1743,6 +1743,10 @@
+             xfixesFound = X11->ptrXFixesQueryExtension
+                           && X11->ptrXFixesQueryVersion
+                           && X11->ptrXFixesSetCursorName;
++        } else {
++            X11->ptrXFixesQueryExtension = 0;
++            X11->ptrXFixesQueryVersion = 0;
++            X11->ptrXFixesSetCursorName = 0;
+         }
+ #else
+         bool xfixesFound = true;
+@@ -1778,6 +1782,8 @@
+         if (xcursorLib.load()) {
+             X11->ptrXcursorLibraryLoadCursor =
+                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
++        } else {
++            X11->ptrXcursorLibraryLoadCursor = 0;
+         }
+ #else
+         X11->ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
+@@ -1794,6 +1800,10 @@
+                 (PtrXineramaIsActive) xineramaLib.resolve("XineramaIsActive");
+             X11->ptrXineramaQueryScreens =
+                 (PtrXineramaQueryScreens) xineramaLib.resolve("XineramaQueryScreens");
++        } else {
++            X11->ptrXineramaQueryExtension = 0;
++            X11->ptrXineramaIsActive = 0;
++            X11->ptrXineramaQueryScreens = 0;
+         }
+ #else
+         X11->ptrXineramaQueryScreens = XineramaQueryScreens;

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-04-26 22:52:19 UTC (rev 10293)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-04-27 01:29:00 UTC (rev 10294)
@@ -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_qt_x11data_ptrx.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2008-04-26 22:52:19 UTC (rev 10293)
+++ trunk/packages/qt4-x11/debian/rules	2008-04-27 01:29:00 UTC (rev 10294)
@@ -87,12 +87,16 @@
 	            -examplesdir "/usr/lib/qt4/examples" \
 	            -platform $(PLATFORM_ARG) \
 	            -fast \
+	            -optimized-qmake \
 	            -no-rpath \
 	            -system-zlib \
 	            -system-libtiff \
 	            -system-libpng \
 	            -system-libjpeg \
 	            -system-nas-sound \
+	            -xfixes \
+	            -xcursor \
+	            -xinerama \
 	            -qt-gif \
 	            -plugin-sql-mysql \
 	            -plugin-sql-odbc \