Author: ranger Date: Fri Oct 12 04:41:01 2007 New Revision: 1004 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1004&repname=user%3a+ranger Log: call plugins .bundle
Modified: trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch trunk/experimental/10.4/main/finkinfo/x11/qt4-x11.patch trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Modified: trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch&rev=1004&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/10.3/main/finkinfo/x11/qt4-x11.patch Fri Oct 12 04:41:01 2007 @@ -1,34 +1,34 @@ --- 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-10-11 14:07:52.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = 3dnow.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-10-11 14:07:48.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-10-11 22:37:35.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-10-11 14:07:55.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-10-11 22:37:35.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-10-11 14:07:58.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = sse2.cpp CONFIG -= x11 qt - +mac:CONFIG -= app_bundle --- qt-copy/configure 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/configure 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/configure 2007-10-11 22:37:35.000000000 -0400 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; @@ -66,7 +66,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-10-11 16:09:03.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2007-10-11 22:37:35.000000000 -0400 @@ -0,0 +1,60 @@ +#!/bin/sh -e + @@ -129,7 +129,7 @@ +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -202,8 +202,8 @@ 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-10-11 16:36:20.000000000 -0400 -@@ -8,7 +8,7 @@ ++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-10-11 22:39:07.000000000 -0400 +@@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app @@ -212,8 +212,14 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib + include(../common/mac-g++.conf) + ++QMAKE_EXTENSION_PLUGIN = bundle ++QMAKE_LFLAGS_PLUGIN = -prebind -bundle ++ + load(qt_config) --- qt-copy/projects.pro 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/projects.pro 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/projects.pro 2007-10-11 22:37:35.000000000 -0400 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip @@ -235,7 +241,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -255,7 +261,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-10-11 12:27:39.000000000 -0400 ++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,6 +45,8 @@ #include <time.h> #include <qdebug.h> @@ -322,7 +328,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/option.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -92,7 +92,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) @@ -333,7 +339,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2007-10-11 22:37:35.000000000 -0400 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) @@ -344,7 +350,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -1609,7 +1609,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif @@ -355,7 +361,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -47,7 +47,7 @@ #else # include "qcoreapplication.h" @@ -384,7 +390,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-10-11 22:37:35.000000000 -0400 @@ -960,7 +960,7 @@ }; @@ -404,7 +410,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include <stdlib.h> #include <limits.h> @@ -469,7 +475,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -80,7 +80,7 @@ #include "qprocess.h" #include "qprocess_p.h" @@ -489,7 +495,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-10-11 13:41:25.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -290,7 +290,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp @@ -563,7 +569,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -275,7 +275,7 @@ void initAccess(); void syncConfFile(int confFileNo); @@ -574,7 +580,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ #include <qmap.h> #include <qsettings.h> @@ -621,7 +627,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,7 +45,7 @@ #ifndef QT_NO_LIBRARY @@ -661,7 +667,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -50,7 +50,7 @@ # include "qt_windows.h" # include <time.h> @@ -681,7 +687,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-10-11 22:37:35.000000000 -0400 @@ -79,7 +79,7 @@ private: @@ -692,7 +698,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qrect.h 2007-10-11 22:37:35.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); @@ -703,7 +709,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include "qhash.h" #include "qdebug.h" @@ -723,7 +729,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-10-11 22:37:35.000000000 -0400 @@ -61,7 +61,7 @@ int exec(); @@ -734,7 +740,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-10-11 22:37:35.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; } @@ -745,7 +751,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -84,7 +84,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; @@ -756,7 +762,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -898,7 +898,7 @@ if (state->nca) { endDrag(); @@ -776,7 +782,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-10-11 22:37:35.000000000 -0400 @@ -61,7 +61,7 @@ int compare(const FontHandle &) const; private: 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=1004&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 Fri Oct 12 04:41:01 2007 @@ -1,34 +1,34 @@ --- 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-10-11 14:07:52.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = 3dnow.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-10-11 14:07:48.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-10-11 22:37:35.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-10-11 14:07:55.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-10-11 22:37:35.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-10-11 14:07:58.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = sse2.cpp CONFIG -= x11 qt - +mac:CONFIG -= app_bundle --- qt-copy/configure 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/configure 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/configure 2007-10-11 22:37:35.000000000 -0400 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; @@ -66,7 +66,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-10-11 16:09:03.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2007-10-11 22:37:35.000000000 -0400 @@ -0,0 +1,60 @@ +#!/bin/sh -e + @@ -129,7 +129,7 @@ +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" --- qt-copy/mkspecs/darwin-g++/qmake.conf 2007-04-23 17:45:45.000000000 -0400 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -202,8 +202,8 @@ 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-10-11 16:36:20.000000000 -0400 -@@ -8,7 +8,7 @@ ++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-10-11 22:39:07.000000000 -0400 +@@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app @@ -212,8 +212,14 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib + include(../common/mac-g++.conf) + ++QMAKE_EXTENSION_PLUGIN = bundle ++QMAKE_LFLAGS_PLUGIN = -prebind -bundle ++ + load(qt_config) --- qt-copy/projects.pro 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/projects.pro 2007-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/projects.pro 2007-10-11 22:37:35.000000000 -0400 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip @@ -235,7 +241,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -255,7 +261,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-10-11 12:27:39.000000000 -0400 ++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,6 +45,8 @@ #include <time.h> #include <qdebug.h> @@ -322,7 +328,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/option.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -92,7 +92,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) @@ -333,7 +339,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2007-10-11 22:37:35.000000000 -0400 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) @@ -344,7 +350,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -1609,7 +1609,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif @@ -355,7 +361,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -47,7 +47,7 @@ #else # include "qcoreapplication.h" @@ -384,7 +390,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-10-11 22:37:35.000000000 -0400 @@ -960,7 +960,7 @@ }; @@ -404,7 +410,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include <stdlib.h> #include <limits.h> @@ -469,7 +475,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -80,7 +80,7 @@ #include "qprocess.h" #include "qprocess_p.h" @@ -489,7 +495,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-10-11 13:41:25.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -290,7 +290,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp @@ -563,7 +569,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -275,7 +275,7 @@ void initAccess(); void syncConfFile(int confFileNo); @@ -574,7 +580,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ #include <qmap.h> #include <qsettings.h> @@ -621,7 +627,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,7 +45,7 @@ #ifndef QT_NO_LIBRARY @@ -661,7 +667,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -50,7 +50,7 @@ # include "qt_windows.h" # include <time.h> @@ -681,7 +687,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-10-11 22:37:35.000000000 -0400 @@ -79,7 +79,7 @@ private: @@ -692,7 +698,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qrect.h 2007-10-11 22:37:35.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); @@ -703,7 +709,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include "qhash.h" #include "qdebug.h" @@ -723,7 +729,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-10-11 22:37:35.000000000 -0400 @@ -61,7 +61,7 @@ int exec(); @@ -734,7 +740,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-10-11 22:37:35.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; } @@ -745,7 +751,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -84,7 +84,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; @@ -756,7 +762,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -898,7 +898,7 @@ if (state->nca) { endDrag(); @@ -776,7 +782,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-10-11 22:37:35.000000000 -0400 @@ -61,7 +61,7 @@ int compare(const FontHandle &) const; private: 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=1004&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch (original) +++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Fri Oct 12 04:41:01 2007 @@ -1,6 +1,6 @@ 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-10-11 14:07:52.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = 3dnow.cpp CONFIG -= x11 qt @@ -8,7 +8,7 @@ +mac:CONFIG -= app_bundle 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-10-11 14:07:48.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = mmx.cpp CONFIG -= x11 qt @@ -16,7 +16,7 @@ +mac:CONFIG -= app_bundle 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-10-11 14:07:55.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = sse.cpp CONFIG -= x11 qt @@ -24,7 +24,7 @@ +mac:CONFIG -= 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-10-11 14:07:58.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2007-10-11 22:37:35.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = sse2.cpp CONFIG -= x11 qt @@ -32,7 +32,7 @@ +mac:CONFIG -= app_bundle 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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/configure 2007-10-11 22:37:35.000000000 -0400 @@ -994,16 +994,15 @@ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; @@ -71,7 +71,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-10-11 16:09:03.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2007-10-11 22:37:35.000000000 -0400 @@ -0,0 +1,60 @@ +#!/bin/sh -e + @@ -135,7 +135,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/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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-10-11 22:37:35.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -209,8 +209,8 @@ 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-10-11 16:36:20.000000000 -0400 -@@ -8,7 +8,7 @@ ++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-10-11 22:39:07.000000000 -0400 +@@ -8,10 +8,13 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app @@ -219,9 +219,15 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib + include(../common/mac-g++.conf) + ++QMAKE_EXTENSION_PLUGIN = bundle ++QMAKE_LFLAGS_PLUGIN = -prebind -bundle ++ + 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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/projects.pro 2007-10-11 22:37:35.000000000 -0400 @@ -8,7 +8,7 @@ cross_compile: CONFIG += nostrip @@ -244,7 +250,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -265,7 +271,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-10-11 12:27:39.000000000 -0400 ++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,6 +45,8 @@ #include <time.h> #include <qdebug.h> @@ -333,7 +339,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/qmake/option.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -92,7 +92,7 @@ QStringList Option::shellPath; #if defined(Q_OS_WIN32) @@ -345,7 +351,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2007-10-11 22:37:35.000000000 -0400 @@ -14,7 +14,7 @@ include(kernel/kernel.pri) include(codecs/codecs.pri) @@ -357,7 +363,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -1609,7 +1609,7 @@ const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian); #endif @@ -369,7 +375,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -47,7 +47,7 @@ #else # include "qcoreapplication.h" @@ -399,7 +405,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-10-11 22:37:35.000000000 -0400 @@ -960,7 +960,7 @@ }; @@ -420,7 +426,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include <stdlib.h> #include <limits.h> @@ -486,7 +492,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -80,7 +80,7 @@ #include "qprocess.h" #include "qprocess_p.h" @@ -507,7 +513,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-10-11 13:41:25.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -290,7 +290,7 @@ // see also qsettings_win.cpp and qsettings_mac.cpp @@ -582,7 +588,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -275,7 +275,7 @@ void initAccess(); void syncConfFile(int confFileNo); @@ -594,7 +600,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -49,7 +49,7 @@ #include <qmap.h> #include <qsettings.h> @@ -642,7 +648,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -45,7 +45,7 @@ #ifndef QT_NO_LIBRARY @@ -683,7 +689,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -50,7 +50,7 @@ # include "qt_windows.h" # include <time.h> @@ -704,7 +710,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-10-11 22:37:35.000000000 -0400 @@ -79,7 +79,7 @@ private: @@ -716,7 +722,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qrect.h 2007-10-11 22:37:35.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); @@ -728,7 +734,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -51,7 +51,7 @@ #include "qhash.h" #include "qdebug.h" @@ -749,7 +755,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-10-11 22:37:35.000000000 -0400 @@ -61,7 +61,7 @@ int exec(); @@ -761,7 +767,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-10-11 22:37:35.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; } @@ -773,7 +779,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-10-11 22:37:35.000000000 -0400 @@ -84,7 +84,7 @@ # ifdef Q_OS_TEMP extern DWORD qt_cever; @@ -785,7 +791,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-10-11 22:37:35.000000000 -0400 @@ -898,7 +898,7 @@ if (state->nca) { endDrag(); @@ -806,7 +812,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-10-11 12:23:41.000000000 -0400 ++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-10-11 22:37:35.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 https://lists.sourceforge.net/lists/listinfo/fink-commits