config_files/patches/qt-3.3.3-load-gl.patch

   1 diff -Naur qt-3.3.3-original/src/opengl/qgl_x11.cpp qt-3.3.3-patched/src/opengl/qgl_x11.cpp
   2 --- qt-3.3.3-original/src/opengl/qgl_x11.cpp    2004-08-05 18:42:12.000000000 +0400
   3 +++ qt-3.3.3-patched/src/opengl/qgl_x11.cpp     2006-12-14 16:26:33.000000000 +0300
   4 @@ -125,7 +125,7 @@
   5      if (gl_syms_resolved)
   6         return TRUE;
   7
   8 -    QLibrary gl("GL");
   9 +    QLibrary gl("libGL.so.1");
  10      gl.setAutoUnload(FALSE);
  11
  12      qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
  13 diff -Naur qt-3.3.3-original/src/tools/qlibrary.cpp qt-3.3.3-patched/src/tools/qlibrary.cpp
  14 --- qt-3.3.3-original/src/tools/qlibrary.cpp    2004-08-05 18:41:55.000000000 +0400
  15 +++ qt-3.3.3-patched/src/tools/qlibrary.cpp     2006-12-14 16:29:26.000000000 +0300
  16 @@ -39,6 +39,7 @@
  17  #include "qplatformdefs.h"
  18  #include <private/qlibrary_p.h>
  19  #include <qstringlist.h>
  20 +#include <qregexp.h>
  21  #include <qfile.h>
  22
  23  #ifndef QT_NO_LIBRARY
  24 @@ -393,6 +394,8 @@
  25         return libfile;
  26
  27      QString filename = libfile;
  28 +    if (QFile::exists(filename))
  29 +       return filename;
  30
  31  #if defined(Q_WS_WIN)
  32      if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
  33 @@ -422,10 +425,11 @@
  34                 QString path = tmpfilename.left( x + 1 );
  35                 QString file = tmpfilename.right( tmpfilename.length() - x - 1 );
  36                 tmpfilename = QString( "%1lib%2" ).arg( path ).arg( file );
  37 -           } else {
  38 +            } else if (tmpfilename.left(3) != QString("lib")) {
  39                 tmpfilename = QString( "lib%1" ).arg( filename );
  40             }
  41 -           tmpfilename += filter;
  42 +            if (!tmpfilename.contains(QRegExp(filter + "((\\.[0-9]+)+)?$")))
  43 +               tmpfilename += filter;
  44             if(QFile::exists(tmpfilename) || it == filters.end()) {
  45                 filename = tmpfilename;
  46                 break;