Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27450/main/finkinfo/libs
Modified Files: qt4-mac.info qt4-mac.patch Log Message: various dep/etc. updates Index: qt4-mac.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-mac.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qt4-mac.patch 9 Mar 2009 18:00:17 -0000 1.3 +++ qt4-mac.patch 16 Apr 2009 13:16:20 -0000 1.4 @@ -1,6 +1,6 @@ diff -Nurd 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 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = 3dnow.cpp -CONFIG -= x11 qt @@ -8,7 +8,7 @@ +CONFIG -= x11 qt app_bundle diff -Nurd qt-copy/config.tests/unix/clock-gettime/clock-gettime.pro qt-copy-new/config.tests/unix/clock-gettime/clock-gettime.pro --- qt-copy/config.tests/unix/clock-gettime/clock-gettime.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/clock-gettime/clock-gettime.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/clock-gettime/clock-gettime.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = clock-gettime.cpp -CONFIG -= qt dylib @@ -17,7 +17,7 @@ include(clock-gettime.pri) diff -Nurd qt-copy/config.tests/unix/clock-monotonic/clock-monotonic.pro qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro --- qt-copy/config.tests/unix/clock-monotonic/clock-monotonic.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = clock-monotonic.cpp -CONFIG -= qt dylib @@ -26,7 +26,7 @@ include(../clock-gettime/clock-gettime.pri) diff -Nurd qt-copy/config.tests/unix/cups/cups.pro qt-copy-new/config.tests/unix/cups/cups.pro --- qt-copy/config.tests/unix/cups/cups.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/cups/cups.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/cups/cups.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = cups.cpp -CONFIG -= qt dylib @@ -35,7 +35,7 @@ LIBS += -lcups diff -Nurd qt-copy/config.tests/unix/db2/db2.pro qt-copy-new/config.tests/unix/db2/db2.pro --- qt-copy/config.tests/unix/db2/db2.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/db2/db2.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/db2/db2.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = db2.cpp -CONFIG -= qt dylib @@ -44,7 +44,7 @@ LIBS += -ldb2 diff -Nurd qt-copy/config.tests/unix/dbus/dbus.pro qt-copy-new/config.tests/unix/dbus/dbus.pro --- qt-copy/config.tests/unix/dbus/dbus.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/dbus/dbus.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/dbus/dbus.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = dbus.cpp -CONFIG -= qt @@ -52,7 +52,7 @@ +CONFIG -= qt app_bundle diff -Nurd qt-copy/config.tests/unix/doubleformat/doubleformattest.pro qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro --- qt-copy/config.tests/unix/doubleformat/doubleformattest.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/doubleformat/doubleformattest.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = doubleformattest.cpp -CONFIG -= qt dylib @@ -60,7 +60,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/endian/endiantest.pro qt-copy-new/config.tests/unix/endian/endiantest.pro --- qt-copy/config.tests/unix/endian/endiantest.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/endian/endiantest.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/endian/endiantest.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = endiantest.cpp -CONFIG -= qt dylib @@ -68,7 +68,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/floatmath/floatmath.pro qt-copy-new/config.tests/unix/floatmath/floatmath.pro --- qt-copy/config.tests/unix/floatmath/floatmath.pro 2007-04-23 13:11:29.000000000 -0400 -+++ qt-copy-new/config.tests/unix/floatmath/floatmath.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/floatmath/floatmath.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = floatmath.cpp -CONFIG -= x11 qt @@ -76,7 +76,7 @@ +CONFIG -= x11 qt app_bundle diff -Nurd qt-copy/config.tests/unix/freetype/freetype.pro qt-copy-new/config.tests/unix/freetype/freetype.pro --- qt-copy/config.tests/unix/freetype/freetype.pro 2006-05-02 11:13:54.000000000 -0400 -+++ qt-copy-new/config.tests/unix/freetype/freetype.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/freetype/freetype.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,5 +1,5 @@ SOURCES = freetype.cpp CONFIG += x11 @@ -86,7 +86,7 @@ include(freetype.pri) diff -Nurd qt-copy/config.tests/unix/getaddrinfo/getaddrinfo.pro qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro --- qt-copy/config.tests/unix/getaddrinfo/getaddrinfo.pro 2008-07-31 10:40:10.000000000 -0400 -+++ qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = getaddrinfotest.cpp -CONFIG -= qt dylib @@ -95,7 +95,7 @@ LIBS += $$QMAKE_LIBS_NETWORK diff -Nurd qt-copy/config.tests/unix/getifaddrs/getifaddrs.pro qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro --- qt-copy/config.tests/unix/getifaddrs/getifaddrs.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/getifaddrs/getifaddrs.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,5 +1,4 @@ SOURCES = getifaddrs.cpp -CONFIG -= qt @@ -105,14 +105,14 @@ LIBS += $$QMAKE_LIBS_NETWORK diff -Nurd qt-copy/config.tests/unix/glib/glib.pro qt-copy-new/config.tests/unix/glib/glib.pro --- qt-copy/config.tests/unix/glib/glib.pro 2007-10-08 19:27:05.000000000 -0400 -+++ qt-copy-new/config.tests/unix/glib/glib.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/glib/glib.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,2 +1,2 @@ SOURCES = glib.cpp -CONFIG -= qt +CONFIG -= qt app_bundle diff -Nurd qt-copy/config.tests/unix/gnu-libiconv/gnu-libiconv.pro qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.pro --- qt-copy/config.tests/unix/gnu-libiconv/gnu-libiconv.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/gnu-libiconv/gnu-libiconv.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = gnu-libiconv.cpp -CONFIG -= qt dylib @@ -121,7 +121,7 @@ LIBS += -liconv diff -Nurd qt-copy/config.tests/unix/gstreamer/gstreamer.pro qt-copy-new/config.tests/unix/gstreamer/gstreamer.pro --- qt-copy/config.tests/unix/gstreamer/gstreamer.pro 2008-05-05 17:47:14.000000000 -0400 -+++ qt-copy-new/config.tests/unix/gstreamer/gstreamer.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/gstreamer/gstreamer.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = gstreamer.cpp -CONFIG -= qt @@ -129,7 +129,7 @@ LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 diff -Nurd qt-copy/config.tests/unix/ibase/ibase.pro qt-copy-new/config.tests/unix/ibase/ibase.pro --- qt-copy/config.tests/unix/ibase/ibase.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/ibase/ibase.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ibase/ibase.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = ibase.cpp -CONFIG -= qt dylib @@ -138,7 +138,7 @@ LIBS += -lgds diff -Nurd qt-copy/config.tests/unix/iconv/iconv.pro qt-copy-new/config.tests/unix/iconv/iconv.pro --- qt-copy/config.tests/unix/iconv/iconv.pro 2007-12-05 12:13:56.000000000 -0500 -+++ qt-copy-new/config.tests/unix/iconv/iconv.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/iconv/iconv.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,4 @@ SOURCES = iconv.cpp CONFIG -= qt dylib app_bundle @@ -146,7 +146,7 @@ +darwin-*:LIBS += -liconv diff -Nurd qt-copy/config.tests/unix/inotify/inotify.pro qt-copy-new/config.tests/unix/inotify/inotify.pro --- qt-copy/config.tests/unix/inotify/inotify.pro 2006-07-01 13:35:05.000000000 -0400 -+++ qt-copy-new/config.tests/unix/inotify/inotify.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/inotify/inotify.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = inotifytest.cpp -CONFIG -= qt dylib @@ -154,7 +154,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/ipv6/ipv6.pro qt-copy-new/config.tests/unix/ipv6/ipv6.pro --- qt-copy/config.tests/unix/ipv6/ipv6.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/ipv6/ipv6.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ipv6/ipv6.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = ipv6test.cpp -CONFIG -= qt dylib @@ -162,7 +162,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/ipv6ifname/ipv6ifname.pro qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro --- qt-copy/config.tests/unix/ipv6ifname/ipv6ifname.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,5 +1,4 @@ SOURCES = ipv6ifname.cpp -CONFIG -= qt @@ -172,7 +172,7 @@ LIBS += $$QMAKE_LIBS_NETWORK diff -Nurd qt-copy/config.tests/unix/largefile/largefile.pro qt-copy-new/config.tests/unix/largefile/largefile.pro --- qt-copy/config.tests/unix/largefile/largefile.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/largefile/largefile.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/largefile/largefile.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES=largefiletest.cpp -CONFIG-=qt dylib @@ -180,7 +180,7 @@ +CONFIG-=qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/libjpeg/libjpeg.pro qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro --- qt-copy/config.tests/unix/libjpeg/libjpeg.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libjpeg/libjpeg.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = libjpeg.cpp -CONFIG -= qt dylib @@ -189,7 +189,7 @@ LIBS += -ljpeg diff -Nurd qt-copy/config.tests/unix/libmng/libmng.pro qt-copy-new/config.tests/unix/libmng/libmng.pro --- qt-copy/config.tests/unix/libmng/libmng.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/libmng/libmng.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libmng/libmng.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = libmng.cpp -CONFIG -= qt dylib @@ -198,7 +198,7 @@ LIBS += -lmng diff -Nurd qt-copy/config.tests/unix/libpng/libpng.pro qt-copy-new/config.tests/unix/libpng/libpng.pro --- qt-copy/config.tests/unix/libpng/libpng.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/libpng/libpng.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libpng/libpng.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = libpng.cpp -CONFIG -= qt dylib @@ -207,7 +207,7 @@ LIBS += -lpng diff -Nurd qt-copy/config.tests/unix/libtiff/libtiff.pro qt-copy-new/config.tests/unix/libtiff/libtiff.pro --- qt-copy/config.tests/unix/libtiff/libtiff.pro 2007-03-26 14:33:21.000000000 -0400 -+++ qt-copy-new/config.tests/unix/libtiff/libtiff.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/libtiff/libtiff.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = libtiff.cpp -CONFIG -= qt dylib @@ -216,7 +216,7 @@ LIBS += -ltiff diff -Nurd 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 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mmx/mmx.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = mmx.cpp -CONFIG -= x11 qt @@ -224,7 +224,7 @@ +CONFIG -= x11 qt app_bundle diff -Nurd qt-copy/config.tests/unix/mremap/mremap.pro qt-copy-new/config.tests/unix/mremap/mremap.pro --- qt-copy/config.tests/unix/mremap/mremap.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/mremap/mremap.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mremap/mremap.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = mremap.cpp -CONFIG -= qt dylib @@ -232,7 +232,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/mysql/mysql.pro qt-copy-new/config.tests/unix/mysql/mysql.pro --- qt-copy/config.tests/unix/mysql/mysql.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/mysql/mysql.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mysql/mysql.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = mysql.cpp -CONFIG -= qt dylib @@ -241,7 +241,7 @@ LIBS += -lmysqlclient diff -Nurd qt-copy/config.tests/unix/mysql_r/mysql_r.pro qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro --- qt-copy/config.tests/unix/mysql_r/mysql_r.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/mysql_r/mysql_r.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = ../mysql/mysql.cpp -CONFIG -= qt dylib @@ -250,7 +250,7 @@ LIBS += -lmysqlclient_r diff -Nurd qt-copy/config.tests/unix/nis/nis.pro qt-copy-new/config.tests/unix/nis/nis.pro --- qt-copy/config.tests/unix/nis/nis.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/nis/nis.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/nis/nis.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,5 +1,4 @@ SOURCES = nis.cpp -CONFIG -= qt dylib @@ -260,7 +260,7 @@ else:LIBS += $$QMAKE_LIBS_NIS diff -Nurd qt-copy/config.tests/unix/oci/oci.pro qt-copy-new/config.tests/unix/oci/oci.pro --- qt-copy/config.tests/unix/oci/oci.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/oci/oci.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/oci/oci.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = oci.cpp -CONFIG -= qt dylib @@ -269,7 +269,7 @@ LIBS += -lclntsh diff -Nurd qt-copy/config.tests/unix/odbc/odbc.pro qt-copy-new/config.tests/unix/odbc/odbc.pro --- qt-copy/config.tests/unix/odbc/odbc.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/odbc/odbc.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/odbc/odbc.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = odbc.cpp -CONFIG -= qt dylib @@ -278,7 +278,7 @@ LIBS += -lodbc diff -Nurd qt-copy/config.tests/unix/openssl/openssl.pro qt-copy-new/config.tests/unix/openssl/openssl.pro --- qt-copy/config.tests/unix/openssl/openssl.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/openssl/openssl.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/openssl/openssl.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = openssl.cpp -CONFIG -= x11 qt @@ -287,7 +287,7 @@ include(openssl.pri) diff -Nurd qt-copy/config.tests/unix/psql/psql.pro qt-copy-new/config.tests/unix/psql/psql.pro --- qt-copy/config.tests/unix/psql/psql.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/psql/psql.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/psql/psql.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = psql.cpp -CONFIG -= qt dylib @@ -296,7 +296,7 @@ LIBS += -lpq diff -Nurd qt-copy/config.tests/unix/ptrsize/ptrsizetest.pro qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro --- qt-copy/config.tests/unix/ptrsize/ptrsizetest.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/ptrsize/ptrsizetest.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = ptrsizetest.cpp -CONFIG -= qt dylib @@ -304,7 +304,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/sqlite/sqlite.pro qt-copy-new/config.tests/unix/sqlite/sqlite.pro --- qt-copy/config.tests/unix/sqlite/sqlite.pro 2008-09-18 14:07:50.000000000 -0400 -+++ qt-copy-new/config.tests/unix/sqlite/sqlite.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sqlite/sqlite.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = sqlite.cpp -CONFIG -= qt dylib @@ -312,7 +312,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/sqlite2/sqlite2.pro qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro --- qt-copy/config.tests/unix/sqlite2/sqlite2.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sqlite2/sqlite2.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = sqlite2.cpp -CONFIG -= qt dylib @@ -321,7 +321,7 @@ LIBS += -lsqlite diff -Nurd 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 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/sse/sse.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse/sse.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = sse.cpp -CONFIG -= x11 qt @@ -329,7 +329,7 @@ +CONFIG -= x11 qt app_bundle diff -Nurd 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 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/sse2/sse2.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = sse2.cpp -CONFIG -= x11 qt @@ -337,7 +337,7 @@ +CONFIG -= x11 qt app_bundle diff -Nurd qt-copy/config.tests/unix/stl/stl.pro qt-copy-new/config.tests/unix/stl/stl.pro --- qt-copy/config.tests/unix/stl/stl.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/stl/stl.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/stl/stl.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,2 @@ SOURCES = stltest.cpp -CONFIG -= qt dylib @@ -345,7 +345,7 @@ +CONFIG -= qt dylib app_bundle diff -Nurd qt-copy/config.tests/unix/tds/tds.pro qt-copy-new/config.tests/unix/tds/tds.pro --- qt-copy/config.tests/unix/tds/tds.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/tds/tds.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/tds/tds.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = tds.cpp -CONFIG -= qt dylib @@ -354,7 +354,7 @@ LIBS += -lsybdb diff -Nurd qt-copy/config.tests/unix/tslib/tslib.pro qt-copy-new/config.tests/unix/tslib/tslib.pro --- qt-copy/config.tests/unix/tslib/tslib.pro 2006-07-01 13:35:05.000000000 -0400 -+++ qt-copy-new/config.tests/unix/tslib/tslib.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/tslib/tslib.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,3 +1,3 @@ SOURCES = tslib.cpp -CONFIG -= qt @@ -362,7 +362,7 @@ LIBS += -lts diff -Nurd qt-copy/config.tests/unix/zlib/zlib.pro qt-copy-new/config.tests/unix/zlib/zlib.pro --- qt-copy/config.tests/unix/zlib/zlib.pro 2005-12-01 09:53:01.000000000 -0500 -+++ qt-copy-new/config.tests/unix/zlib/zlib.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/unix/zlib/zlib.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,4 +1,3 @@ SOURCES = zlib.cpp -CONFIG -= qt dylib @@ -371,7 +371,7 @@ LIBS += -lz diff -Nurd qt-copy/config.tests/x11/opengl/opengl.pro qt-copy-new/config.tests/x11/opengl/opengl.pro --- qt-copy/config.tests/x11/opengl/opengl.pro 2006-05-02 11:13:54.000000000 -0400 -+++ qt-copy-new/config.tests/x11/opengl/opengl.pro 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/config.tests/x11/opengl/opengl.pro 2009-04-13 09:45:41.000000000 -0400 @@ -7,4 +7,4 @@ } @@ -380,7 +380,7 @@ +LIBS += -lGL -lGLU -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib diff -Nurd qt-copy/configure qt-copy-new/configure --- qt-copy/configure 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/configure 2009-03-08 21:13:11.000000000 -0400 ++++ qt-copy-new/configure 2009-04-13 09:45:41.000000000 -0400 @@ -105,6 +105,7 @@ #------------------------------------------------------------------------------- @@ -472,7 +472,7 @@ # define QT_POINTER_SIZE 8 diff -Nurd 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 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/configure-for-fink.sh 2009-04-13 09:48:51.000000000 -0400 @@ -0,0 +1,57 @@ +#!/bin/sh -e + @@ -501,20 +501,21 @@ + EXTRA_ARGS="-platform macx-g++ -xplatform macx-g++" +fi + ++case `sw_vers -productVersion` in ++ 10.[01234]*) ++ ;; ++ *) ++ LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs" ++ ;; ++esac + -+export FINKPREFIX QTDIR PATH LIBRESOLV CC CXX EXTRA_ARGS -+ -+#perl -pi -e "s,\...@prefix\@,$FINKPREFIX,g" mkspecs/darwin-g++/* -+#perl -pi -e "s,\...@pkgname\@,$PKGNAME,g" mkspecs/darwin-g++/* -+#perl -pi -e "s,gcc-4.0,$CC,g" mkspecs/darwin-g++/* -+#perl -pi -e "s,g\+\+-3.3,$CXX,g" mkspecs/darwin-g++/* ++export FINKPREFIX QTDIR PATH LIBRESOLV CC CXX EXTRA_ARGS LDFLAGS + +echo "yes" | sh $TOPDIR/configure \ -+ "-I$FINKPREFIX/lib/freetype219/include" "-I$FINKPREFIX/lib/freetype219/include/freetype2" \ -+ "-I$FINKPREFIX/lib/fontconfig2/include" "-I$FINKPREFIX/lib/fontconfig2/include" \ -+ "-I$FINKPREFIX/include" -isystem /usr/X11R6/include \ -+ "-L$FINKPREFIX/lib/freetype219/lib" "-L$FINKPREFIX/lib/fontconfig2/lib" \ -+ "-L$FINKPREFIX/lib" "-L/usr/X11R6/lib" \ ++ "-I$FINKPREFIX/lib/system-openssl/include" "-L$FINKPREFIX/lib/system-openssl/lib" \ ++ "-I$FINKPREFIX/lib/freetype219/include" "-I$FINKPREFIX/lib/freetype219/include/freetype2" "-L$FINKPREFIX/lib/freetype219/lib" \ ++ "-I$FINKPREFIX/lib/fontconfig2/include" "-I$FINKPREFIX/lib/fontconfig2/include" "-L$FINKPREFIX/lib/fontconfig2/lib" \ ++ "-I$FINKPREFIX/include" -isystem /usr/X11R6/include "-L$FINKPREFIX/lib" "-L/usr/X11R6/lib" \ + -prefix "$FINKPREFIX/lib/$PKGNAME" -docdir "$FINKPREFIX/share/doc/$PKGNAME" \ + -no-fast -webkit -openssl-linked -reduce-exports \ + -exceptions -qt-gif -system-freetype -phonon -phonon-backend \ @@ -526,14 +527,13 @@ + +# attempt to counterfix qmake's warped fileFixify logic that makes install break +# when $FINKPREFIX is a symlink and something exists already at -libdir or -datadir etc -+# second, better attempt at unfixifying $FINKPREFIX: +pushd $FINKPREFIX; + FixifiedSW=`/bin/pwd`; +popd +/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)$FINKPREFIX,g" diff -Nurd qt-copy/mkspecs/common/mac.conf qt-copy-new/mkspecs/common/mac.conf --- qt-copy/mkspecs/common/mac.conf 2009-02-05 10:57:09.000000000 -0500 -+++ qt-copy-new/mkspecs/common/mac.conf 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/mkspecs/common/mac.conf 2009-04-13 09:45:41.000000000 -0400 @@ -17,7 +17,7 @@ QMAKE_RPATH = @@ -545,7 +545,7 @@ diff -Nurd qt-copy/mkspecs/darwin-g++/qmake.conf qt-copy-new/mkspecs/darwin-g++/qmake.conf --- qt-copy/mkspecs/darwin-g++/qmake.conf 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/mkspecs/darwin-g++/qmake.conf 2009-04-13 09:45:41.000000000 -0400 @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX @@ -573,7 +573,7 @@ QMAKE_MOC = $$[QT_INSTALL_BINS]/moc diff -Nurd qt-copy/patches/0273-odbc-64bit-compile.diff qt-copy-new/patches/0273-odbc-64bit-compile.diff --- qt-copy/patches/0273-odbc-64bit-compile.diff 2009-02-20 19:00:57.000000000 -0500 -+++ qt-copy-new/patches/0273-odbc-64bit-compile.diff 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/patches/0273-odbc-64bit-compile.diff 2009-04-13 09:45:41.000000000 -0400 @@ -12,14 +12,14 @@ // newer platform SDKs use SQLLEN instead of SQLINTEGER @@ -593,7 +593,7 @@ # define QSQLULEN SQLUINTEGER diff -Nurd 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 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/qmake/generators/mac/pbuilder_pbx.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -52,7 +52,7 @@ # include <sys/types.h> # include <sys/stat.h> @@ -614,7 +614,7 @@ OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl); diff -Nurd qt-copy/qmake/main.cpp qt-copy-new/qmake/main.cpp --- qt-copy/qmake/main.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/qmake/main.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/qmake/main.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -59,8 +59,6 @@ // for Borland, main is defined to qMain which breaks qmake @@ -626,7 +626,7 @@ is much too slow, and called much too often inside of Qt (every fileFixify). With this we use a locally diff -Nurd qt-copy/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp qt-copy-new/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp --- qt-copy/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -2368,7 +2368,7 @@ "AIX" #elif defined Q_OS_WIN32 @@ -638,7 +638,7 @@ #else diff -Nurd qt-copy/src/corelib/codecs/codecs.pri qt-copy-new/src/corelib/codecs/codecs.pri --- qt-copy/src/corelib/codecs/codecs.pri 2007-12-05 12:13:56.000000000 -0500 -+++ qt-copy-new/src/corelib/codecs/codecs.pri 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/codecs/codecs.pri 2009-04-13 09:45:41.000000000 -0400 @@ -24,6 +24,7 @@ contains(QT_CONFIG,iconv) { HEADERS += codecs/qiconvcodec_p.h @@ -649,7 +649,7 @@ SOURCES += codecs/qiconvcodec.cpp diff -Nurd qt-copy/src/corelib/codecs/qiconvcodec.cpp qt-copy-new/src/corelib/codecs/qiconvcodec.cpp --- qt-copy/src/corelib/codecs/qiconvcodec.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/codecs/qiconvcodec.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/codecs/qiconvcodec.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -62,7 +62,7 @@ #elif defined(Q_OS_AIX) # define NO_BOM @@ -661,7 +661,7 @@ # define UTF16 "UTF-16BE" diff -Nurd qt-copy/src/corelib/concurrent/qtconcurrentiteratekernel.cpp qt-copy-new/src/corelib/concurrent/qtconcurrentiteratekernel.cpp --- qt-copy/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -41,7 +41,7 @@ #include "qtconcurrentiteratekernel.h" @@ -682,7 +682,7 @@ { diff -Nurd qt-copy/src/corelib/corelib.pro qt-copy-new/src/corelib/corelib.pro --- qt-copy/src/corelib/corelib.pro 2008-02-13 17:19:53.000000000 -0500 -+++ qt-copy-new/src/corelib/corelib.pro 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/corelib.pro 2009-04-13 09:45:41.000000000 -0400 @@ -16,7 +16,7 @@ include(codecs/codecs.pri) include(xml/xml.pri) @@ -694,7 +694,7 @@ win32:DEFINES-=QT_NO_CAST_TO_ASCII diff -Nurd qt-copy/src/corelib/global/qglobal.cpp qt-copy-new/src/corelib/global/qglobal.cpp --- qt-copy/src/corelib/global/qglobal.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/global/qglobal.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -1147,7 +1147,7 @@ \macro Q_OS_DARWIN \relates <QtGlobal> @@ -706,7 +706,7 @@ /*! diff -Nurd qt-copy/src/corelib/global/qglobal.h qt-copy-new/src/corelib/global/qglobal.h --- qt-copy/src/corelib/global/qglobal.h 2009-03-03 09:54:13.000000000 -0500 -+++ qt-copy-new/src/corelib/global/qglobal.h 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/global/qglobal.h 2009-04-13 09:45:41.000000000 -0400 @@ -128,7 +128,7 @@ #endif /* __cplusplus */ @@ -794,7 +794,7 @@ diff -Nurd qt-copy/src/corelib/io/qfile.cpp qt-copy-new/src/corelib/io/qfile.cpp --- qt-copy/src/corelib/io/qfile.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/io/qfile.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfile.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -66,7 +66,7 @@ static QByteArray locale_encode(const QString &f) @@ -815,7 +815,7 @@ // Mac always gives us UTF-8 and decomposed, we want that composed... diff -Nurd qt-copy/src/corelib/io/qfilesystemwatcher.cpp qt-copy-new/src/corelib/io/qfilesystemwatcher.cpp --- qt-copy/src/corelib/io/qfilesystemwatcher.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/io/qfilesystemwatcher.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfilesystemwatcher.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -57,7 +57,7 @@ #elif defined(Q_OS_LINUX) # include "qfilesystemwatcher_inotify_p.h" @@ -836,7 +836,7 @@ return 0; diff -Nurd 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 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qfsfileengine_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -409,7 +409,7 @@ } return true; @@ -848,7 +848,7 @@ #endif diff -Nurd qt-copy/src/corelib/io/qprocess.cpp qt-copy-new/src/corelib/io/qprocess.cpp --- qt-copy/src/corelib/io/qprocess.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/io/qprocess.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -1777,7 +1777,7 @@ } @@ -860,7 +860,7 @@ #elif defined(Q_OS_WINCE) diff -Nurd 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 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/io/qprocess_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -536,7 +536,7 @@ // if LD_LIBRARY_PATH exists in the current environment, but // not in the environment list passed by the programmer, then @@ -890,7 +890,7 @@ argv[i + 1] = ::strdup(arguments.at(i).toLocal8Bit().constData()); diff -Nurd qt-copy/src/corelib/plugin/qlibrary.cpp qt-copy-new/src/corelib/plugin/qlibrary.cpp --- qt-copy/src/corelib/plugin/qlibrary.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -522,7 +522,7 @@ if (completeSuffix.isEmpty()) return false; @@ -902,7 +902,7 @@ const QString lastSuffix = suffixes.at(suffixes.count() - 1); diff -Nurd 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 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/plugin/qlibrary_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -123,7 +123,7 @@ suffixes << QLatin1String(".so"); } @@ -914,7 +914,7 @@ suffixes << QString::fromLatin1(".%1.dylib").arg(fullVersion); diff -Nurd qt-copy/src/corelib/thread/qthread.cpp qt-copy-new/src/corelib/thread/qthread.cpp --- qt-copy/src/corelib/thread/qthread.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/thread/qthread.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/thread/qthread.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -64,7 +64,7 @@ /* # elif defined(Q_OS_HPUX) @@ -926,7 +926,7 @@ #endif diff -Nurd qt-copy/src/corelib/thread/qthread_unix.cpp qt-copy-new/src/corelib/thread/qthread_unix.cpp --- qt-copy/src/corelib/thread/qthread_unix.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/thread/qthread_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/thread/qthread_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -353,7 +353,7 @@ d->priority = priority; @@ -947,7 +947,7 @@ diff -Nurd qt-copy/src/corelib/tools/qdumper.cpp qt-copy-new/src/corelib/tools/qdumper.cpp --- qt-copy/src/corelib/tools/qdumper.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/tools/qdumper.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qdumper.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -481,7 +481,7 @@ S(d, "completeBaseName", info.completeBaseName()); S(d, "completeSuffix", info.completeSuffix()); @@ -959,7 +959,7 @@ #endif diff -Nurd qt-copy/src/corelib/tools/qsharedpointer.cpp qt-copy-new/src/corelib/tools/qsharedpointer.cpp --- qt-copy/src/corelib/tools/qsharedpointer.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/tools/qsharedpointer.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/tools/qsharedpointer.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -739,7 +739,7 @@ # ifdef QT_SHARED_POINTER_BACKTRACE_SUPPORT # if defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__) && !defined(QT_LINUXBASE) @@ -971,7 +971,7 @@ # endif diff -Nurd qt-copy/src/corelib/xml/qxmlstream.h qt-copy-new/src/corelib/xml/qxmlstream.h --- qt-copy/src/corelib/xml/qxmlstream.h 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/corelib/xml/qxmlstream.h 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/corelib/xml/qxmlstream.h 2009-04-13 09:45:41.000000000 -0400 @@ -84,7 +84,7 @@ // We are taking the optimist scenario here to avoid creating more // symbols to be supported. @@ -983,7 +983,7 @@ # endif diff -Nurd qt-copy/src/gui/styles/gtksymbols.cpp qt-copy-new/src/gui/styles/gtksymbols.cpp --- qt-copy/src/gui/styles/gtksymbols.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/gui/styles/gtksymbols.cpp 2009-03-08 21:38:43.000000000 -0400 ++++ qt-copy-new/src/gui/styles/gtksymbols.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -631,20 +631,26 @@ } QT_END_NAMESPACE @@ -1013,7 +1013,7 @@ "therefore Qt cannot use the GTK+ integration.\nTry launching your app using \'gksudo\', " diff -Nurd qt-copy/src/network/kernel/qhostinfo_unix.cpp qt-copy-new/src/network/kernel/qhostinfo_unix.cpp --- qt-copy/src/network/kernel/qhostinfo_unix.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/network/kernel/qhostinfo_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/network/kernel/qhostinfo_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -148,7 +148,7 @@ if (address.setAddress(hostName)) { // Reverse lookup @@ -1025,7 +1025,7 @@ sockaddr_in6 sa6; diff -Nurd qt-copy/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-copy-new/src/network/ssl/qsslsocket_openssl_symbols.cpp --- qt-copy/src/network/ssl/qsslsocket_openssl_symbols.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/network/ssl/qsslsocket_openssl_symbols.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/network/ssl/qsslsocket_openssl_symbols.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -288,7 +288,7 @@ static QStringList findAllLibSsl() { @@ -1037,7 +1037,7 @@ # else diff -Nurd qt-copy/src/qt3support/other/q3process_unix.cpp qt-copy-new/src/qt3support/other/q3process_unix.cpp --- qt-copy/src/qt3support/other/q3process_unix.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/qt3support/other/q3process_unix.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/qt3support/other/q3process_unix.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -789,7 +789,7 @@ } else { // start process with environment settins as specified in env // construct the environment for exec @@ -1058,7 +1058,7 @@ arglistQ[0] = fileInfo.filePath().local8Bit(); diff -Nurd qt-copy/src/qt3support/qt3support.pro qt-copy-new/src/qt3support/qt3support.pro --- qt-copy/src/qt3support/qt3support.pro 2009-02-05 10:57:09.000000000 -0500 -+++ qt-copy-new/src/qt3support/qt3support.pro 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/qt3support/qt3support.pro 2009-04-13 09:45:41.000000000 -0400 @@ -26,6 +26,7 @@ QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql } @@ -1069,7 +1069,7 @@ DEFINES -= QT3_SUPPORT_WARNINGS diff -Nurd qt-copy/src/script/qscriptengine_p.cpp qt-copy-new/src/script/qscriptengine_p.cpp --- qt-copy/src/script/qscriptengine_p.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/src/script/qscriptengine_p.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/src/script/qscriptengine_p.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -1702,7 +1702,7 @@ m_callDepth = 0; #if defined(Q_OS_WIN) @@ -1081,7 +1081,7 @@ m_maxCallDepth = 360; diff -Nurd qt-copy/tools/assistant/lib/fulltextsearch/qclucene-config_p.h qt-copy-new/tools/assistant/lib/fulltextsearch/qclucene-config_p.h --- qt-copy/tools/assistant/lib/fulltextsearch/qclucene-config_p.h 2009-02-05 10:57:09.000000000 -0500 -+++ qt-copy-new/tools/assistant/lib/fulltextsearch/qclucene-config_p.h 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/tools/assistant/lib/fulltextsearch/qclucene-config_p.h 2009-04-13 09:45:41.000000000 -0400 @@ -347,7 +347,7 @@ #endif @@ -1093,7 +1093,7 @@ # define _CL_HAVE_WCSCASECMP 1 diff -Nurd qt-copy/tools/designer/src/plugins/plugins.pro qt-copy-new/tools/designer/src/plugins/plugins.pro --- qt-copy/tools/designer/src/plugins/plugins.pro 2009-02-05 10:57:09.000000000 -0500 -+++ qt-copy-new/tools/designer/src/plugins/plugins.pro 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/tools/designer/src/plugins/plugins.pro 2009-04-13 09:45:41.000000000 -0400 @@ -1,5 +1,7 @@ TEMPLATE = subdirs CONFIG += ordered @@ -1104,7 +1104,7 @@ contains(QT_CONFIG, qt3support): SUBDIRS += widgets diff -Nurd qt-copy/tools/qvfb/qlock.cpp qt-copy-new/tools/qvfb/qlock.cpp --- qt-copy/tools/qvfb/qlock.cpp 2009-03-03 04:55:54.000000000 -0500 -+++ qt-copy-new/tools/qvfb/qlock.cpp 2009-03-08 21:13:12.000000000 -0400 ++++ qt-copy-new/tools/qvfb/qlock.cpp 2009-04-13 09:45:41.000000000 -0400 @@ -46,11 +46,11 @@ #include "qwssignalhandler_p.h" #include <unistd.h> Index: qt4-mac.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-mac.info,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- qt4-mac.info 9 Apr 2009 13:11:33 -0000 1.12 +++ qt4-mac.info 16 Apr 2009 13:16:20 -0000 1.13 @@ -1,7 +1,7 @@ Info4: << Package: qt4-mac Version: 4.5.0 -Revision: 4 +Revision: 5 GCC: 4.0 CustomMirror: << Primary: http://ranger.users.finkproject.org/distfiles @@ -14,7 +14,7 @@ Source-MD5: 84f0286ac030aeb82152fd3a6fa129fe SourceDirectory: qt-copy PatchFile: %n.patch -PatchFile-MD5: 9b75b89de83466d27843b56f2fccaae7 +PatchFile-MD5: 576120dd0831d234389af47a6e5dc031 PatchScript: << mkdir .svn ./apply_patches @@ -46,8 +46,11 @@ libjpeg, libmng2, libpng3 (>= 1.2.5-4), + libtiff, macosx (>= 10.4.3-1), - pkgconfig (>= 0.22-1) + pkgconfig (>= 0.22-1), + sqlite3-dev, + system-openssl-dev, << BuildConflicts: kdelibs3-dev, kdelibs3-ssl-dev, kdelibs3-unified-dev, libevent1, pcre, clucene-core BuildDependsOnly: true @@ -122,11 +125,10 @@ Package: %N-gui-shlibs DocFiles: LGPL* LICENSE* Suggests: %N-designer, %N-linguist, %N-doc + Replaces: %N-core-shlibs (<< 4.5.0-5) Depends: << %N-core-shlibs (= %v-%r), - freetype219-shlibs (>= 2.3.7-7), libmng2-shlibs, - libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, << Files: << @@ -142,6 +144,9 @@ lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL_debug lib/%N/lib/QtOpenGL.framework/Versions/Current + lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools + lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools_debug + lib/%N/lib/QtScriptTools.framework/Versions/Current lib/%N/lib/QtSvg.framework/Versions/4/QtSvg lib/%N/lib/QtSvg.framework/Versions/4/QtSvg_debug lib/%N/lib/QtSvg.framework/Versions/Current @@ -159,20 +164,22 @@ lib/%N/plugins/script << Shlibs: << - %p/lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtGui.framework/Versions/4/QtGui 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtGui.framework/Versions/4/QtGui_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtHelp.framework/Versions/4/QtHelp 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtHelp.framework/Versions/4/QtHelp_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtSvg.framework/Versions/4/QtSvg 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtSvg.framework/Versions/4/QtSvg_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/phonon.framework/Versions/4/phonon 4.3.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/phonon.framework/Versions/4/phonon_debug 4.3.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtGui.framework/Versions/4/QtGui 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtGui.framework/Versions/4/QtGui_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtHelp.framework/Versions/4/QtHelp 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtHelp.framework/Versions/4/QtHelp_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools 4.5.0 %n (>= 4.5.0-5) + %p/lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools_debug 4.5.0 %n (>= 4.5.0-5) + %p/lib/%N/lib/QtSvg.framework/Versions/4/QtSvg 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtSvg.framework/Versions/4/QtSvg_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit_debug 4.5.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/phonon.framework/Versions/4/phonon 4.3.0 %n (>= 4.5.0-1) + %p/lib/%N/lib/phonon.framework/Versions/4/phonon_debug 4.3.0 %n (>= 4.5.0-1) << PostInstScript: << (/%p/lib/fontconfig2/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || : @@ -184,7 +191,13 @@ Depends: << dbus-shlibs (>= 1.2.12-1), fink (>= 0.28.0-1), - glib2-shlibs (>= 2.12.0-1) + fontconfig2-shlibs (>= 2.4.1-1), + freetype219-shlibs (>= 2.3.5-1), + glib2-shlibs (>= 2.12.0-1), + libjpeg-shlibs, + libpng3-shlibs (>= 1.2.5-4), + libtiff-shlibs, + sqlite3-shlibs, << Files: << lib/qt4-mac/lib/libQtCLucene.4*.dylib @@ -201,9 +214,6 @@ lib/%N/lib/QtScript.framework/Versions/4/QtScript lib/%N/lib/QtScript.framework/Versions/4/QtScript_debug lib/%N/lib/QtScript.framework/Versions/Current - lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools - lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools_debug - lib/%N/lib/QtScriptTools.framework/Versions/Current lib/%N/lib/QtSql.framework/Versions/4/QtSql lib/%N/lib/QtSql.framework/Versions/4/QtSql_debug lib/%N/lib/QtSql.framework/Versions/Current @@ -230,8 +240,6 @@ %p/lib/%N/lib/QtNetwork.framework/Versions/4/QtNetwork_debug 4.5.0 %n (>= 4.5.0-1) %p/lib/%N/lib/QtScript.framework/Versions/4/QtScript 4.5.0 %n (>= 4.5.0-1) %p/lib/%N/lib/QtScript.framework/Versions/4/QtScript_debug 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools 4.5.0 %n (>= 4.5.0-1) - %p/lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools_debug 4.5.0 %n (>= 4.5.0-1) %p/lib/%N/lib/QtSql.framework/Versions/4/QtSql 4.5.0 %n (>= 4.5.0-1) %p/lib/%N/lib/QtSql.framework/Versions/4/QtSql_debug 4.5.0 %n (>= 4.5.0-1) %p/lib/%N/lib/QtTest.framework/Versions/4/QtTest 4.5.0 %n (>= 4.5.0-1) ------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs