Author: ranger Date: Sat Nov 3 20:17:19 2007 New Revision: 1034 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1034&repname=user%3a+ranger Log: fixed on leopard
Modified: trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.info trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch trunk/experimental/common/main/finkinfo/x11/qt4-x11.info trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Modified: trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.info&rev=1034&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.info (original) +++ trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.info Sat Nov 3 20:17:19 2007 @@ -55,7 +55,7 @@ CompileScript: << #!/bin/sh -ev - /bin/sh ./configure-for-fink.sh "%p" "%N" -pch + /bin/sh ./configure-for-fink.sh "%p" "%N" -pch -verbose make << @@ -68,7 +68,8 @@ export QTDIR=`pwd` export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%d + make -j1 install INSTALL_ROOT=%d + install -d -m 755 %i/bin for bin in linguist designer qtconfig; do ln -sf %p/lib/%N/bin/$bin %i/bin/${bin}4-x11 Modified: trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch&rev=1034&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch Sat Nov 3 20:17:19 2007 @@ -1,34 +1,319 @@ +--- qt-copy/config.tests/qws/opengles/opengles.pro 2007-05-08 18:10:01.000000000 -0400 ++++ qt-copy-new/config.tests/qws/opengles/opengles.pro 2007-11-03 14:03:57.000000000 -0400 +@@ -2,3 +2,4 @@ + QT -= gui network core + INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + LIBS += -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL ++CONFIG -= app_bundle --- qt-copy/config.tests/unix/3dnow/3dnow.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-03 14:03:53.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = 3dnow.cpp +-CONFIG -= x11 qt +- ++CONFIG -= x11 qt app_bundle +--- qt-copy/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-03-26 14:33:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-11-03 14:04:04.000000000 -0400 @@ -1,3 +1,3 @@ - SOURCES = 3dnow.cpp - CONFIG -= x11 qt +-CONFIG -= qt dylib mac_bundle ++CONFIG -= qt dylib app_bundle + SOURCES = clock-monotonic.cpp + include(clock-monotonic.pri) +--- qt-copy/config.tests/unix/cups/cups.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/cups/cups.pro 2007-11-03 14:02:19.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = cups.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lcups +--- qt-copy/config.tests/unix/db2/db2.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/db2/db2.pro 2007-11-03 14:02:30.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = db2.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ldb2 +--- qt-copy/config.tests/unix/dbus/dbus.pro 2006-08-30 11:38:24.000000000 -0400 ++++ qt-copy-new/config.tests/unix/dbus/dbus.pro 2007-11-03 14:02:34.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = dbus.cpp +-CONFIG -= qt +-CONFIG -= app_bundle ++CONFIG -= qt app_bundle +--- qt-copy/config.tests/unix/doubleformat/doubleformattest.pro 2007-03-12 10:53:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro 2007-11-03 14:02:39.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=doubleformattest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=doubleformattest.cpp +--- qt-copy/config.tests/unix/endian/endiantest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/unix/endian/endiantest.pro 2007-11-03 14:02:43.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=endiantest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=endiantest.cpp +--- qt-copy/config.tests/unix/floatmath/floatmath.pro 2007-04-23 13:11:29.000000000 -0400 ++++ qt-copy-new/config.tests/unix/floatmath/floatmath.pro 2007-11-03 14:02:48.000000000 -0400 +@@ -1,3 +1,3 @@ + SOURCES = floatmath.cpp +-CONFIG -= x11 qt ++CONFIG -= x11 qt app_bundle + +--- qt-copy/config.tests/unix/freetype/freetype.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/unix/freetype/freetype.pro 2007-11-03 14:02:53.000000000 -0400 +@@ -1,5 +1,5 @@ + SOURCES = freetype.cpp + CONFIG += x11 +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lfreetype + include(freetype.pri) +--- qt-copy/config.tests/unix/getaddrinfo/getaddrinfo.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2007-11-03 14:02:58.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = getaddrinfotest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + solaris-cc*:LIBS += -lsocket -lnsl +--- qt-copy/config.tests/unix/getifaddrs/getifaddrs.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro 2007-11-03 14:03:03.000000000 -0400 +@@ -1,6 +1,5 @@ + TARGET=getifaddrs +-CONFIG -= qt +-mac:CONFIG -= app_bundle ++CONFIG -= qt app_bundle + QT = + TEMPLATE=app + SOURCES=getifaddrs.cpp +--- qt-copy/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2006-08-30 11:38:24.000000000 -0400 ++++ qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2007-11-03 14:22:16.000000000 -0400 +@@ -7,7 +7,7 @@ + { + iconv_t x = iconv_open("", ""); + +- const char *inp; ++ char *inp; + char *outp; + size_t inbytes, outbytes; + iconv(x, &inp, &inbytes, &outp, &outbytes); +--- qt-copy/config.tests/unix/ibase/ibase.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/ibase/ibase.pro 2007-11-03 14:03:25.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = ibase.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lgds +--- qt-copy/config.tests/unix/inotify/inotify.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/inotify/inotify.pro 2007-11-03 14:03:30.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = inotifytest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +--- qt-copy/config.tests/unix/ipv6/ipv6.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/ipv6/ipv6.pro 2007-11-03 14:04:46.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = ipv6test.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +--- qt-copy/config.tests/unix/ipv6ifname/ipv6ifname.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2007-11-03 14:04:50.000000000 -0400 +@@ -1,6 +1,5 @@ + TARGET=ipv6ifname +-CONFIG -= qt +-mac:CONFIG -= app_bundle ++CONFIG -= qt app_bundle + QT = + TEMPLATE=app + SOURCES=ipv6ifname.cpp +--- qt-copy/config.tests/unix/largefile/largefile.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/largefile/largefile.pro 2007-11-03 14:05:06.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES=largefiletest.cpp +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle +--- qt-copy/config.tests/unix/libjpeg/libjpeg.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro 2007-11-03 14:05:11.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libjpeg.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ljpeg +--- qt-copy/config.tests/unix/libmng/libmng.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libmng/libmng.pro 2007-11-03 14:05:14.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libmng.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lmng +--- qt-copy/config.tests/unix/libpng/libpng.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libpng/libpng.pro 2007-11-03 14:05:19.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libpng.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lpng +--- qt-copy/config.tests/unix/libtiff/libtiff.pro 2007-03-26 14:33:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libtiff/libtiff.pro 2007-11-03 14:05:22.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libtiff.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ltiff +--- qt-copy/config.tests/unix/mmx/mmx.pro 2007-04-23 13:11:29.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-03 14:05:26.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = mmx.cpp +-CONFIG -= x11 qt - -+mac:CONFIG -= app_bundle ---- qt-copy/config.tests/unix/mmx/mmx.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-02 16:42:07.000000000 -0400 ++CONFIG -= x11 qt app_bundle +--- qt-copy/config.tests/unix/mysql_r/mysql_r.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro 2007-11-03 14:05:33.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = ../mysql/mysql.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lmysqlclient_r +--- qt-copy/config.tests/unix/nis/nis.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/nis/nis.pro 2007-11-03 14:05:39.000000000 -0400 +@@ -1,5 +1,4 @@ + SOURCES = nis.cpp +-CONFIG -= qt dylib +-mac: CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + solaris-*:LIBS += -lnsl + else:LIBS += $$QMAKE_LIBS_NIS +--- qt-copy/config.tests/unix/oci/oci.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/oci/oci.pro 2007-11-03 14:05:43.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = oci.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lclntsh +--- qt-copy/config.tests/unix/odbc/odbc.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/odbc/odbc.pro 2007-11-03 14:05:48.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = odbc.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lodbc +--- qt-copy/config.tests/unix/psql/psql.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/psql/psql.pro 2007-11-03 14:06:40.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = psql.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lpq +--- qt-copy/config.tests/unix/ptrsize/ptrsizetest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro 2007-11-03 14:06:44.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=ptrsizetest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=ptrsizetest.cpp +--- qt-copy/config.tests/unix/sqlite/sqlite.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sqlite/sqlite.pro 2007-11-03 14:06:47.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = sqlite.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsqlite3 +--- qt-copy/config.tests/unix/sqlite2/sqlite2.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro 2007-11-03 14:06:50.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = sqlite2.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsqlite +--- qt-copy/config.tests/unix/sse/sse.pro 2007-04-23 13:11:29.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-11-03 14:06:53.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = sse.cpp +-CONFIG -= x11 qt +- ++CONFIG -= x11 qt app_bundle +--- qt-copy/config.tests/unix/sse2/sse2.pro 2007-04-23 13:11:29.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-11-03 14:06:56.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = sse2.cpp +-CONFIG -= x11 qt +- ++CONFIG -= x11 qt app_bundle +--- qt-copy/config.tests/unix/stl/stl.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/stl/stl.pro 2007-11-03 14:06:59.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = stltest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +--- qt-copy/config.tests/unix/tds/tds.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/tds/tds.pro 2007-11-03 14:07:02.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = tds.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsybdb +--- qt-copy/config.tests/unix/tslib/tslib.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/tslib/tslib.pro 2007-11-03 14:07:06.000000000 -0400 @@ -1,3 +1,3 @@ - SOURCES = mmx.cpp - CONFIG -= x11 qt -- -+mac:CONFIG -= app_bundle ---- qt-copy/config.tests/unix/sse/sse.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-11-02 16:42:07.000000000 -0400 -@@ -1,3 +1,3 @@ - SOURCES = sse.cpp - CONFIG -= x11 qt -- -+mac:CONFIG -= app_bundle ---- qt-copy/config.tests/unix/sse2/sse2.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-11-02 16:42:07.000000000 -0400 -@@ -1,3 +1,3 @@ - SOURCES = sse2.cpp - CONFIG -= x11 qt -- -+mac:CONFIG -= app_bundle + SOURCES = tslib.cpp +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lts +--- qt-copy/config.tests/unix/zlib/zlib.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/zlib/zlib.pro 2007-11-03 14:07:10.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = zlib.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lz +--- qt-copy/config.tests/x11/fontconfig/fontconfig.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/x11/fontconfig/fontconfig.pro 2007-11-03 14:07:15.000000000 -0400 +@@ -1,5 +1,5 @@ + SOURCES = fontconfig.cpp + CONFIG += x11 +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lfreetype -lfontconfig + include(../../unix/freetype/freetype.pri) +--- qt-copy/config.tests/x11/notype/notypetest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/x11/notype/notypetest.pro 2007-11-03 14:07:18.000000000 -0400 +@@ -1,5 +1,5 @@ + TEMPLATE=app + TARGET=notypetest +-CONFIG-=qt ++CONFIG-=qt app_bundle + CONFIG+=x11 + SOURCES=notypetest.cpp --- qt-copy/configure 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/configure 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/configure 2007-11-03 14:00:09.000000000 -0400 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; @@ -66,7 +351,7 @@ if [ '!' -z "$D_FLAGS" ]; then for DEF in $D_FLAGS; do --- qt-copy/configure-for-fink.sh 1969-12-31 19:00:00.000000000 -0500 -+++ qt-copy-new/configure-for-fink.sh 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2007-11-03 14:00:09.000000000 -0400 @@ -0,0 +1,60 @@ +#!/bin/sh -e + @@ -129,7 +414,7 @@ +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy/mkspecs/common/mac-g++.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/common/mac-g++.conf 2007-11-02 16:42:27.000000000 -0400 ++++ qt-copy-new/mkspecs/common/mac-g++.conf 2007-11-03 14:00:09.000000000 -0400 @@ -50,7 +50,7 @@ QMAKE_LINK = c++ @@ -140,7 +425,7 @@ QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-02 16:42:23.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-03 14:00:09.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -216,7 +501,7 @@ include(../common/unix.conf) load(qt_config) --- qt-copy/mkspecs/macx-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-03 14:00:09.000000000 -0400 @@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX @@ -233,7 +518,7 @@ + load(qt_config) --- qt-copy/projects.pro 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/projects.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/projects.pro 2007-11-03 14:00:09.000000000 -0400 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip @@ -255,7 +540,7 @@ include(src/src.pro) } else:isEqual(PROJECT, qmake) { --- qt-copy/qmake/generators/mac/pbuilder_pbx.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -49,7 +49,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -275,7 +560,7 @@ QCFType<CFURLRef> cfurl; OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl); --- qt-copy/qmake/generators/unix/unixmake.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -45,6 +45,8 @@ #include <time.h> #include <qdebug.h> @@ -342,7 +627,7 @@ opt = opt.mid(11); else --- qt-copy/qmake/option.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/qmake/option.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/option.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -92,7 +92,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) @@ -353,7 +638,7 @@ #elif defined(Q_OS_QNX6) Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE; --- qt-copy/src/corelib/corelib.pro 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/src/corelib/corelib.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2007-11-03 14:00:09.000000000 -0400 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) @@ -364,7 +649,7 @@ mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK win32:DEFINES-=QT_NO_CAST_TO_ASCII --- qt-copy/src/corelib/global/qglobal.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -1609,7 +1609,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif @@ -375,7 +660,7 @@ #include "private/qcore_mac_p.h" #include "qnamespace.h" --- qt-copy/src/corelib/global/qlibraryinfo.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -47,7 +47,7 @@ #else # include "qcoreapplication.h" @@ -404,7 +689,7 @@ if (bundleRef) { QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); --- qt-copy/src/corelib/global/qnamespace.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-03 14:00:09.000000000 -0400 @@ -960,7 +960,7 @@ }; @@ -424,7 +709,7 @@ #if defined(Q_OS_WIN) #ifndef qdoc --- qt-copy/src/corelib/io/qfsfileengine_unix.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -51,7 +51,7 @@ #include <stdlib.h> #include <limits.h> @@ -489,7 +774,7 @@ FSRef fref; if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d->filePath)).data(), &fref, 0) == noErr) { --- qt-copy/src/corelib/io/qprocess_unix.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -80,7 +80,7 @@ #include "qprocess.h" #include "qprocess_p.h" @@ -509,7 +794,7 @@ QFileInfo fileInfo(QString::fromUtf8(encodedProgramName.constData())); if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) { --- qt-copy/src/corelib/io/qsettings.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -290,7 +290,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp @@ -583,7 +868,7 @@ #endif } --- qt-copy/src/corelib/io/qsettings_p.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-03 14:00:09.000000000 -0400 @@ -275,7 +275,7 @@ void initAccess(); void syncConfFile(int confFileNo); @@ -594,7 +879,7 @@ bool writePlistFile(const QString &fileName, const ParsedSettingsMap &map) const; #endif --- qt-copy/src/corelib/plugin/qlibrary.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -49,7 +49,7 @@ #include <qmap.h> #include <qsettings.h> @@ -641,7 +926,7 @@ // use unix shortcut to avoid loading the library success = qt_unix_query(fileName, &qt_version, &debug, &key, this); --- qt-copy/src/corelib/plugin/qlibrary_unix.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -45,7 +45,7 @@ #ifndef QT_NO_LIBRARY @@ -681,7 +966,7 @@ { return dlsym(handle, symbol); --- qt-copy/src/corelib/tools/qlocale.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -50,7 +50,7 @@ # include "qt_windows.h" # include <time.h> @@ -701,7 +986,7 @@ ** Wrappers for Mac locale system functions */ --- qt-copy/src/corelib/tools/qpoint.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-03 14:00:09.000000000 -0400 @@ -79,7 +79,7 @@ private: @@ -712,7 +997,7 @@ int xp; #else --- qt-copy/src/corelib/tools/qrect.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-03 14:00:09.000000000 -0400 @@ -167,7 +167,7 @@ #if defined(Q_WS_X11) || defined(Q_OS_TEMP) friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); @@ -723,7 +1008,7 @@ int x1; int y2; --- qt-copy/src/corelib/tools/qstring.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -51,7 +51,7 @@ #include "qhash.h" #include "qdebug.h" @@ -743,7 +1028,7 @@ // strings the same way as native applications do, and also respects // the "Order for sorted lists" setting in the International preferences --- qt-copy/src/gui/dialogs/qprintdialog.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-03 14:00:09.000000000 -0400 @@ -61,7 +61,7 @@ int exec(); @@ -754,7 +1039,7 @@ QPrinter *printer() const; void addButton(QPushButton *button); --- qt-copy/src/gui/kernel/qapplication.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-03 14:00:09.000000000 -0400 @@ -289,7 +289,7 @@ #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; } @@ -765,7 +1050,7 @@ #endif # ifndef QT_NO_CURSOR --- qt-copy/src/gui/kernel/qapplication_p.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-03 14:00:09.000000000 -0400 @@ -84,7 +84,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; @@ -776,7 +1061,7 @@ #endif #if defined(Q_WS_QWS) --- qt-copy/src/gui/widgets/qdockwidget.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -898,7 +898,7 @@ if (state->nca) { endDrag(); @@ -796,7 +1081,7 @@ endDrag(); #endif --- qt-copy/src/tools/uic/cpp/cppwriteinitialization.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-03 14:00:09.000000000 -0400 @@ -61,7 +61,7 @@ int compare(const FontHandle &) const; private: Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.info&rev=1034&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original) +++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Sat Nov 3 20:17:19 2007 @@ -44,7 +44,7 @@ CompileScript: << #!/bin/sh -ev - /bin/sh ./configure-for-fink.sh "%p" "%N" -pch + /bin/sh ./configure-for-fink.sh "%p" "%N" -pch -verbose make << InstallScript: << @@ -56,7 +56,8 @@ export QTDIR=`pwd` export PATH="$QTDIR/bin:$PATH" - make install INSTALL_ROOT=%d + make -j1 install INSTALL_ROOT=%d + install -d -m 755 %i/bin for bin in linguist designer qtconfig; do ln -sf %p/lib/%N/bin/$bin %i/bin/${bin}4-x11 Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch&rev=1034&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Sat Nov 3 20:17:19 2007 @@ -1,38 +1,358 @@ +diff -uNr qt-copy/config.tests/qws/opengles/opengles.pro qt-copy-new/config.tests/qws/opengles/opengles.pro +--- qt-copy/config.tests/qws/opengles/opengles.pro 2007-05-08 18:10:01.000000000 -0400 ++++ qt-copy-new/config.tests/qws/opengles/opengles.pro 2007-11-03 14:03:57.000000000 -0400 +@@ -2,3 +2,4 @@ + QT -= gui network core + INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + LIBS += -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL ++CONFIG -= app_bundle diff -uNr qt-copy/config.tests/unix/3dnow/3dnow.pro qt-copy-new/config.tests/unix/3dnow/3dnow.pro --- qt-copy/config.tests/unix/3dnow/3dnow.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-03 14:03:53.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = 3dnow.cpp +-CONFIG -= x11 qt +- ++CONFIG -= x11 qt app_bundle +diff -uNr qt-copy/config.tests/unix/clock-monotonic/clock-monotonic.pro qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro +--- qt-copy/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-03-26 14:33:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-11-03 14:04:04.000000000 -0400 @@ -1,3 +1,3 @@ - SOURCES = 3dnow.cpp - CONFIG -= x11 qt -- -+mac:CONFIG -= app_bundle +-CONFIG -= qt dylib mac_bundle ++CONFIG -= qt dylib app_bundle + SOURCES = clock-monotonic.cpp + include(clock-monotonic.pri) +diff -uNr qt-copy/config.tests/unix/cups/cups.pro qt-copy-new/config.tests/unix/cups/cups.pro +--- qt-copy/config.tests/unix/cups/cups.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/cups/cups.pro 2007-11-03 14:02:19.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = cups.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lcups +diff -uNr qt-copy/config.tests/unix/db2/db2.pro qt-copy-new/config.tests/unix/db2/db2.pro +--- qt-copy/config.tests/unix/db2/db2.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/db2/db2.pro 2007-11-03 14:02:30.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = db2.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ldb2 +diff -uNr qt-copy/config.tests/unix/dbus/dbus.pro qt-copy-new/config.tests/unix/dbus/dbus.pro +--- qt-copy/config.tests/unix/dbus/dbus.pro 2006-08-30 11:38:24.000000000 -0400 ++++ qt-copy-new/config.tests/unix/dbus/dbus.pro 2007-11-03 14:02:34.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = dbus.cpp +-CONFIG -= qt +-CONFIG -= app_bundle ++CONFIG -= qt app_bundle +diff -uNr qt-copy/config.tests/unix/doubleformat/doubleformattest.pro qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro +--- qt-copy/config.tests/unix/doubleformat/doubleformattest.pro 2007-03-12 10:53:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro 2007-11-03 14:02:39.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=doubleformattest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=doubleformattest.cpp +diff -uNr qt-copy/config.tests/unix/endian/endiantest.pro qt-copy-new/config.tests/unix/endian/endiantest.pro +--- qt-copy/config.tests/unix/endian/endiantest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/unix/endian/endiantest.pro 2007-11-03 14:02:43.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=endiantest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=endiantest.cpp +diff -uNr qt-copy/config.tests/unix/floatmath/floatmath.pro qt-copy-new/config.tests/unix/floatmath/floatmath.pro +--- qt-copy/config.tests/unix/floatmath/floatmath.pro 2007-04-23 13:11:29.000000000 -0400 ++++ qt-copy-new/config.tests/unix/floatmath/floatmath.pro 2007-11-03 14:02:48.000000000 -0400 +@@ -1,3 +1,3 @@ + SOURCES = floatmath.cpp +-CONFIG -= x11 qt ++CONFIG -= x11 qt app_bundle + +diff -uNr qt-copy/config.tests/unix/freetype/freetype.pro qt-copy-new/config.tests/unix/freetype/freetype.pro +--- qt-copy/config.tests/unix/freetype/freetype.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/unix/freetype/freetype.pro 2007-11-03 14:02:53.000000000 -0400 +@@ -1,5 +1,5 @@ + SOURCES = freetype.cpp + CONFIG += x11 +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lfreetype + include(freetype.pri) +diff -uNr qt-copy/config.tests/unix/getaddrinfo/getaddrinfo.pro qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro +--- qt-copy/config.tests/unix/getaddrinfo/getaddrinfo.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2007-11-03 14:02:58.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = getaddrinfotest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + solaris-cc*:LIBS += -lsocket -lnsl +diff -uNr qt-copy/config.tests/unix/getifaddrs/getifaddrs.pro qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro +--- qt-copy/config.tests/unix/getifaddrs/getifaddrs.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro 2007-11-03 14:03:03.000000000 -0400 +@@ -1,6 +1,5 @@ + TARGET=getifaddrs +-CONFIG -= qt +-mac:CONFIG -= app_bundle ++CONFIG -= qt app_bundle + QT = + TEMPLATE=app + SOURCES=getifaddrs.cpp +diff -uNr qt-copy/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp +--- qt-copy/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2006-08-30 11:38:24.000000000 -0400 ++++ qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2007-11-03 14:22:16.000000000 -0400 +@@ -7,7 +7,7 @@ + { + iconv_t x = iconv_open("", ""); + +- const char *inp; ++ char *inp; + char *outp; + size_t inbytes, outbytes; + iconv(x, &inp, &inbytes, &outp, &outbytes); +diff -uNr qt-copy/config.tests/unix/ibase/ibase.pro qt-copy-new/config.tests/unix/ibase/ibase.pro +--- qt-copy/config.tests/unix/ibase/ibase.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/ibase/ibase.pro 2007-11-03 14:03:25.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = ibase.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lgds +diff -uNr qt-copy/config.tests/unix/inotify/inotify.pro qt-copy-new/config.tests/unix/inotify/inotify.pro +--- qt-copy/config.tests/unix/inotify/inotify.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/inotify/inotify.pro 2007-11-03 14:03:30.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = inotifytest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +diff -uNr qt-copy/config.tests/unix/ipv6/ipv6.pro qt-copy-new/config.tests/unix/ipv6/ipv6.pro +--- qt-copy/config.tests/unix/ipv6/ipv6.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/ipv6/ipv6.pro 2007-11-03 14:04:46.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = ipv6test.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +diff -uNr qt-copy/config.tests/unix/ipv6ifname/ipv6ifname.pro qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro +--- qt-copy/config.tests/unix/ipv6ifname/ipv6ifname.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2007-11-03 14:04:50.000000000 -0400 +@@ -1,6 +1,5 @@ + TARGET=ipv6ifname +-CONFIG -= qt +-mac:CONFIG -= app_bundle ++CONFIG -= qt app_bundle + QT = + TEMPLATE=app + SOURCES=ipv6ifname.cpp +diff -uNr qt-copy/config.tests/unix/largefile/largefile.pro qt-copy-new/config.tests/unix/largefile/largefile.pro +--- qt-copy/config.tests/unix/largefile/largefile.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/largefile/largefile.pro 2007-11-03 14:05:06.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES=largefiletest.cpp +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle +diff -uNr qt-copy/config.tests/unix/libjpeg/libjpeg.pro qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro +--- qt-copy/config.tests/unix/libjpeg/libjpeg.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro 2007-11-03 14:05:11.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libjpeg.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ljpeg +diff -uNr qt-copy/config.tests/unix/libmng/libmng.pro qt-copy-new/config.tests/unix/libmng/libmng.pro +--- qt-copy/config.tests/unix/libmng/libmng.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libmng/libmng.pro 2007-11-03 14:05:14.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libmng.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lmng +diff -uNr qt-copy/config.tests/unix/libpng/libpng.pro qt-copy-new/config.tests/unix/libpng/libpng.pro +--- qt-copy/config.tests/unix/libpng/libpng.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/libpng/libpng.pro 2007-11-03 14:05:19.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libpng.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lpng +diff -uNr qt-copy/config.tests/unix/libtiff/libtiff.pro qt-copy-new/config.tests/unix/libtiff/libtiff.pro +--- qt-copy/config.tests/unix/libtiff/libtiff.pro 2007-03-26 14:33:21.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libtiff/libtiff.pro 2007-11-03 14:05:22.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = libtiff.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -ltiff diff -uNr qt-copy/config.tests/unix/mmx/mmx.pro qt-copy-new/config.tests/unix/mmx/mmx.pro --- qt-copy/config.tests/unix/mmx/mmx.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-02 16:42:07.000000000 -0400 -@@ -1,3 +1,3 @@ ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-03 14:05:26.000000000 -0400 +@@ -1,3 +1,2 @@ SOURCES = mmx.cpp - CONFIG -= x11 qt +-CONFIG -= x11 qt - -+mac:CONFIG -= app_bundle ++CONFIG -= x11 qt app_bundle +diff -uNr qt-copy/config.tests/unix/mysql_r/mysql_r.pro qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro +--- qt-copy/config.tests/unix/mysql_r/mysql_r.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro 2007-11-03 14:05:33.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = ../mysql/mysql.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lmysqlclient_r +diff -uNr qt-copy/config.tests/unix/nis/nis.pro qt-copy-new/config.tests/unix/nis/nis.pro +--- qt-copy/config.tests/unix/nis/nis.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/nis/nis.pro 2007-11-03 14:05:39.000000000 -0400 +@@ -1,5 +1,4 @@ + SOURCES = nis.cpp +-CONFIG -= qt dylib +-mac: CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + solaris-*:LIBS += -lnsl + else:LIBS += $$QMAKE_LIBS_NIS +diff -uNr qt-copy/config.tests/unix/oci/oci.pro qt-copy-new/config.tests/unix/oci/oci.pro +--- qt-copy/config.tests/unix/oci/oci.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/oci/oci.pro 2007-11-03 14:05:43.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = oci.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lclntsh +diff -uNr qt-copy/config.tests/unix/odbc/odbc.pro qt-copy-new/config.tests/unix/odbc/odbc.pro +--- qt-copy/config.tests/unix/odbc/odbc.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/odbc/odbc.pro 2007-11-03 14:05:48.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = odbc.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lodbc +diff -uNr qt-copy/config.tests/unix/psql/psql.pro qt-copy-new/config.tests/unix/psql/psql.pro +--- qt-copy/config.tests/unix/psql/psql.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/psql/psql.pro 2007-11-03 14:06:40.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = psql.cpp +-CONFIG -= qt dylib +-CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lpq +diff -uNr qt-copy/config.tests/unix/ptrsize/ptrsizetest.pro qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro +--- qt-copy/config.tests/unix/ptrsize/ptrsizetest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro 2007-11-03 14:06:44.000000000 -0400 +@@ -1,5 +1,4 @@ + TARGET=ptrsizetest +-CONFIG-=qt dylib +-mac:CONFIG -= app_bundle ++CONFIG-=qt dylib app_bundle + TEMPLATE=app + SOURCES=ptrsizetest.cpp +diff -uNr qt-copy/config.tests/unix/sqlite/sqlite.pro qt-copy-new/config.tests/unix/sqlite/sqlite.pro +--- qt-copy/config.tests/unix/sqlite/sqlite.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sqlite/sqlite.pro 2007-11-03 14:06:47.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = sqlite.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsqlite3 +diff -uNr qt-copy/config.tests/unix/sqlite2/sqlite2.pro qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro +--- qt-copy/config.tests/unix/sqlite2/sqlite2.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro 2007-11-03 14:06:50.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = sqlite2.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsqlite diff -uNr qt-copy/config.tests/unix/sse/sse.pro qt-copy-new/config.tests/unix/sse/sse.pro --- qt-copy/config.tests/unix/sse/sse.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-11-02 16:42:07.000000000 -0400 -@@ -1,3 +1,3 @@ ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-11-03 14:06:53.000000000 -0400 +@@ -1,3 +1,2 @@ SOURCES = sse.cpp - CONFIG -= x11 qt +-CONFIG -= x11 qt - -+mac:CONFIG -= app_bundle ++CONFIG -= x11 qt app_bundle diff -uNr qt-copy/config.tests/unix/sse2/sse2.pro qt-copy-new/config.tests/unix/sse2/sse2.pro --- qt-copy/config.tests/unix/sse2/sse2.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-11-03 14:06:56.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = sse2.cpp +-CONFIG -= x11 qt +- ++CONFIG -= x11 qt app_bundle +diff -uNr qt-copy/config.tests/unix/stl/stl.pro qt-copy-new/config.tests/unix/stl/stl.pro +--- qt-copy/config.tests/unix/stl/stl.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/stl/stl.pro 2007-11-03 14:06:59.000000000 -0400 +@@ -1,3 +1,2 @@ + SOURCES = stltest.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle +diff -uNr qt-copy/config.tests/unix/tds/tds.pro qt-copy-new/config.tests/unix/tds/tds.pro +--- qt-copy/config.tests/unix/tds/tds.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/tds/tds.pro 2007-11-03 14:07:02.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = tds.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lsybdb +diff -uNr qt-copy/config.tests/unix/tslib/tslib.pro qt-copy-new/config.tests/unix/tslib/tslib.pro +--- qt-copy/config.tests/unix/tslib/tslib.pro 2006-07-01 13:35:05.000000000 -0400 ++++ qt-copy-new/config.tests/unix/tslib/tslib.pro 2007-11-03 14:07:06.000000000 -0400 @@ -1,3 +1,3 @@ - SOURCES = sse2.cpp - CONFIG -= x11 qt -- -+mac:CONFIG -= app_bundle + SOURCES = tslib.cpp +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lts +diff -uNr qt-copy/config.tests/unix/zlib/zlib.pro qt-copy-new/config.tests/unix/zlib/zlib.pro +--- qt-copy/config.tests/unix/zlib/zlib.pro 2005-12-01 09:53:01.000000000 -0500 ++++ qt-copy-new/config.tests/unix/zlib/zlib.pro 2007-11-03 14:07:10.000000000 -0400 +@@ -1,4 +1,3 @@ + SOURCES = zlib.cpp +-CONFIG -= qt dylib +-mac:CONFIG -= app_bundle ++CONFIG -= qt dylib app_bundle + LIBS += -lz +diff -uNr qt-copy/config.tests/x11/fontconfig/fontconfig.pro qt-copy-new/config.tests/x11/fontconfig/fontconfig.pro +--- qt-copy/config.tests/x11/fontconfig/fontconfig.pro 2006-05-02 11:13:54.000000000 -0400 ++++ qt-copy-new/config.tests/x11/fontconfig/fontconfig.pro 2007-11-03 14:07:15.000000000 -0400 +@@ -1,5 +1,5 @@ + SOURCES = fontconfig.cpp + CONFIG += x11 +-CONFIG -= qt ++CONFIG -= qt app_bundle + LIBS += -lfreetype -lfontconfig + include(../../unix/freetype/freetype.pri) +diff -uNr qt-copy/config.tests/x11/notype/notypetest.pro qt-copy-new/config.tests/x11/notype/notypetest.pro +--- qt-copy/config.tests/x11/notype/notypetest.pro 2005-07-27 16:07:43.000000000 -0400 ++++ qt-copy-new/config.tests/x11/notype/notypetest.pro 2007-11-03 14:07:18.000000000 -0400 +@@ -1,5 +1,5 @@ + TEMPLATE=app + TARGET=notypetest +-CONFIG-=qt ++CONFIG-=qt app_bundle + CONFIG+=x11 + SOURCES=notypetest.cpp diff -uNr qt-copy/configure qt-copy-new/configure --- qt-copy/configure 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/configure 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/configure 2007-11-03 14:00:09.000000000 -0400 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; @@ -71,7 +391,7 @@ for DEF in $D_FLAGS; do diff -uNr qt-copy/configure-for-fink.sh qt-copy-new/configure-for-fink.sh --- qt-copy/configure-for-fink.sh 1969-12-31 19:00:00.000000000 -0500 -+++ qt-copy-new/configure-for-fink.sh 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2007-11-03 14:00:09.000000000 -0400 @@ -0,0 +1,60 @@ +#!/bin/sh -e + @@ -135,7 +455,7 @@ +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" diff -uNr qt-copy/mkspecs/common/mac-g++.conf qt-copy-new/mkspecs/common/mac-g++.conf --- qt-copy/mkspecs/common/mac-g++.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/common/mac-g++.conf 2007-11-02 16:42:27.000000000 -0400 ++++ qt-copy-new/mkspecs/common/mac-g++.conf 2007-11-03 14:00:09.000000000 -0400 @@ -50,7 +50,7 @@ QMAKE_LINK = c++ @@ -147,7 +467,7 @@ QMAKE_LFLAGS_APP += diff -uNr qt-copy/mkspecs/darwin-g++/qmake.conf qt-copy-new/mkspecs/darwin-g++/qmake.conf --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-02 16:42:23.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-03 14:00:09.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -224,7 +544,7 @@ load(qt_config) diff -uNr qt-copy/mkspecs/macx-g++/qmake.conf qt-copy-new/mkspecs/macx-g++/qmake.conf --- qt-copy/mkspecs/macx-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-03 14:00:09.000000000 -0400 @@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX @@ -242,7 +562,7 @@ load(qt_config) diff -uNr qt-copy/projects.pro qt-copy-new/projects.pro --- qt-copy/projects.pro 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/projects.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/projects.pro 2007-11-03 14:00:09.000000000 -0400 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip @@ -265,7 +585,7 @@ } else:isEqual(PROJECT, qmake) { diff -uNr qt-copy/qmake/generators/mac/pbuilder_pbx.cpp qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp --- qt-copy/qmake/generators/mac/pbuilder_pbx.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -49,7 +49,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -286,7 +606,7 @@ OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl); diff -uNr qt-copy/qmake/generators/unix/unixmake.cpp qt-copy-new/qmake/generators/unix/unixmake.cpp --- qt-copy/qmake/generators/unix/unixmake.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -45,6 +45,8 @@ #include <time.h> #include <qdebug.h> @@ -354,7 +674,7 @@ else diff -uNr qt-copy/qmake/option.cpp qt-copy-new/qmake/option.cpp --- qt-copy/qmake/option.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/qmake/option.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/qmake/option.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -92,7 +92,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) @@ -366,7 +686,7 @@ Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE; diff -uNr qt-copy/src/corelib/corelib.pro qt-copy-new/src/corelib/corelib.pro --- qt-copy/src/corelib/corelib.pro 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/src/corelib/corelib.pro 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2007-11-03 14:00:09.000000000 -0400 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) @@ -378,7 +698,7 @@ win32:DEFINES-=QT_NO_CAST_TO_ASCII diff -uNr qt-copy/src/corelib/global/qglobal.cpp qt-copy-new/src/corelib/global/qglobal.cpp --- qt-copy/src/corelib/global/qglobal.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -1609,7 +1609,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif @@ -390,7 +710,7 @@ #include "qnamespace.h" diff -uNr qt-copy/src/corelib/global/qlibraryinfo.cpp qt-copy-new/src/corelib/global/qlibraryinfo.cpp --- qt-copy/src/corelib/global/qlibraryinfo.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -47,7 +47,7 @@ #else # include "qcoreapplication.h" @@ -420,7 +740,7 @@ QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef); diff -uNr qt-copy/src/corelib/global/qnamespace.h qt-copy-new/src/corelib/global/qnamespace.h --- qt-copy/src/corelib/global/qnamespace.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-03 14:00:09.000000000 -0400 @@ -960,7 +960,7 @@ }; @@ -441,7 +761,7 @@ #ifndef qdoc diff -uNr qt-copy/src/corelib/io/qfsfileengine_unix.cpp qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp --- qt-copy/src/corelib/io/qfsfileengine_unix.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -51,7 +51,7 @@ #include <stdlib.h> #include <limits.h> @@ -507,7 +827,7 @@ if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d->filePath)).data(), &fref, 0) == noErr) { diff -uNr qt-copy/src/corelib/io/qprocess_unix.cpp qt-copy-new/src/corelib/io/qprocess_unix.cpp --- qt-copy/src/corelib/io/qprocess_unix.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -80,7 +80,7 @@ #include "qprocess.h" #include "qprocess_p.h" @@ -528,7 +848,7 @@ if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) { diff -uNr qt-copy/src/corelib/io/qsettings.cpp qt-copy-new/src/corelib/io/qsettings.cpp --- qt-copy/src/corelib/io/qsettings.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -290,7 +290,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp @@ -603,7 +923,7 @@ } diff -uNr qt-copy/src/corelib/io/qsettings_p.h qt-copy-new/src/corelib/io/qsettings_p.h --- qt-copy/src/corelib/io/qsettings_p.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-03 14:00:09.000000000 -0400 @@ -275,7 +275,7 @@ void initAccess(); void syncConfFile(int confFileNo); @@ -615,7 +935,7 @@ #endif diff -uNr qt-copy/src/corelib/plugin/qlibrary.cpp qt-copy-new/src/corelib/plugin/qlibrary.cpp --- qt-copy/src/corelib/plugin/qlibrary.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -49,7 +49,7 @@ #include <qmap.h> #include <qsettings.h> @@ -663,7 +983,7 @@ success = qt_unix_query(fileName, &qt_version, &debug, &key, this); diff -uNr qt-copy/src/corelib/plugin/qlibrary_unix.cpp qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp --- qt-copy/src/corelib/plugin/qlibrary_unix.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -45,7 +45,7 @@ #ifndef QT_NO_LIBRARY @@ -704,7 +1024,7 @@ return dlsym(handle, symbol); diff -uNr qt-copy/src/corelib/tools/qlocale.cpp qt-copy-new/src/corelib/tools/qlocale.cpp --- qt-copy/src/corelib/tools/qlocale.cpp 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -50,7 +50,7 @@ # include "qt_windows.h" # include <time.h> @@ -725,7 +1045,7 @@ */ diff -uNr qt-copy/src/corelib/tools/qpoint.h qt-copy-new/src/corelib/tools/qpoint.h --- qt-copy/src/corelib/tools/qpoint.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-03 14:00:09.000000000 -0400 @@ -79,7 +79,7 @@ private: @@ -737,7 +1057,7 @@ #else diff -uNr qt-copy/src/corelib/tools/qrect.h qt-copy-new/src/corelib/tools/qrect.h --- qt-copy/src/corelib/tools/qrect.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-03 14:00:09.000000000 -0400 @@ -167,7 +167,7 @@ #if defined(Q_WS_X11) || defined(Q_OS_TEMP) friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); @@ -749,7 +1069,7 @@ int y2; diff -uNr qt-copy/src/corelib/tools/qstring.cpp qt-copy-new/src/corelib/tools/qstring.cpp --- qt-copy/src/corelib/tools/qstring.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -51,7 +51,7 @@ #include "qhash.h" #include "qdebug.h" @@ -770,7 +1090,7 @@ // the "Order for sorted lists" setting in the International preferences diff -uNr qt-copy/src/gui/dialogs/qprintdialog.h qt-copy-new/src/gui/dialogs/qprintdialog.h --- qt-copy/src/gui/dialogs/qprintdialog.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-03 14:00:09.000000000 -0400 @@ -61,7 +61,7 @@ int exec(); @@ -782,7 +1102,7 @@ void addButton(QPushButton *button); diff -uNr qt-copy/src/gui/kernel/qapplication.h qt-copy-new/src/gui/kernel/qapplication.h --- qt-copy/src/gui/kernel/qapplication.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-03 14:00:09.000000000 -0400 @@ -289,7 +289,7 @@ #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; } @@ -794,7 +1114,7 @@ # ifndef QT_NO_CURSOR diff -uNr qt-copy/src/gui/kernel/qapplication_p.h qt-copy-new/src/gui/kernel/qapplication_p.h --- qt-copy/src/gui/kernel/qapplication_p.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-03 14:00:09.000000000 -0400 @@ -84,7 +84,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; @@ -806,7 +1126,7 @@ #if defined(Q_WS_QWS) diff -uNr qt-copy/src/gui/widgets/qdockwidget.cpp qt-copy-new/src/gui/widgets/qdockwidget.cpp --- qt-copy/src/gui/widgets/qdockwidget.cpp 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-03 14:00:09.000000000 -0400 @@ -898,7 +898,7 @@ if (state->nca) { endDrag(); @@ -827,7 +1147,7 @@ #endif diff -uNr qt-copy/src/tools/uic/cpp/cppwriteinitialization.h qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h --- qt-copy/src/tools/uic/cpp/cppwriteinitialization.h 2007-08-16 08:16:51.000000000 -0400 -+++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-02 16:42:07.000000000 -0400 ++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-03 14:00:09.000000000 -0400 @@ -61,7 +61,7 @@ int compare(const FontHandle &) const; private: ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs