From 4a1e7123fd836f6bedf7752466be8999e2262e74 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 18 Feb 2007 15:43:12 +0000 Subject: [PATCH] Dropped ppc-macos keyword, see you in prefix Package-Manager: portage-2.1.1-r2 --- x11-libs/qt/Manifest | 50 +-- x11-libs/qt/files/qt-3.3.4-macos.patch | 468 ------------------------- x11-libs/qt/files/qt-3.3.5-macos.patch | 450 ------------------------ 3 files changed, 16 insertions(+), 952 deletions(-) delete mode 100644 x11-libs/qt/files/qt-3.3.4-macos.patch delete mode 100644 x11-libs/qt/files/qt-3.3.5-macos.patch diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index a33c4c85c8fd..3557b947eeca 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623 @@ -49,10 +46,6 @@ AUX qt-3.3.4-immodule-focus.patch 877 RMD160 64adf25a67c0eedad839925380c8fe77fb8 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877 RMD160 64adf25a67c0eedad839925380c8fe77fb887b9d files/qt-3.3.4-immodule-focus.patch 877 SHA256 4185c82a1fed2a8a69f95ab975582d33db4b542c96cc82e090d30e3a01297bdf files/qt-3.3.4-immodule-focus.patch 877 -AUX qt-3.3.4-macos.patch 18798 RMD160 824615ada3ea82e9ccde91814f47bac91026446c SHA1 ea947973ea4b80d422cb511fbfa571a09218f936 SHA256 fae7ae9dc04b44ce8e8751947eb77471175769ff6ad439e78e79879743ae35a6 -MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798 -RMD160 824615ada3ea82e9ccde91814f47bac91026446c files/qt-3.3.4-macos.patch 18798 -SHA256 fae7ae9dc04b44ce8e8751947eb77471175769ff6ad439e78e79879743ae35a6 files/qt-3.3.4-macos.patch 18798 AUX qt-3.3.4-qclipboard-hack.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb files/qt-3.3.4-qclipboard-hack.patch 1662 @@ -61,10 +54,6 @@ AUX qt-3.3.5-immodule.patch 773 RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c MD5 3e41898f6a3f5ff8518f5df0cb1e23cf files/qt-3.3.5-immodule.patch 773 RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c files/qt-3.3.5-immodule.patch 773 SHA256 a1cc1594c7795e034298aebb534bc4cb213af7fd0045036030d46e2c8f6edbd8 files/qt-3.3.5-immodule.patch 773 -AUX qt-3.3.5-macos.patch 18154 RMD160 3e9ffa9baf832ebc6f3e8a292f781b0a9e35740c SHA1 47bac925902b4c7853637fa5766de739989995ac SHA256 0515b66ccf539d2449b44c43873bd89f0ab6ea007488644e5170b50c84d2003e -MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154 -RMD160 3e9ffa9baf832ebc6f3e8a292f781b0a9e35740c files/qt-3.3.5-macos.patch 18154 -SHA256 0515b66ccf539d2449b44c43873bd89f0ab6ea007488644e5170b50c84d2003e files/qt-3.3.5-macos.patch 18154 AUX qt-3.3.6-CVE-2006-4811-bis.patch 4944 RMD160 3ec0629247b77fc0ffda9818a4ee2cb50c203168 SHA1 b70374b0457cdba4fd466031a8b7b99f20364ccb SHA256 de6b838047c217b129d9992a44972406eb1dc8c8d6d9a58c8520f95faaf92704 MD5 684040b974c8837a52c0e6733d4b0c22 files/qt-3.3.6-CVE-2006-4811-bis.patch 4944 RMD160 3ec0629247b77fc0ffda9818a4ee2cb50c203168 files/qt-3.3.6-CVE-2006-4811-bis.patch 4944 @@ -120,18 +109,18 @@ DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e4 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c DIST qt-x11-opensource-src-4.2.1.tar.gz 37069122 RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 SHA1 ef4d109608ea32d318b009c89f298da3d362e3fb SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c -EBUILD qt-3.3.4-r8.ebuild 10571 RMD160 8076da9bdc51b4a1afe6d41af1e7461ffaf53912 SHA1 6e1a9aa68ec178161d7c0883a2f818677d60731c SHA256 4bd92c255fa8c5be5a447b10b9c38273b72e2bf789d221a8f43566ac904bd577 -MD5 4a378f8d2a7a5ce1ab8f3acd835ffb90 qt-3.3.4-r8.ebuild 10571 -RMD160 8076da9bdc51b4a1afe6d41af1e7461ffaf53912 qt-3.3.4-r8.ebuild 10571 -SHA256 4bd92c255fa8c5be5a447b10b9c38273b72e2bf789d221a8f43566ac904bd577 qt-3.3.4-r8.ebuild 10571 -EBUILD qt-3.3.6-r4.ebuild 11096 RMD160 2d4f309135a3d620f4dccddb83f1eb193608bd20 SHA1 a46721a8b6e5f1fc30b7b156bc66333ea210645b SHA256 5bd20e5a2694894f4a9d9452ab7ad17f9ed7fa2380252e12a3f6d98515f5ea07 -MD5 0e23215c9996901d09144156d412bb6e qt-3.3.6-r4.ebuild 11096 -RMD160 2d4f309135a3d620f4dccddb83f1eb193608bd20 qt-3.3.6-r4.ebuild 11096 -SHA256 5bd20e5a2694894f4a9d9452ab7ad17f9ed7fa2380252e12a3f6d98515f5ea07 qt-3.3.6-r4.ebuild 11096 -EBUILD qt-3.3.6-r5.ebuild 11207 RMD160 990a948f8b2cdd072a4a9fcb9afe7e2582399af7 SHA1 e306a19495b1c00ec545cd78af3dc2bf6623157e SHA256 4bc8b8a294cab45ee031d704c13fb7b8009ef8d4eb19209fdefd8caeb099e10c -MD5 3dcfac82d07f3ff71b3bc32db936c242 qt-3.3.6-r5.ebuild 11207 -RMD160 990a948f8b2cdd072a4a9fcb9afe7e2582399af7 qt-3.3.6-r5.ebuild 11207 -SHA256 4bc8b8a294cab45ee031d704c13fb7b8009ef8d4eb19209fdefd8caeb099e10c qt-3.3.6-r5.ebuild 11207 +EBUILD qt-3.3.4-r8.ebuild 10491 RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 SHA1 03703f79f821ebf07cf4220d5368450099ebd36c SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6 +MD5 9cd4050cbf79528363ca2e0dbfbfd9fb qt-3.3.4-r8.ebuild 10491 +RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 qt-3.3.4-r8.ebuild 10491 +SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6 qt-3.3.4-r8.ebuild 10491 +EBUILD qt-3.3.6-r4.ebuild 11006 RMD160 5074eae8c52629128ec789e3b8580bb2f8373ca7 SHA1 ece478e4c1de636cd3b280f3496bafe4dbfcb070 SHA256 d5397c7c6fab19496ab1d36232fcc2317467baaa27eada8d8df251ef7ea06ca2 +MD5 d9d6a521694aa694ce6776ddfaa7322b qt-3.3.6-r4.ebuild 11006 +RMD160 5074eae8c52629128ec789e3b8580bb2f8373ca7 qt-3.3.6-r4.ebuild 11006 +SHA256 d5397c7c6fab19496ab1d36232fcc2317467baaa27eada8d8df251ef7ea06ca2 qt-3.3.6-r4.ebuild 11006 +EBUILD qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced SHA1 31cbe8b8bc65f57ff435afa036b545bb88f50466 SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 +MD5 9e4b234be100199e8a74f09e748ecd52 qt-3.3.6-r5.ebuild 11117 +RMD160 464d1a225f2ba385cc80e662046de4998c720ced qt-3.3.6-r5.ebuild 11117 +SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 qt-3.3.6-r5.ebuild 11117 EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff SHA1 dffa6d4bae33a49c7c75e6d75736b70f0228fb25 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855 @@ -144,10 +133,10 @@ EBUILD qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 SHA1 MD5 fe911ce7afaeeb22c93d7b6b02a633cb qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 qt-4.2.2.ebuild 7691 SHA256 9a283ff88292c02772d2b5cd508d4c510ccfe318f09ab15f1179f77416138ae2 qt-4.2.2.ebuild 7691 -MISC ChangeLog 24184 RMD160 fd681b5dc821041d7e7c57cde2e2a8116fecd899 SHA1 d151361ad65ad2f1f48721665124f350a593fe43 SHA256 191d0d4927471ca62a66fc5fe46078092ab515899a72fb77d68a0d3ca319fbde -MD5 7e323dc447c48ef0918354666d69cdcc ChangeLog 24184 -RMD160 fd681b5dc821041d7e7c57cde2e2a8116fecd899 ChangeLog 24184 -SHA256 191d0d4927471ca62a66fc5fe46078092ab515899a72fb77d68a0d3ca319fbde ChangeLog 24184 +MISC ChangeLog 24407 RMD160 bbfe1578cafdaef89b240984e99696ad1cb2c1c5 SHA1 c48b3e9286e1c498ff0bfacb96fa9c3dce136579 SHA256 3f1c19a168f5ad28494330b49d3518de7c362cfdcb8598f5e39ee70feaabf311 +MD5 658c0c8e818cec0a59ea8cc8e59bd5db ChangeLog 24407 +RMD160 bbfe1578cafdaef89b240984e99696ad1cb2c1c5 ChangeLog 24407 +SHA256 3f1c19a168f5ad28494330b49d3518de7c362cfdcb8598f5e39ee70feaabf311 ChangeLog 24407 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -170,10 +159,3 @@ SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/di MD5 521080f3e0b421ab5ad25f9dc25b69f1 files/digest-qt-4.2.2 289 RMD160 6d2f65f407b6e455d477a31d49d969eeaf6db6da files/digest-qt-4.2.2 289 SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/digest-qt-4.2.2 289 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFF0rG2NQqtfCuFneMRAog6AJ9JmYMSxc0KcO0XNchd2vd8draewgCfQZOt -SOUPq9Skj4UgY3UBSQR4HWY= -=Hl+G ------END PGP SIGNATURE----- diff --git a/x11-libs/qt/files/qt-3.3.4-macos.patch b/x11-libs/qt/files/qt-3.3.4-macos.patch deleted file mode 100644 index 665d2d8d5623..000000000000 --- a/x11-libs/qt/files/qt-3.3.4-macos.patch +++ /dev/null @@ -1,468 +0,0 @@ -diff -Naur qt-x11-free-3.3.4.orig/include/qglobal.h qt-x11-free-3.3.4/include/qglobal.h ---- qt-x11-free-3.3.4.orig/include/qglobal.h 2005-07-17 01:04:24.000000000 -0500 -+++ qt-x11-free-3.3.4/include/qglobal.h 2005-07-17 01:05:17.000000000 -0500 -@@ -79,6 +79,10 @@ - UNIX - Any UNIX BSD/SYSV system - */ - -+#ifndef __DARWIN_X11__ -+#define __DARWIN_X11__ -+#endif -+ - #if defined(__DARWIN_X11__) - # define Q_OS_DARWIN - #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__)) -@@ -545,6 +549,8 @@ - - #if defined(Q_OS_MAC9) - # define Q_WS_MAC9 -+#elif defined(__DARWIN_X11__) -+# define Q_WS_X11 - #elif defined(Q_OS_MSDOS) - # define Q_WS_WIN16 - # error "Qt requires Win32 and does not work with Windows 3.x" -diff -Naur qt-x11-free-3.3.4.orig/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.4/mkspecs/darwin-g++/qmake.conf ---- qt-x11-free-3.3.4.orig/mkspecs/darwin-g++/qmake.conf 2005-07-17 01:04:15.000000000 -0500 -+++ qt-x11-free-3.3.4/mkspecs/darwin-g++/qmake.conf 2005-07-17 01:10:56.000000000 -0500 -@@ -9,7 +9,7 @@ - MAKEFILE_GENERATOR = UNIX - TEMPLATE = app - CONFIG += qt warn_on release native_precompiled_headers --CONFIG += qt warn_on release link_prl -+CONFIG += qt warn_on release link_prl lib_version_first - DEFINES += __DARWIN_X11__ - - QMAKE_CC = cc -@@ -17,7 +17,7 @@ - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -+QMAKE_CFLAGS = -pipe -fno-common -fPIC - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = -w -@@ -40,8 +40,8 @@ - QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC - QMAKE_CXXFLAGS_THREAD = - --QMAKE_INCDIR = /usr/local/include --QMAKE_LIBDIR = -+QMAKE_INCDIR = /usr/include -+QMAKE_LIBDIR = /usr/qt/3/lib - QMAKE_INCDIR_X11 = /usr/X11R6/include - QMAKE_LIBDIR_X11 = /usr/X11R6/lib - QMAKE_INCDIR_QT = $(QTDIR)/include -@@ -55,7 +55,7 @@ - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG = - QMAKE_LFLAGS_APP = -prebind --QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -+QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -install_name $$QMAKE_LIBDIR/$(TARGET1) - QMAKE_LFLAGS_PLUGIN = -bundle - QMAKE_LFLAGS_THREAD = - -@@ -64,7 +64,7 @@ - - QMAKE_RPATH = - --QMAKE_LIBS_DYNLOAD = -+QMAKE_LIBS_DYNLOAD = -ldl - QMAKE_LIBS_X11 = -lXext -lX11 -lm - QMAKE_LIBS_X11SM = -lSM -lICE - QMAKE_LIBS_QT = -lqt -@@ -76,7 +76,7 @@ - QMAKE_MOC = $(QTDIR)/bin/moc - QMAKE_UIC = $(QTDIR)/bin/uic - --QMAKE_AR = ar cq -+QMAKE_AR = ar -cq - QMAKE_RANLIB = ranlib -s - - QMAKE_TAR = tar -cf -diff -Naur qt-x11-free-3.3.4.orig/qmake/Makefile.unix qt-x11-free-3.3.4/qmake/Makefile.unix ---- qt-x11-free-3.3.4.orig/qmake/Makefile.unix 2005-07-17 01:04:27.000000000 -0500 -+++ qt-x11-free-3.3.4/qmake/Makefile.unix 2005-07-17 01:12:13.000000000 -0500 -@@ -36,8 +36,8 @@ - -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ - -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ -- -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP --LFLAGS=@QMAKE_LFLAGS@ -+ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP -mdynamic-no-pic -+LFLAGS=@QMAKE_LFLAGS@ -mdynamic-no-pic - - qmake: $(OBJS) $(QOBJS) - $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) -diff -Naur qt-x11-free-3.3.4.orig/qmake/main.cpp qt-x11-free-3.3.4/qmake/main.cpp ---- qt-x11-free-3.3.4.orig/qmake/main.cpp 2005-07-17 01:04:27.000000000 -0500 -+++ qt-x11-free-3.3.4/qmake/main.cpp 2005-07-17 01:05:17.000000000 -0500 -@@ -49,7 +49,7 @@ - - // for Borland, main is defined to qMain which breaks qmake - #undef main --#ifdef Q_OS_MAC -+#if defined(Q_OS_MAC) || defined(Q_OS_DARWIN) - // for qurl - bool qt_resolve_symlinks = FALSE; - #endif -diff -Naur qt-x11-free-3.3.4.orig/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.4/src/kernel/qprocess_unix.cpp ---- qt-x11-free-3.3.4.orig/src/kernel/qprocess_unix.cpp 2005-07-17 01:04:18.000000000 -0500 -+++ qt-x11-free-3.3.4/src/kernel/qprocess_unix.cpp 2005-07-17 01:14:31.000000000 -0500 -@@ -761,7 +761,7 @@ - #endif - i++; - } --#ifdef Q_OS_MACX -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - if(i) { - QCString arg_bundle = arglistQ[0]; - QFileInfo fi(arg_bundle); -@@ -819,7 +819,7 @@ - - if ( env == 0 ) { // inherit environment and start process - QString command = _arguments[0]; --#if defined(Q_OS_MACX) //look in a bundle -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) //look in a bundle - const QString mac_bundle_suffix = ".app/Contents/MacOS/"; - if(!QFile::exists(command) && QFile::exists(command + mac_bundle_suffix)) { - QString exec = command; -@@ -839,7 +839,7 @@ - } else { // start process with environment settins as specified in env - // construct the environment for exec - int numEntries = env->count(); --#if defined(Q_OS_MACX) -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - QString ld_library_path("DYLD_LIBRARY_PATH"); - #else - QString ld_library_path("LD_LIBRARY_PATH"); -@@ -871,7 +871,7 @@ - QStringList pathList = QStringList::split( ':', getenv( "PATH" ) ); - for (QStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) { - QString dir = *it; --#if defined(Q_OS_MACX) //look in a bundle -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) //look in a bundle - if(!QFile::exists(dir + "/" + command) && QFile::exists(dir + "/" + command + ".app")) - dir += "/" + command + ".app/Contents/MacOS"; - #endif -@@ -881,7 +881,7 @@ - QFileInfo fileInfo( dir + "/" + command ); - #endif - if ( fileInfo.isExecutable() ) { --#if defined(Q_OS_MACX) -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - arglistQ[0] = fileInfo.absFilePath().local8Bit(); - #else - arglistQ[0] = fileInfo.filePath().local8Bit(); -@@ -892,7 +892,7 @@ - } - } - } --#if defined(Q_OS_MACX) -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - if(!QFile::exists(arglist[0])) { - QString command = arglist[0]; - const QString mac_bundle_suffix = ".app/Contents/MacOS/"; -diff -Naur qt-x11-free-3.3.4.orig/src/moc/moc.pro qt-x11-free-3.3.4/src/moc/moc.pro ---- qt-x11-free-3.3.4.orig/src/moc/moc.pro 2005-07-17 01:04:23.000000000 -0500 -+++ qt-x11-free-3.3.4/src/moc/moc.pro 2005-07-17 01:15:19.000000000 -0500 -@@ -48,6 +48,8 @@ - unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp - win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp - macx:LIBS += -framework Carbon -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - target.path=$$bins.path - INSTALLS += target -diff -Naur qt-x11-free-3.3.4.orig/src/network/qsocketdevice_unix.cpp qt-x11-free-3.3.4/src/network/qsocketdevice_unix.cpp ---- qt-x11-free-3.3.4.orig/src/network/qsocketdevice_unix.cpp 2005-07-17 01:04:26.000000000 -0500 -+++ qt-x11-free-3.3.4/src/network/qsocketdevice_unix.cpp 2005-07-17 01:04:54.000000000 -0500 -@@ -44,7 +44,7 @@ - - // Tru64 redefines accept -> _accept with _XOPEN_SOURCE_EXTENDED - static inline int qt_socket_accept(int s, struct sockaddr *addr, QT_SOCKLEN_T *addrlen) --{ return ::accept(s, addr, addrlen); } -+{ return ::accept(s, addr, (socklen_t *)addrlen); } - #if defined(accept) - # undef accept - #endif -@@ -140,7 +140,7 @@ - } - } - #else -- if ( !::getsockname(fd, &sa, &sz) ) { -+ if ( !::getsockname(fd, &sa, (socklen_t *)&sz) ) { - switch ( sa.sa_family ) { - case AF_INET: - return IPv4; -@@ -321,7 +321,7 @@ - if ( n != -1 ) { - QT_SOCKOPTLEN_T len; - len = sizeof(v); -- int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, &len ); -+ int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, (socklen_t *)&len ); - if ( r >= 0 ) - return v; - if ( !e ) { -@@ -781,7 +781,7 @@ - QT_SOCKLEN_T sz; - sz = sizeof( aa ); - r = ::recvfrom( fd, data, maxlen, 0, -- (struct sockaddr *)&aa, &sz ); -+ (struct sockaddr *)&aa, (socklen_t *)&sz ); - - qt_socket_getportaddr( (struct sockaddr *)&aa, &pp, &pa); - -@@ -1050,11 +1050,11 @@ - memset( &sa, 0, sizeof(sa) ); - QT_SOCKLEN_T sz; - sz = sizeof( sa ); -- if ( !::getsockname( fd, (struct sockaddr *)(&sa), &sz ) ) -+ if ( !::getsockname( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) - qt_socket_getportaddr( (struct sockaddr *)&sa, &p, &a ); - - sz = sizeof( sa ); -- if ( !::getpeername( fd, (struct sockaddr *)(&sa), &sz ) ) -+ if ( !::getpeername( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) - qt_socket_getportaddr( (struct sockaddr *)&sa, &pp, &pa ); - } - -diff -Naur qt-x11-free-3.3.4.orig/src/qt.pro qt-x11-free-3.3.4/src/qt.pro ---- qt-x11-free-3.3.4.orig/src/qt.pro 2005-07-17 01:04:26.000000000 -0500 -+++ qt-x11-free-3.3.4/src/qt.pro 2005-07-17 01:04:54.000000000 -0500 -@@ -191,3 +191,4 @@ - $$CODECS_CPP/qtextcodecplugin.cpp \ - $$WIDGETS_CPP/qwidgetplugin.cpp - } -+QMAKE_LFLAGS_SHLIB += -single_module -diff -Naur qt-x11-free-3.3.4.orig/src/qtmain.pro qt-x11-free-3.3.4/src/qtmain.pro ---- qt-x11-free-3.3.4.orig/src/qtmain.pro 2005-07-17 01:04:26.000000000 -0500 -+++ qt-x11-free-3.3.4/src/qtmain.pro 2005-07-17 01:16:10.000000000 -0500 -@@ -2,6 +2,7 @@ - TEMPLATE = lib - TARGET = qtmain - VERSION = 3.1.0 -+COMPATIBILITY_VERSION = 3.0.0 - DESTDIR = $$QMAKE_LIBDIR_QT - - CONFIG += qt staticlib warn_on release -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qdir_unix.cpp qt-x11-free-3.3.4/src/tools/qdir_unix.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qdir_unix.cpp 2005-07-17 01:04:24.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qdir_unix.cpp 2005-07-17 01:05:17.000000000 -0500 -@@ -88,7 +88,7 @@ - - bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const - { --#if defined(Q_OS_MACX) // Mac X doesn't support trailing /'s -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) // Mac X doesn't support trailing /'s - QString name = dirName; - if (dirName[dirName.length() - 1] == "/") - name = dirName.left( dirName.length() - 1 ); -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qglobal.h qt-x11-free-3.3.4/src/tools/qglobal.h ---- qt-x11-free-3.3.4.orig/src/tools/qglobal.h 2005-07-17 01:04:24.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qglobal.h 2005-07-17 01:05:17.000000000 -0500 -@@ -79,6 +79,10 @@ - UNIX - Any UNIX BSD/SYSV system - */ - -+#ifndef __DARWIN_X11__ -+#define __DARWIN_X11__ -+#endif -+ - #if defined(__DARWIN_X11__) - # define Q_OS_DARWIN - #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__)) -@@ -545,6 +549,8 @@ - - #if defined(Q_OS_MAC9) - # define Q_WS_MAC9 -+#elif defined(__DARWIN_X11__) -+# define Q_WS_X11 - #elif defined(Q_OS_MSDOS) - # define Q_WS_WIN16 - # error "Qt requires Win32 and does not work with Windows 3.x" -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.4/src/tools/qgpluginmanager.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qgpluginmanager.cpp 2005-07-17 01:04:24.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qgpluginmanager.cpp 2005-07-17 01:05:18.000000000 -0500 -@@ -316,7 +316,7 @@ - - #if defined(Q_OS_WIN32) - QString filter = "*.dll"; --#elif defined(Q_OS_MACX) -+#elif defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - QString filter = "*.dylib; *.so; *.bundle"; - #elif defined(Q_OS_HPUX) - QString filter = "*.sl"; -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qlibrary.cpp qt-x11-free-3.3.4/src/tools/qlibrary.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qlibrary.cpp 2005-07-17 01:04:25.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qlibrary.cpp 2005-07-17 01:05:18.000000000 -0500 -@@ -401,7 +401,7 @@ - filename += ".dll"; - #else - QStringList filters = ""; --#ifdef Q_OS_MACX -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - filters << ".so"; - filters << ".bundle"; - filters << ".dylib"; //the last one is also the default one.. -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qmutex_unix.cpp qt-x11-free-3.3.4/src/tools/qmutex_unix.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qmutex_unix.cpp 2005-07-17 01:04:25.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qmutex_unix.cpp 2005-07-17 01:05:18.000000000 -0500 -@@ -44,7 +44,7 @@ - // POSIX threads mutex types - #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \ - defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \ -- !defined(Q_OS_MAC) -+ !defined(Q_OS_MAC) && !defined(Q_OS_DARWIN) - // POSIX 1003.1c-1995 - We love this OS - # define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b)) - # if defined(QT_CHECK_RANGE) -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qstring.cpp qt-x11-free-3.3.4/src/tools/qstring.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qstring.cpp 2005-07-17 01:04:25.000000000 -0500 -+++ qt-x11-free-3.3.4/src/tools/qstring.cpp 2005-07-17 01:05:18.000000000 -0500 -@@ -1362,7 +1362,7 @@ - QStringData* QString::makeSharedNull() - { - QString::shared_null = new QStringData; --#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) -+#if defined(Q_OS_MAC) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) - QString *that = const_cast(&QString::null); - that->d = QString::shared_null; - #endif -@@ -2923,7 +2923,7 @@ - if (!l) - return -1; - --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) || defined(Q_OS_DARWIN)) - if ( sl == 1 ) - return find( *str.unicode(), index, cs ); - #endif -@@ -3022,7 +3022,7 @@ - - int QString::findRev( QChar c, int index, bool cs ) const - { --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020) || defined(Q_OS_DARWIN)) - return findRev( QString( c ), index, cs ); - #else - const uint l = length(); -@@ -3078,7 +3078,7 @@ - if ( index > delta ) - index = delta; - --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) || defined(Q_OS_DARWIN)) - if ( sl == 1 ) - return findRev( *str.unicode(), index, cs ); - #endif -diff -Naur qt-x11-free-3.3.4.orig/tools/assistant/assistant.pro qt-x11-free-3.3.4/tools/assistant/assistant.pro ---- qt-x11-free-3.3.4.orig/tools/assistant/assistant.pro 2005-07-17 01:04:00.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/assistant/assistant.pro 2005-07-17 01:05:18.000000000 -0500 -@@ -32,6 +32,8 @@ - - win32:RC_FILE = assistant.rc - mac:RC_FILE = assistant.icns -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - target.path = $$bins.path - INSTALLS += target -diff -Naur qt-x11-free-3.3.4.orig/tools/designer/app/app.pro qt-x11-free-3.3.4/tools/designer/app/app.pro ---- qt-x11-free-3.3.4.orig/tools/designer/app/app.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/designer/app/app.pro 2005-07-17 01:05:18.000000000 -0500 -@@ -20,6 +20,8 @@ - QMAKE_INFO_PLIST = Info_mac.plist - staticlib:CONFIG -= global_init_link_order #yuck - } -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - - target.path=$$bins.path -diff -Naur qt-x11-free-3.3.4.orig/tools/designer/designer/designer.pro qt-x11-free-3.3.4/tools/designer/designer/designer.pro ---- qt-x11-free-3.3.4.orig/tools/designer/designer/designer.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/designer/designer/designer.pro 2005-07-17 01:16:53.000000000 -0500 -@@ -1,6 +1,6 @@ - TEMPLATE = lib - --CONFIG += qt warn_on staticlib qmake_cache -+CONFIG += qt warn_on qmake_cache - CONFIG -= dll - !force_static:!win32:contains(QT_PRODUCT,qt-internal) { - CONFIG -= staticlib -diff -Naur qt-x11-free-3.3.4.orig/tools/designer/editor/editor.pro qt-x11-free-3.3.4/tools/designer/editor/editor.pro ---- qt-x11-free-3.3.4.orig/tools/designer/editor/editor.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/designer/editor/editor.pro 2005-07-17 01:17:23.000000000 -0500 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --CONFIG += qt warn_on staticlib -+CONFIG += qt warn_on - CONFIG -= dll - HEADERS = editor.h \ - parenmatcher.h \ -diff -Naur qt-x11-free-3.3.4.orig/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.4/tools/linguist/linguist/linguist.pro ---- qt-x11-free-3.3.4.orig/tools/linguist/linguist/linguist.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/linguist/linguist/linguist.pro 2005-07-17 01:05:18.000000000 -0500 -@@ -43,6 +43,8 @@ - staticlib:CONFIG -= global_init_link_order #yuck - RC_FILE = linguist.icns - } -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - PROJECTNAME = Qt Linguist - -diff -Naur qt-x11-free-3.3.4.orig/tools/linguist/linguist.pro qt-x11-free-3.3.4/tools/linguist/linguist.pro ---- qt-x11-free-3.3.4.orig/tools/linguist/linguist.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/linguist/linguist.pro 2005-07-17 01:17:52.000000000 -0500 -@@ -1,8 +1,5 @@ - TEMPLATE = subdirs - SUBDIRS = linguist \ -- tutorial/tt1 \ -- tutorial/tt2 \ -- tutorial/tt3 \ - lrelease \ - lupdate \ - qm2ts -diff -Naur qt-x11-free-3.3.4.orig/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.4/tools/linguist/lrelease/lrelease.pro ---- qt-x11-free-3.3.4.orig/tools/linguist/lrelease/lrelease.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/linguist/lrelease/lrelease.pro 2005-07-17 01:18:36.000000000 -0500 -@@ -15,3 +15,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+QMAKE_CFLAGS += -mdynamic-no-pic -+QMAKE_CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.4.orig/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.4/tools/linguist/lupdate/lupdate.pro ---- qt-x11-free-3.3.4.orig/tools/linguist/lupdate/lupdate.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/linguist/lupdate/lupdate.pro 2005-07-17 01:19:27.000000000 -0500 -@@ -19,3 +19,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+macx: CFLAGS += -mdynamic-no-pic -+macx: CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.4.orig/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.4/tools/linguist/qm2ts/qm2ts.pro ---- qt-x11-free-3.3.4.orig/tools/linguist/qm2ts/qm2ts.pro 2005-07-17 01:03:59.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/linguist/qm2ts/qm2ts.pro 2005-07-17 01:20:07.000000000 -0500 -@@ -13,3 +13,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.4.orig/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro ---- qt-x11-free-3.3.4.orig/tools/qtconfig/qtconfig.pro 2005-07-17 01:04:00.000000000 -0500 -+++ qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro 2005-07-17 01:05:18.000000000 -0500 -@@ -16,3 +16,6 @@ - INCLUDEPATH += . - DBFILE = qtconfig.db - REQUIRES=full-config nocrosscompiler -+ -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic diff --git a/x11-libs/qt/files/qt-3.3.5-macos.patch b/x11-libs/qt/files/qt-3.3.5-macos.patch deleted file mode 100644 index b0bc430f93da..000000000000 --- a/x11-libs/qt/files/qt-3.3.5-macos.patch +++ /dev/null @@ -1,450 +0,0 @@ -diff -Naur qt-x11-free-3.3.5.orig/include/qglobal.h qt-x11-free-3.3.5/include/qglobal.h ---- qt-x11-free-3.3.5.orig/include/qglobal.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5/include/qglobal.h 2005-10-09 00:33:23.000000000 -0400 -@@ -79,6 +79,10 @@ - UNIX - Any UNIX BSD/SYSV system - */ - -+#ifndef __DARWIN_X11__ -+#define __DARWIN_X11__ -+#endif -+ - #if defined(__DARWIN_X11__) - # define Q_OS_DARWIN - #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__)) -@@ -545,6 +549,8 @@ - - #if defined(Q_OS_MAC9) - # define Q_WS_MAC9 -+#elif defined(__DARWIN_X11__) -+# define Q_WS_X11 - #elif defined(Q_OS_MSDOS) - # define Q_WS_WIN16 - # error "Qt requires Win32 and does not work with Windows 3.x" -diff -Naur qt-x11-free-3.3.5.orig/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf ---- qt-x11-free-3.3.5.orig/mkspecs/darwin-g++/qmake.conf 2005-10-09 00:19:04.000000000 -0400 -+++ qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf 2005-10-09 00:33:23.000000000 -0400 -@@ -9,7 +9,7 @@ - MAKEFILE_GENERATOR = UNIX - TEMPLATE = app - CONFIG += qt warn_on release native_precompiled_headers --CONFIG += qt warn_on release link_prl -+CONFIG += qt warn_on release link_prl lib_version_first - DEFINES += __DARWIN_X11__ - - QMAKE_CC = cc -@@ -17,7 +17,7 @@ - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -+QMAKE_CFLAGS = -pipe -fno-common -fPIC - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = -w -@@ -40,8 +40,8 @@ - QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC - QMAKE_CXXFLAGS_THREAD = - --QMAKE_INCDIR = /usr/local/include --QMAKE_LIBDIR = -+QMAKE_INCDIR = /usr/include -+QMAKE_LIBDIR = /usr/qt/3/lib - QMAKE_INCDIR_X11 = /usr/X11R6/include - QMAKE_LIBDIR_X11 = /usr/X11R6/lib - QMAKE_INCDIR_QT = $(QTDIR)/include -@@ -55,7 +55,7 @@ - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG = - QMAKE_LFLAGS_APP = -prebind --QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -+QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names -install_name $$QMAKE_LIBDIR/$(TARGET1) - QMAKE_LFLAGS_PLUGIN = -bundle - QMAKE_LFLAGS_THREAD = - -@@ -64,7 +64,7 @@ - - QMAKE_RPATH = - --QMAKE_LIBS_DYNLOAD = -+QMAKE_LIBS_DYNLOAD = -ldl - QMAKE_LIBS_X11 = -lXext -lX11 -lm - QMAKE_LIBS_X11SM = -lSM -lICE - QMAKE_LIBS_QT = -lqt -@@ -76,7 +76,7 @@ - QMAKE_MOC = $(QTDIR)/bin/moc - QMAKE_UIC = $(QTDIR)/bin/uic - --QMAKE_AR = ar cq -+QMAKE_AR = ar -cq - QMAKE_RANLIB = ranlib -s - - QMAKE_TAR = tar -cf -diff -Naur qt-x11-free-3.3.5.orig/qmake/Makefile.unix qt-x11-free-3.3.5/qmake/Makefile.unix ---- qt-x11-free-3.3.5.orig/qmake/Makefile.unix 2004-09-13 14:24:42.000000000 -0400 -+++ qt-x11-free-3.3.5/qmake/Makefile.unix 2005-10-09 00:33:23.000000000 -0400 -@@ -36,8 +36,8 @@ - -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ - -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ -- -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP --LFLAGS=@QMAKE_LFLAGS@ -+ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP -mdynamic-no-pic -+LFLAGS=@QMAKE_LFLAGS@ -mdynamic-no-pic - - qmake: $(OBJS) $(QOBJS) - $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) -diff -Naur qt-x11-free-3.3.5.orig/qmake/main.cpp qt-x11-free-3.3.5/qmake/main.cpp ---- qt-x11-free-3.3.5.orig/qmake/main.cpp 2005-09-02 08:43:19.000000000 -0400 -+++ qt-x11-free-3.3.5/qmake/main.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -49,7 +49,7 @@ - - // for Borland, main is defined to qMain which breaks qmake - #undef main --#ifdef Q_OS_MAC -+#if defined(Q_OS_MAC) || defined(Q_OS_DARWIN) - // for qurl - bool qt_resolve_symlinks = FALSE; - #endif -diff -Naur qt-x11-free-3.3.5.orig/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp ---- qt-x11-free-3.3.5.orig/src/kernel/qprocess_unix.cpp 2005-09-02 08:43:01.000000000 -0400 -+++ qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -761,7 +761,7 @@ - #endif - i++; - } --#ifdef Q_OS_MACX -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - if(i) { - QCString arg_bundle = arglistQ[0]; - QFileInfo fi(arg_bundle); -@@ -826,7 +826,7 @@ - } else { // start process with environment settins as specified in env - // construct the environment for exec - int numEntries = env->count(); --#if defined(Q_OS_MACX) -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - QString ld_library_path("DYLD_LIBRARY_PATH"); - #else - QString ld_library_path("LD_LIBRARY_PATH"); -@@ -858,7 +858,7 @@ - QStringList pathList = QStringList::split( ':', getenv( "PATH" ) ); - for (QStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) { - QString dir = *it; --#if defined(Q_OS_MACX) //look in a bundle -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) //look in a bundle - if(!QFile::exists(dir + "/" + command) && QFile::exists(dir + "/" + command + ".app")) - dir += "/" + command + ".app/Contents/MacOS"; - #endif -@@ -868,7 +868,7 @@ - QFileInfo fileInfo( dir + "/" + command ); - #endif - if ( fileInfo.isExecutable() ) { --#if defined(Q_OS_MACX) -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - arglistQ[0] = fileInfo.absFilePath().local8Bit(); - #else - arglistQ[0] = fileInfo.filePath().local8Bit(); -diff -Naur qt-x11-free-3.3.5.orig/src/moc/moc.pro qt-x11-free-3.3.5/src/moc/moc.pro ---- qt-x11-free-3.3.5.orig/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/src/moc/moc.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -48,6 +48,8 @@ - unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp - win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp - macx:LIBS += -framework Carbon -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - target.path=$$bins.path - INSTALLS += target -diff -Naur qt-x11-free-3.3.5.orig/src/network/qsocketdevice_unix.cpp qt-x11-free-3.3.5/src/network/qsocketdevice_unix.cpp ---- qt-x11-free-3.3.5.orig/src/network/qsocketdevice_unix.cpp 2005-09-02 08:42:59.000000000 -0400 -+++ qt-x11-free-3.3.5/src/network/qsocketdevice_unix.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -44,7 +44,7 @@ - - // Tru64 redefines accept -> _accept with _XOPEN_SOURCE_EXTENDED - static inline int qt_socket_accept(int s, struct sockaddr *addr, QT_SOCKLEN_T *addrlen) --{ return ::accept(s, addr, addrlen); } -+{ return ::accept(s, addr, (socklen_t *)addrlen); } - #if defined(accept) - # undef accept - #endif -@@ -140,7 +140,7 @@ - } - } - #else -- if ( !::getsockname(fd, &sa, &sz) ) { -+ if ( !::getsockname(fd, &sa, (socklen_t *)&sz) ) { - switch ( sa.sa_family ) { - case AF_INET: - return IPv4; -@@ -324,7 +324,7 @@ - if ( n != -1 ) { - QT_SOCKOPTLEN_T len; - len = sizeof(v); -- int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, &len ); -+ int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, (socklen_t *)&len ); - if ( r >= 0 ) - return v; - if ( !e ) { -@@ -787,7 +787,7 @@ - QT_SOCKLEN_T sz; - sz = sizeof( aa ); - r = ::recvfrom( fd, data, maxlen, 0, -- (struct sockaddr *)&aa, &sz ); -+ (struct sockaddr *)&aa, (socklen_t *)&sz ); - - qt_socket_getportaddr( (struct sockaddr *)&aa, &pp, &pa); - -@@ -1057,11 +1057,11 @@ - memset( &sa, 0, sizeof(sa) ); - QT_SOCKLEN_T sz; - sz = sizeof( sa ); -- if ( !::getsockname( fd, (struct sockaddr *)(&sa), &sz ) ) -+ if ( !::getsockname( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) - qt_socket_getportaddr( (struct sockaddr *)&sa, &p, &a ); - - sz = sizeof( sa ); -- if ( !::getpeername( fd, (struct sockaddr *)(&sa), &sz ) ) -+ if ( !::getpeername( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) - qt_socket_getportaddr( (struct sockaddr *)&sa, &pp, &pa ); - } - -diff -Naur qt-x11-free-3.3.5.orig/src/qt.pro qt-x11-free-3.3.5/src/qt.pro ---- qt-x11-free-3.3.5.orig/src/qt.pro 2005-03-18 10:38:19.000000000 -0500 -+++ qt-x11-free-3.3.5/src/qt.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -191,3 +191,4 @@ - $$CODECS_CPP/qtextcodecplugin.cpp \ - $$WIDGETS_CPP/qwidgetplugin.cpp - } -+QMAKE_LFLAGS_SHLIB += -single_module -diff -Naur qt-x11-free-3.3.5.orig/src/qtmain.pro qt-x11-free-3.3.5/src/qtmain.pro ---- qt-x11-free-3.3.5.orig/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/src/qtmain.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -2,6 +2,7 @@ - TEMPLATE = lib - TARGET = qtmain - VERSION = 3.1.0 -+COMPATIBILITY_VERSION = 3.0.0 - DESTDIR = $$QMAKE_LIBDIR_QT - - CONFIG += qt staticlib warn_on release -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qdir_unix.cpp qt-x11-free-3.3.5/src/tools/qdir_unix.cpp ---- qt-x11-free-3.3.5.orig/src/tools/qdir_unix.cpp 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qdir_unix.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -88,7 +88,7 @@ - - bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const - { --#if defined(Q_OS_MACX) // Mac X doesn't support trailing /'s -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) // Mac X doesn't support trailing /'s - QString name = dirName; - if (dirName[dirName.length() - 1] == "/") - name = dirName.left( dirName.length() - 1 ); -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qglobal.h qt-x11-free-3.3.5/src/tools/qglobal.h ---- qt-x11-free-3.3.5.orig/src/tools/qglobal.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qglobal.h 2005-10-09 00:33:23.000000000 -0400 -@@ -79,6 +79,10 @@ - UNIX - Any UNIX BSD/SYSV system - */ - -+#ifndef __DARWIN_X11__ -+#define __DARWIN_X11__ -+#endif -+ - #if defined(__DARWIN_X11__) - # define Q_OS_DARWIN - #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__)) -@@ -545,6 +549,8 @@ - - #if defined(Q_OS_MAC9) - # define Q_WS_MAC9 -+#elif defined(__DARWIN_X11__) -+# define Q_WS_X11 - #elif defined(Q_OS_MSDOS) - # define Q_WS_WIN16 - # error "Qt requires Win32 and does not work with Windows 3.x" -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp ---- qt-x11-free-3.3.5.orig/src/tools/qgpluginmanager.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -316,7 +316,7 @@ - - #if defined(Q_OS_WIN32) - QString filter = "*.dll"; --#elif defined(Q_OS_MACX) -+#elif defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - QString filter = "*.dylib; *.so; *.bundle"; - #elif defined(Q_OS_HPUX) - QString filter = "*.sl"; -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qlibrary.cpp qt-x11-free-3.3.5/src/tools/qlibrary.cpp ---- qt-x11-free-3.3.5.orig/src/tools/qlibrary.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qlibrary.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -400,7 +400,7 @@ - filename += ".dll"; - #else - QStringList filters = ""; --#ifdef Q_OS_MACX -+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) - filters << ".so"; - filters << ".bundle"; - filters << ".dylib"; //the last one is also the default one.. -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qmutex_unix.cpp qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp ---- qt-x11-free-3.3.5.orig/src/tools/qmutex_unix.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -44,7 +44,7 @@ - // POSIX threads mutex types - #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \ - defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \ -- !defined(Q_OS_MAC) -+ !defined(Q_OS_MAC) && !defined(Q_OS_DARWIN) - // POSIX 1003.1c-1995 - We love this OS - # define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b)) - # if defined(QT_CHECK_RANGE) -diff -Naur qt-x11-free-3.3.5.orig/src/tools/qstring.cpp qt-x11-free-3.3.5/src/tools/qstring.cpp ---- qt-x11-free-3.3.5.orig/src/tools/qstring.cpp 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5/src/tools/qstring.cpp 2005-10-09 00:33:23.000000000 -0400 -@@ -1362,7 +1362,7 @@ - QStringData* QString::makeSharedNull() - { - QString::shared_null = new QStringData; --#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) -+#if defined(Q_OS_MAC) || defined(Q_OS_DARWIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) - QString *that = const_cast(&QString::null); - that->d = QString::shared_null; - #endif -@@ -2923,7 +2923,7 @@ - if (!l) - return -1; - --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) || defined(Q_OS_DARWIN)) - if ( sl == 1 ) - return find( *str.unicode(), index, cs ); - #endif -@@ -3022,7 +3022,7 @@ - - int QString::findRev( QChar c, int index, bool cs ) const - { --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020) || defined(Q_OS_DARWIN)) - return findRev( QString( c ), index, cs ); - #else - const uint l = length(); -@@ -3078,7 +3078,7 @@ - if ( index > delta ) - index = delta; - --#if defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020 -+#if defined(Q_OS_MACX) && ((defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION >= 0x1020) || defined(Q_OS_DARWIN)) - if ( sl == 1 ) - return findRev( *str.unicode(), index, cs ); - #endif -diff -Naur qt-x11-free-3.3.5.orig/tools/assistant/assistant.pro qt-x11-free-3.3.5/tools/assistant/assistant.pro ---- qt-x11-free-3.3.5.orig/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/assistant/assistant.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -32,6 +32,8 @@ - - win32:RC_FILE = assistant.rc - mac:RC_FILE = assistant.icns -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - target.path = $$bins.path - INSTALLS += target -diff -Naur qt-x11-free-3.3.5.orig/tools/designer/app/app.pro qt-x11-free-3.3.5/tools/designer/app/app.pro ---- qt-x11-free-3.3.5.orig/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/designer/app/app.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -20,6 +20,8 @@ - QMAKE_INFO_PLIST = Info_mac.plist - staticlib:CONFIG -= global_init_link_order #yuck - } -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - - target.path=$$bins.path -diff -Naur qt-x11-free-3.3.5.orig/tools/designer/designer/designer.pro qt-x11-free-3.3.5/tools/designer/designer/designer.pro ---- qt-x11-free-3.3.5.orig/tools/designer/designer/designer.pro 2004-07-29 09:09:50.000000000 -0400 -+++ qt-x11-free-3.3.5/tools/designer/designer/designer.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -1,6 +1,6 @@ - TEMPLATE = lib - --CONFIG += qt warn_on staticlib qmake_cache -+CONFIG += qt warn_on qmake_cache - CONFIG -= dll - !force_static:!win32:contains(QT_PRODUCT,qt-internal) { - CONFIG -= staticlib -diff -Naur qt-x11-free-3.3.5.orig/tools/designer/editor/editor.pro qt-x11-free-3.3.5/tools/designer/editor/editor.pro ---- qt-x11-free-3.3.5.orig/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/designer/editor/editor.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --CONFIG += qt warn_on staticlib -+CONFIG += qt warn_on - CONFIG -= dll - HEADERS = editor.h \ - parenmatcher.h \ -diff -Naur qt-x11-free-3.3.5.orig/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro ---- qt-x11-free-3.3.5.orig/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -43,6 +43,8 @@ - staticlib:CONFIG -= global_init_link_order #yuck - RC_FILE = linguist.icns - } -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic - - PROJECTNAME = Qt Linguist - -diff -Naur qt-x11-free-3.3.5.orig/tools/linguist/linguist.pro qt-x11-free-3.3.5/tools/linguist/linguist.pro ---- qt-x11-free-3.3.5.orig/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400 -+++ qt-x11-free-3.3.5/tools/linguist/linguist.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -1,8 +1,5 @@ - TEMPLATE = subdirs - SUBDIRS = linguist \ -- tutorial/tt1 \ -- tutorial/tt2 \ -- tutorial/tt3 \ - lrelease \ - lupdate \ - qm2ts -diff -Naur qt-x11-free-3.3.5.orig/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro ---- qt-x11-free-3.3.5.orig/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -15,3 +15,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+QMAKE_CFLAGS += -mdynamic-no-pic -+QMAKE_CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.5.orig/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro ---- qt-x11-free-3.3.5.orig/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -19,3 +19,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+macx: CFLAGS += -mdynamic-no-pic -+macx: CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.5.orig/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro ---- qt-x11-free-3.3.5.orig/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro 2005-10-09 00:33:23.000000000 -0400 -@@ -13,3 +13,6 @@ - - target.path=$$bins.path - INSTALLS += target -+ -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic -diff -Naur qt-x11-free-3.3.5.orig/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro ---- qt-x11-free-3.3.5.orig/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400 -+++ qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro 2005-10-09 00:41:11.000000000 -0400 -@@ -16,3 +16,6 @@ - INCLUDEPATH += . - DBFILE = qtconfig.db - REQUIRES=full-config nocrosscompiler !win32* -+ -+CFLAGS += -mdynamic-no-pic -+CXXFLAGS += -mdynamic-no-pic -- 2.26.2