[Pkg-kde-commits] rev 1721 - in trunk/packages/qt-x11-free/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-09-06 20:18:05 +0000 (Tue, 06 Sep 2005)
New Revision: 1721

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
Log:
Fix OpenGL/libXmu loading.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-06 20:17:23 UTC (rev 1720)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-06 20:18:05 UTC (rev 1721)
@@ -49,6 +49,9 @@
   * Build the Qt styles as plugins. This does not affect the Qt buildkey,
     so shouldn't affect other packages.
 
+  * Revamp the OpenGL linking patch. This fixes the loading of libXmu, a
+    problem which affected some screensavers. (Closes: #296661)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 qt-x11-free (3:3.3.4-7) unstable; urgency=low

Modified: trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch	2005-09-06 20:17:23 UTC (rev 1720)
+++ trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch	2005-09-06 20:18:05 UTC (rev 1721)
@@ -1,33 +1,51 @@
 #! /bin/sh -e
-## 16_fix_opengl_check.dpatch by Martin Loschwitz <madkiss at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix handling of libGL.so.1 to not require the -dev packages (kudos to Ben Burton)
 
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
     exit 1
 fi
 
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
 case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
         exit 1;;
 esac
 
 exit 0
 
-diff -ruN qt-x11-free-3.3.3.old/src/opengl/qgl_x11.cpp qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp
---- qt-x11-free-3.3.3.old/src/opengl/qgl_x11.cpp	2004-08-05 14:42:12.000000000 +0000
-+++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp	2004-08-14 12:30:59.000000000 +0000
+ at DPATCH@
+--- qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp.orig	2004-08-18 14:55:20.629068213 +0200
++++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp	2004-08-18 15:00:43.090260739 +0200
 @@ -125,7 +125,7 @@
      if (gl_syms_resolved)
  	return TRUE;
  
 -    QLibrary gl("GL");
-+    QLibrary gl("/usr/lib/libGL.so.1");
++    QLibrary gl("GL.so.1");
      gl.setAutoUnload(FALSE);
  
      qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
+@@ -283,7 +283,7 @@
+ 	typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth,
+ 						      Atom property, Bool replace, Bool retain );
+ 	_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
+-	qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu", "XmuLookupStandardColormap");
++	qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
+ 	if (!qt_XmuLookupStandardColormap)
+ 	    qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
+ #define XmuLookupStandardColormap qt_XmuLookupStandardColormap
+--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp.orig	2004-08-18 14:56:00.322185890 +0200
++++ qt-x11-free-3.3.3/src/tools/qlibrary.cpp	2004-08-18 14:57:51.939637946 +0200
+@@ -425,6 +425,7 @@
+ 	    } else {
+ 		tmpfilename = QString( "lib%1" ).arg( filename );
+ 	    }
++	    if ( !filename.contains(".so") )
+ 	    tmpfilename += filter;
+ 	    if(QFile::exists(tmpfilename) || it == filters.end()) {
+ 		filename = tmpfilename;