diff options
author | Robert Xu <robxu9@gmail.com> | 2011-11-12 18:13:39 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-11-12 18:13:39 -0500 |
commit | cd1f97695be1245ab19058d4fbc34e5697cc5383 (patch) | |
tree | b265d96856632dc78e566d337f7eff254b6695f7 /opensuse/core/qt3/fix-GL-loading.diff | |
parent | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (diff) | |
download | tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.tar.gz tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.zip |
fix up tdebase and add qt3
Diffstat (limited to 'opensuse/core/qt3/fix-GL-loading.diff')
-rw-r--r-- | opensuse/core/qt3/fix-GL-loading.diff | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/opensuse/core/qt3/fix-GL-loading.diff b/opensuse/core/qt3/fix-GL-loading.diff new file mode 100644 index 000000000..61c2f379a --- /dev/null +++ b/opensuse/core/qt3/fix-GL-loading.diff @@ -0,0 +1,44 @@ +--- src/opengl/qgl_x11.cpp ++++ src/opengl/qgl_x11.cpp 2004/04/13 14:56:00 +@@ -267,7 +267,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 +Index: src/tools/qlibrary.cpp +=================================================================== +RCS file: /home/kde/qt-copy/src/tools/qlibrary.cpp,v +retrieving revision 1.26 +diff -u -3 -p -r1.26 qlibrary.cpp +--- src/tools/qlibrary.cpp 4 Feb 2004 14:25:02 -0000 1.26 ++++ src/tools/qlibrary.cpp 2 Jun 2004 08:26:21 -0000 +@@ -424,7 +424,8 @@ QString QLibrary::library() const + } else { + tmpfilename = QString( "lib%1" ).arg( filename ); + } +- tmpfilename += filter; ++ if ( !filename.contains(".so") ) ++ tmpfilename += filter; + if(QFile::exists(tmpfilename) || it == filters.end()) { + filename = tmpfilename; + break; +Index: src/opengl/qgl_x11.cpp +=================================================================== +RCS file: /home/kde/qt-copy/src/opengl/qgl_x11.cpp,v +retrieving revision 1.34 +diff -u -3 -p -r1.34 qgl_x11.cpp +--- src/opengl/qgl_x11.cpp 21 Dec 2003 00:48:09 -0000 1.34 ++++ src/opengl/qgl_x11.cpp 2 Jun 2004 08:26:21 -0000 +@@ -116,7 +116,7 @@ bool qt_resolve_gl_symbols(bool fatal) + if (gl_syms_resolved) + return TRUE; + +- QLibrary gl("GL"); ++ QLibrary gl("GL.so.1"); + gl.setAutoUnload(FALSE); + + qt_glCallLists = (_glCallLists) gl.resolve("glCallLists"); |