Blame qt-x11-free-3.3.3-gl.patch
|
cvsdist |
66a4e11 |
--- qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp.orig 2004-08-18 14:55:20.629068213 +0200
|
|
cvsdist |
66a4e11 |
+++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp 2004-08-18 15:00:43.090260739 +0200
|
|
cvsdist |
66a4e11 |
@@ -125,7 +125,7 @@
|
|
cvsdist |
66a4e11 |
if (gl_syms_resolved)
|
|
cvsdist |
66a4e11 |
return TRUE;
|
|
cvsdist |
66a4e11 |
|
|
cvsdist |
66a4e11 |
- QLibrary gl("GL");
|
|
cvsdist |
66a4e11 |
+ QLibrary gl("GL.so.1");
|
|
cvsdist |
66a4e11 |
gl.setAutoUnload(FALSE);
|
|
cvsdist |
66a4e11 |
|
|
cvsdist |
66a4e11 |
qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
|
|
cvsdist |
66a4e11 |
@@ -283,7 +283,7 @@
|
|
cvsdist |
66a4e11 |
typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth,
|
|
cvsdist |
66a4e11 |
Atom property, Bool replace, Bool retain );
|
|
cvsdist |
66a4e11 |
_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
|
|
cvsdist |
66a4e11 |
- qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu", "XmuLookupStandardColormap");
|
|
cvsdist |
66a4e11 |
+ qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
|
|
cvsdist |
66a4e11 |
if (!qt_XmuLookupStandardColormap)
|
|
cvsdist |
66a4e11 |
qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
|
|
cvsdist |
66a4e11 |
#define XmuLookupStandardColormap qt_XmuLookupStandardColormap
|
|
cvsdist |
66a4e11 |
--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp.orig 2004-08-18 14:56:00.322185890 +0200
|
|
cvsdist |
66a4e11 |
+++ qt-x11-free-3.3.3/src/tools/qlibrary.cpp 2004-08-18 14:57:51.939637946 +0200
|
|
cvsdist |
66a4e11 |
@@ -425,6 +425,7 @@
|
|
cvsdist |
66a4e11 |
} else {
|
|
cvsdist |
66a4e11 |
tmpfilename = QString( "lib%1" ).arg( filename );
|
|
cvsdist |
66a4e11 |
}
|
|
cvsdist |
66a4e11 |
+ if ( !filename.contains(".so") )
|
|
cvsdist |
66a4e11 |
tmpfilename += filter;
|
|
cvsdist |
66a4e11 |
if(QFile::exists(tmpfilename) || it == filters.end()) {
|
|
cvsdist |
66a4e11 |
filename = tmpfilename;
|