Author: ranger
Date: Fri Nov 2 21:44:59 2007
New Revision: 1029
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1029&repname=user%3a+ranger
Log:
fix qt4-x11 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=1029&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 Fri Nov 2 21:44:59
2007
@@ -11,7 +11,7 @@
%N-designer (= %v-%r),
%N-linguist (= %v-%r),
%N-doc (= %v-%r),
- pkgconfig,
+ pkgconfig (>= 0.21-1),
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
@@ -29,7 +29,7 @@
libmng2,
libpng3 (>= 1.2.8-1),
macosx (>= 10.4.3-1),
- pkgconfig,
+ pkgconfig (>= 0.21-1),
x11-dev
<<
BuildDependsOnly: true
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=1029&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 Nov 2 21:44:59
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
22:37:35.000000000 -0400
++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-02
16:42:07.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 22:37:35.000000000
-0400
++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-02 16:42:07.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 22:37:35.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-10-11
22:37:35.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
--- qt-copy/configure 2007-10-08 19:27:05.000000000 -0400
-+++ qt-copy-new/configure 2007-10-11 22:37:35.000000000 -0400
++++ qt-copy-new/configure 2007-11-02 16:42:07.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 22:37:35.000000000 -0400
++++ qt-copy-new/configure-for-fink.sh 2007-11-02 16:42:07.000000000 -0400
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
@@ -128,8 +128,19 @@
+ FixifiedSW=`/bin/pwd`;
+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
+@@ -50,7 +50,7 @@
+
+ QMAKE_LINK = c++
+ QMAKE_LINK_SHLIB = c++
+-QMAKE_LFLAGS += -headerpad_max_install_names
++QMAKE_LFLAGS += -headerpad_max_install_names
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ QMAKE_LFLAGS_RELEASE +=
+ 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-10-11 22:43:55.000000000
-0400
++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-02 16:42:23.000000000
-0400
@@ -6,7 +6,7 @@
MAKEFILE_GENERATOR = UNIX
@@ -177,7 +188,7 @@
QMAKE_LINK = c++
QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
-+QMAKE_LFLAGS = -headerpad_max_install_names
++QMAKE_LFLAGS = -headerpad_max_install_names
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_APP = -prebind
@@ -205,7 +216,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-10-11 22:39:07.000000000
-0400
++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-02 16:42:07.000000000
-0400
@@ -8,10 +8,13 @@
MAKEFILE_GENERATOR = UNIX
@@ -222,7 +233,7 @@
+
load(qt_config)
--- qt-copy/projects.pro 2007-10-08 19:27:05.000000000 -0400
-+++ qt-copy-new/projects.pro 2007-10-11 22:37:35.000000000 -0400
++++ qt-copy-new/projects.pro 2007-11-02 16:42:07.000000000 -0400
@@ -8,7 +8,7 @@
cross_compile: CONFIG += nostrip
@@ -244,7 +255,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
22:37:35.000000000 -0400
++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -49,7 +49,7 @@
# include <sys/types.h>
# include <sys/stat.h>
@@ -264,7 +275,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
22:37:35.000000000 -0400
++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -45,6 +45,8 @@
#include <time.h>
#include <qdebug.h>
@@ -331,7 +342,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 22:37:35.000000000 -0400
++++ qt-copy-new/qmake/option.cpp 2007-11-02 16:42:07.000000000 -0400
@@ -92,7 +92,7 @@
QStringList Option::shellPath;
#if defined(Q_OS_WIN32)
@@ -342,7 +353,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/corelib.pro 2007-11-02 16:42:07.000000000
-0400
@@ -14,7 +14,7 @@
include(kernel/kernel.pri)
include(codecs/codecs.pri)
@@ -353,7 +364,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -1609,7 +1609,7 @@
const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ?
BigEndian : LittleEndian);
#endif
@@ -364,7 +375,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -47,7 +47,7 @@
#else
# include "qcoreapplication.h"
@@ -393,7 +404,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-02
16:42:07.000000000 -0400
@@ -960,7 +960,7 @@
};
@@ -413,7 +424,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -51,7 +51,7 @@
#include <stdlib.h>
#include <limits.h>
@@ -478,7 +489,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -80,7 +80,7 @@
#include "qprocess.h"
#include "qprocess_p.h"
@@ -498,7 +509,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -290,7 +290,7 @@
// see also qsettings_win.cpp and qsettings_mac.cpp
@@ -572,7 +583,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-02 16:42:07.000000000
-0400
@@ -275,7 +275,7 @@
void initAccess();
void syncConfFile(int confFileNo);
@@ -583,7 +594,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -49,7 +49,7 @@
#include <qmap.h>
#include <qsettings.h>
@@ -630,7 +641,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -45,7 +45,7 @@
#ifndef QT_NO_LIBRARY
@@ -670,7 +681,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -50,7 +50,7 @@
# include "qt_windows.h"
# include <time.h>
@@ -690,7 +701,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-02 16:42:07.000000000
-0400
@@ -79,7 +79,7 @@
private:
@@ -701,7 +712,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-02 16:42:07.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);
@@ -712,7 +723,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -51,7 +51,7 @@
#include "qhash.h"
#include "qdebug.h"
@@ -732,7 +743,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-02 16:42:07.000000000
-0400
@@ -61,7 +61,7 @@
int exec();
@@ -743,7 +754,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-02 16:42:07.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; }
@@ -754,7 +765,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-02
16:42:07.000000000 -0400
@@ -84,7 +84,7 @@
# ifdef Q_OS_TEMP
extern DWORD qt_cever;
@@ -765,7 +776,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -898,7 +898,7 @@
if (state->nca) {
endDrag();
@@ -785,7 +796,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-02
16:42:07.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=1029&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Fri Nov 2
21:44:59 2007
@@ -1,6 +1,6 @@
Package: qt4-x11
Version: 4.3.2
-Revision: 1
+Revision: 1021
GCC: 3.3
CustomMirror: RangerMirror
Source: mirror:custom:qt/qt-copy-20071010.tar.bz2
@@ -18,7 +18,7 @@
%N-designer (= %v-%r),
%N-linguist (= %v-%r),
%N-doc (= %v-%r),
- pkgconfig,
+ pkgconfig (>= 0.21-1),
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
@@ -37,7 +37,7 @@
libmng2,
libpng3 (>= 1.2.5-4),
macosx (>= 10.4.3-1),
- pkgconfig,
+ pkgconfig (>= 0.21-1),
x11-dev
<<
BuildDependsOnly: true
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=1029&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.patch Fri Nov 2
21:44:59 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
22:37:35.000000000 -0400
++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2007-11-02
16:42:07.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 22:37:35.000000000
-0400
++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2007-11-02 16:42:07.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 22:37:35.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
@@ -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
22:37:35.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
@@ -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 22:37:35.000000000 -0400
++++ qt-copy-new/configure 2007-11-02 16:42:07.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 22:37:35.000000000 -0400
++++ qt-copy-new/configure-for-fink.sh 2007-11-02 16:42:07.000000000 -0400
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
@@ -133,9 +133,21 @@
+ FixifiedSW=`/bin/pwd`;
+popd
+/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
+@@ -50,7 +50,7 @@
+
+ QMAKE_LINK = c++
+ QMAKE_LINK_SHLIB = c++
+-QMAKE_LFLAGS += -headerpad_max_install_names
++QMAKE_LFLAGS += -headerpad_max_install_names
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ QMAKE_LFLAGS_RELEASE +=
+ QMAKE_LFLAGS_DEBUG +=
+ 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-10-11 22:43:55.000000000
-0400
++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2007-11-02 16:42:23.000000000
-0400
@@ -6,7 +6,7 @@
MAKEFILE_GENERATOR = UNIX
@@ -183,7 +195,7 @@
QMAKE_LINK = c++
QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
-+QMAKE_LFLAGS = -headerpad_max_install_names
++QMAKE_LFLAGS = -headerpad_max_install_names
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_APP = -prebind
@@ -212,7 +224,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-10-11 22:39:07.000000000
-0400
++++ qt-copy-new/mkspecs/macx-g++/qmake.conf 2007-11-02 16:42:07.000000000
-0400
@@ -8,10 +8,13 @@
MAKEFILE_GENERATOR = UNIX
@@ -230,7 +242,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-10-11 22:37:35.000000000 -0400
++++ qt-copy-new/projects.pro 2007-11-02 16:42:07.000000000 -0400
@@ -8,7 +8,7 @@
cross_compile: CONFIG += nostrip
@@ -253,7 +265,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
22:37:35.000000000 -0400
++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -49,7 +49,7 @@
# include <sys/types.h>
# include <sys/stat.h>
@@ -274,7 +286,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
22:37:35.000000000 -0400
++++ qt-copy-new/qmake/generators/unix/unixmake.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -45,6 +45,8 @@
#include <time.h>
#include <qdebug.h>
@@ -342,7 +354,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 22:37:35.000000000 -0400
++++ qt-copy-new/qmake/option.cpp 2007-11-02 16:42:07.000000000 -0400
@@ -92,7 +92,7 @@
QStringList Option::shellPath;
#if defined(Q_OS_WIN32)
@@ -354,7 +366,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/corelib.pro 2007-11-02 16:42:07.000000000
-0400
@@ -14,7 +14,7 @@
include(kernel/kernel.pri)
include(codecs/codecs.pri)
@@ -366,7 +378,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/global/qglobal.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -1609,7 +1609,7 @@
const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ?
BigEndian : LittleEndian);
#endif
@@ -378,7 +390,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/global/qlibraryinfo.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -47,7 +47,7 @@
#else
# include "qcoreapplication.h"
@@ -408,7 +420,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-02
16:42:07.000000000 -0400
@@ -960,7 +960,7 @@
};
@@ -429,7 +441,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -51,7 +51,7 @@
#include <stdlib.h>
#include <limits.h>
@@ -495,7 +507,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -80,7 +80,7 @@
#include "qprocess.h"
#include "qprocess_p.h"
@@ -516,7 +528,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/io/qsettings.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -290,7 +290,7 @@
// see also qsettings_win.cpp and qsettings_mac.cpp
@@ -591,7 +603,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/io/qsettings_p.h 2007-11-02 16:42:07.000000000
-0400
@@ -275,7 +275,7 @@
void initAccess();
void syncConfFile(int confFileNo);
@@ -603,7 +615,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -49,7 +49,7 @@
#include <qmap.h>
#include <qsettings.h>
@@ -651,7 +663,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -45,7 +45,7 @@
#ifndef QT_NO_LIBRARY
@@ -692,7 +704,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qlocale.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -50,7 +50,7 @@
# include "qt_windows.h"
# include <time.h>
@@ -713,7 +725,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-02 16:42:07.000000000
-0400
@@ -79,7 +79,7 @@
private:
@@ -725,7 +737,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qrect.h 2007-11-02 16:42:07.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);
@@ -737,7 +749,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qstring.cpp 2007-11-02 16:42:07.000000000
-0400
@@ -51,7 +51,7 @@
#include "qhash.h"
#include "qdebug.h"
@@ -758,7 +770,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-02 16:42:07.000000000
-0400
@@ -61,7 +61,7 @@
int exec();
@@ -770,7 +782,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 22:37:35.000000000
-0400
++++ qt-copy-new/src/gui/kernel/qapplication.h 2007-11-02 16:42:07.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; }
@@ -782,7 +794,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/gui/kernel/qapplication_p.h 2007-11-02
16:42:07.000000000 -0400
@@ -84,7 +84,7 @@
# ifdef Q_OS_TEMP
extern DWORD qt_cever;
@@ -794,7 +806,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/gui/widgets/qdockwidget.cpp 2007-11-02
16:42:07.000000000 -0400
@@ -898,7 +898,7 @@
if (state->nca) {
endDrag();
@@ -815,7 +827,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
22:37:35.000000000 -0400
++++ qt-copy-new/src/tools/uic/cpp/cppwriteinitialization.h 2007-11-02
16:42:07.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
