Attachment 'qt3mac.patch.txt'

Download

   1 diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf
   2 --- qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf	2005-09-02 14:43:36.000000000 +0200
   3 +++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf	2005-10-09 20:21:18.000000000 +0200
   4 @@ -26,6 +26,7 @@
   5  QMAKE_CFLAGS_DEBUG	= -g
   6  QMAKE_CFLAGS_SHLIB	= -fPIC
   7  QMAKE_EXTENSION_SHLIB	= dylib
   8 +QMAKE_EXTENSION_PLUGIN  = so
   9  QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
  10  
  11  QMAKE_CXX		= c++
  12 @@ -38,9 +39,9 @@
  13  QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
  14  QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
  15  
  16 -QMAKE_LIBDIR		=
  17 -QMAKE_INCDIR_QT		= $(QTDIR)/include
  18 -QMAKE_LIBDIR_QT		= $(QTDIR)/lib
  19 +QMAKE_LIBDIR		= @PREFIX@/lib/qt3mac/lib
  20 +QMAKE_INCDIR_QT		= @PREFIX@/lib/qt3mac/include
  21 +QMAKE_LIBDIR_QT		= @PREFIX@/lib/qt3mac/lib
  22  QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
  23  	/System/Library/Frameworks/AGL.framework/Headers/
  24  
  25 @@ -51,12 +52,12 @@
  26  QMAKE_LFLAGS_RELEASE	=
  27  QMAKE_LFLAGS_DEBUG	=
  28  QMAKE_LFLAGS_APP	= -prebind
  29 -QMAKE_LFLAGS_SHLIB	= -prebind -dynamiclib 
  30 -QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
  31 +QMAKE_LFLAGS_SHLIB	= -prebind -dynamiclib -single_module
  32 +QMAKE_LFLAGS_INCREMENTAL = -undefined dynamic_lookup
  33  QMAKE_LFLAGS_PLUGIN	= -bundle
  34  #You probably don't want to mess with this, instead look at install_name_tool(1)
  35  #QMAKE_LFLAGS_SONAME	= -install_name$${LITERAL_WHITESPACE}@executable_path/../Frameworks/
  36 -QMAKE_LFLAGS_SONAME	= -install_name$${LITERAL_WHITESPACE}
  37 +QMAKE_LFLAGS_SONAME	= -install_name$${LITERAL_WHITESPACE}$$QMAKE_LIBDIR/
  38  QMAKE_LFLAGS_THREAD	= 
  39  
  40  QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
  41 @@ -64,7 +65,7 @@
  42  
  43  QMAKE_RPATH		= 
  44  
  45 -QMAKE_LIBS_DYNLOAD	=
  46 +QMAKE_LIBS_DYNLOAD	= -ldl
  47  QMAKE_LIBS_QT		= -lqt
  48  QMAKE_LIBS_QT_THREAD	= -lqt-mt
  49  QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
  50 diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h
  51 --- qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h	2005-05-05 02:17:04.000000000 +0200
  52 +++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h	2005-10-09 16:17:40.000000000 +0200
  53 @@ -22,6 +22,7 @@
  54  #include <grp.h>
  55  #include <pwd.h>
  56  #include <signal.h>
  57 +#include <dlfcn.h>
  58  #define QT_NO_LIBRARY_UNLOAD
  59  
  60  #include <sys/types.h>
  61 diff -Naur qt-mac-free-3.3.5/src/network/qdns.cpp qt-mac-free-3.3.5_corr/src/network/qdns.cpp
  62 --- qt-mac-free-3.3.5/src/network/qdns.cpp	2005-09-02 14:42:59.000000000 +0200
  63 +++ qt-mac-free-3.3.5_corr/src/network/qdns.cpp	2005-10-09 20:28:15.000000000 +0200
  64 @@ -76,7 +76,8 @@
  65  #include "qcleanuphandler.h"
  66  #include <limits.h>
  67  #ifdef Q_OS_MAC
  68 -#include "../3rdparty/dlcompat/dlfcn.h"
  69 +#include <dlfcn.h>
  70 +#define DL_PREFIX(x) x
  71  #endif
  72  
  73  //#define QDNS_DEBUG
  74 diff -Naur qt-mac-free-3.3.5/src/qt_professional.pri qt-mac-free-3.3.5_corr/src/qt_professional.pri
  75 --- qt-mac-free-3.3.5/src/qt_professional.pri	2004-02-06 13:08:19.000000000 +0100
  76 +++ qt-mac-free-3.3.5_corr/src/qt_professional.pri	2005-10-09 16:20:08.000000000 +0200
  77 @@ -25,7 +25,6 @@
  78  	unix {
  79  		NETWORK_H	= $$NETWORK_CPP
  80  	}
  81 -	mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
  82  	INCLUDEPATH += $$QT_SOURCE_TREE/src/network
  83  	include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
  84  	DEFINES     *= QT_MODULE_NETWORK
  85 diff -Naur qt-mac-free-3.3.5/src/tools/qt_tools.pri qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri
  86 --- qt-mac-free-3.3.5/src/tools/qt_tools.pri	2004-04-01 12:20:06.000000000 +0200
  87 +++ qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri	2005-10-09 16:22:01.000000000 +0200
  88 @@ -101,10 +101,6 @@
  89  		  $$TOOLS_CPP/qwaitcondition_unix.cpp
  90  
  91          mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
  92 -	mac {
  93 -		SOURCES+=3rdparty/dlcompat/dlfcn.c
  94 -		INCLUDEPATH+=3rdparty/dlcompat
  95 -	    }
  96  	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
  97  
  98  	SOURCES += $$TOOLS_CPP/qbitarray.cpp \

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.

You are not allowed to attach a file to this page.