Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv26035
Modified Files:
qt4-x11.info qt4-x11.patch
Log Message:
fixed for leopard
Index: qt4-x11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt4-x11.patch 15 Oct 2007 00:20:42 -0000 1.3
+++ qt4-x11.patch 3 Nov 2007 18:59:53 -0000 1.4
@@ -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-10-11
22:37:35.000000000 -0400
-@@ -1,3 +1,3 @@
++++ 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
-
-+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
++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 @@
+-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
+-CONFIG -= x11 qt
-
-+mac:CONFIG -= app_bundle
++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-10-11 22:37:35.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
--- 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
-@@ -1,3 +1,3 @@
++++ 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
-
-+mac:CONFIG -= app_bundle
++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 = 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-10-11 22:37:35.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-10-11 22:37:35.000000000 -0400
++++ qt-copy-new/configure-for-fink.sh 2007-11-03 14:00:09.000000000 -0400
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
@@ -128,8 +413,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-03 14:00:09.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-03 14:00:09.000000000
-0400
@@ -6,7 +6,7 @@
MAKEFILE_GENERATOR = UNIX
@@ -177,7 +473,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 +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-10-11 22:39: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
@@ -222,7 +518,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-03 14:00:09.000000000 -0400
@@ -8,7 +8,7 @@
cross_compile: CONFIG += nostrip
@@ -244,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-10-11
22:37:35.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>
@@ -264,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-10-11
22:37:35.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>
@@ -331,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-10-11 22:37:35.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)
@@ -342,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-10-11 22:37:35.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)
@@ -353,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-10-11 22:37:35.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
@@ -364,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-10-11
22:37:35.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"
@@ -393,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-10-11
22:37:35.000000000 -0400
++++ qt-copy-new/src/corelib/global/qnamespace.h 2007-11-03
14:00:09.000000000 -0400
@@ -960,7 +960,7 @@
};
@@ -413,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-10-11
22:37:35.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>
@@ -478,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-10-11
22:37:35.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"
@@ -498,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-10-11 22:37:35.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
@@ -572,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-10-11 22:37:35.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);
@@ -583,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-10-11
22:37:35.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>
@@ -630,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-10-11
22:37:35.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
@@ -670,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-10-11 22:37:35.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>
@@ -690,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-10-11 22:37:35.000000000
-0400
++++ qt-copy-new/src/corelib/tools/qpoint.h 2007-11-03 14:00:09.000000000
-0400
@@ -79,7 +79,7 @@
private:
@@ -701,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-10-11 22:37:35.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);
@@ -712,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-10-11 22:37:35.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"
@@ -732,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-10-11 22:37:35.000000000
-0400
++++ qt-copy-new/src/gui/dialogs/qprintdialog.h 2007-11-03 14:00:09.000000000
-0400
@@ -61,7 +61,7 @@
int exec();
@@ -743,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-10-11 22:37:35.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; }
@@ -754,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-10-11
22:37:35.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;
@@ -765,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-10-11
22:37:35.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();
@@ -785,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-10-11
22:37:35.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:
Index: qt4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qt4-x11.info 15 Oct 2007 00:20:42 -0000 1.5
+++ qt4-x11.info 3 Nov 2007 18:59:53 -0000 1.6
@@ -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
-------------------------------------------------------------------------
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
