the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: qt4-x11
Version: 4.3.3
Revision: 1
Description: Cross-Platform framework (X11 version)
License: GPL
Maintainer: Benjamin Reed
Depends: <<
%N-core-shlibs (= %v-%r),
%N-gui-shlibs (= %v-%r),
%N-designer (= %v-%r),
%N-linguist (= %v-%r),
%N-doc (= %v-%r),
pkgconfig (>= 0.21-1),
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
cctools (>= 446-0),
cups-dev,
dbus-dev (>= 1.0-1),
expat1,
fink (>= 0.26.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219,
glib2-dev,
libgettext3-dev,
libiconv-dev (>= 1.12-3),
libjpeg,
libmng2,
libpng3 (>= 1.2.8-1),
macosx (>= 10.4.3-1),
pkgconfig (>= 0.21-1),
x11-dev
<<
BuildDependsOnly: true
GCC: 4.0
CustomMirror: <<
Primary: http://ranger.users.finkproject.org/distfiles
eur-NL: http://ranger.users.finkproject.org/distfiles
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:custom:qt/qt-copy-755604.tar.bz2
Source-MD5: c12ff40d1f7ee9c5b7748a0865ff35aa
PatchScript: <<
mkdir .svn
./apply_patches
patch -p1 --fuzz=4 < %a/%{Ni}.patch
perl -pi -e 's,const char,char,g' config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
<<
NoSetLDFLAGS: true
CompileScript: <<
#!/bin/sh -ev
export CPATH=%p/include
/bin/sh ./configure-for-fink.sh "%p" "%N" -pch -verbose
make
<<
InstallScript: <<
#!/bin/sh -ev
#### MAIN INSTALL ####
unset QMAKESPEC
export QTDIR=`pwd`
export PATH="$QTDIR/bin:$PATH"
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
done
# add the WS_X11 stuff
cat <
#ifndef __USE_WS_X11__
#define __USE_WS_X11__ 1
#endif
END
cat %i/lib/%N/include/QtCore/qglobal.h >>%i/lib/%N/include/QtCore/qglobal.h.new
mv %i/lib/%N/include/QtCore/qglobal.h.new %i/lib/%N/include/QtCore/qglobal.h
#### FIX LA, PRL and PC FILES ####
perl -pi -e 's,-framework +[A-Za-z]+ ,,g' %i/lib/%N/lib/*.la
perl -pi -e 's,%b/lib,%p/lib/%N/lib,g; s| -framework | -Wl,-framework,|g' %i/lib/%N/lib/pkgconfig/*.pc %i/lib/%N/lib/*.prl %i/lib/%N/lib/*.la
#### TUTORIALS AND EXAMPLES ####
# clean up the makefiles
perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find demos examples -name "*.pro"`
install -d -m 0755 %i/share/doc/%N/examples
install -d -m 0755 %i/share/doc/%N/demos
/bin/cp -fRL examples/* %i/share/doc/%N/examples/
/bin/cp -fRL demos/* %i/share/doc/%N/demos/
# kde icon for qt designer
install -d -m 0755 %i/share/applnk/Development
cat >%i/share/applnk/Development/designer4.desktop <
Name=Qt Designer 4
GenericName=Interface Designer
Exec=%p/lib/%N/bin/designer
Icon=designer
InitialPreference=5
MapNotify=true
MimeType=application/x-designer
Terminal=false
Encoding=UTF-8
Type=Application
EOF
cat >%i/share/applnk/Development/linguist4.desktop <
Name=Qt Linguist 4
GenericName=Translation Editor
Exec=%p/lib/%N/bin/linguist
Icon=linguist
InitialPreference=5
MapNotify=true
Terminal=false
Encoding=UTF-8
Type=Application
EOF
/usr/bin/find %i/share/doc/%N/ -name \*.moc -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%N/ -name \*.obj -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%N/examples -name Makefile\* -print0 | xargs -0 rm -rf >/dev/null 2>&1 || :
LIBS="Qt3Support QtAssistantClient QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg QtTest QtXml"
for lib in $LIBS; do
install_name_tool -id %p/lib/%N/lib/lib$lib.4.dylib %i/lib/%N/lib/lib$lib.%v.dylib
done
for lib in $LIBS; do
for file in `find %i/lib/%N/lib/lib*.dylib %i/lib/%N/plugins/*/*.so %i/lib/%N/bin -type f`; do
install_name_tool -change lib$lib.%v.dylib %p/lib/%N/lib/lib$lib.4.dylib "$file" || :
install_name_tool -change lib$lib.4.dylib %p/lib/%N/lib/lib$lib.4.dylib "$file" || :
done
done
perl -pi -e 's/-framework ApplicationServices/-Wl,-framework,ApplicationServices/g' %i/lib/%N/lib/pkgconfig/*.pc
install -d -m 755 %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
<<
DocFiles: GPL* LICENSE.* OPENSOURCE-NOTICE.TXT README*
SplitOff: <<
Package: %N-gui-shlibs
Depends: <<
%N-core-shlibs (= %v-%r),
freetype219-shlibs,
libmng2-shlibs,
libpng3-shlibs (>= 1.2.8-1),
libjpeg-shlibs,
x11-shlibs
<<
Suggests: <<
%N-designer,
%N-linguist,
%N-doc
<<
Files: <<
lib/%N/lib/libQt3Support.4*.dylib
lib/%N/lib/libQtAssistantClient.4*.dylib
lib/%N/lib/libQtGui.4*.dylib
lib/%N/lib/libQtOpenGL.4*.dylib
lib/%N/lib/libQtSvg.4*.dylib
lib/%N/plugins/accessible
lib/%N/plugins/iconengines
lib/%N/plugins/imageformats
lib/%N/plugins/inputmethods
<<
Shlibs: <<
%p/lib/%N/lib/libQt3Support.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtAssistantClient.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtGui.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtOpenGL.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtSvg.4.dylib 4.3.0 %n (>= 4.3.3-1)
<<
PostInstScript: (/%p/lib/fontconfig2/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || :
<<
SplitOff2: <<
Package: %N-core-shlibs
Depends: <<
dbus-shlibs (>= 1.0-1),
fink (>= 0.26.0-1)
<<
Files: <<
lib/%N/lib/libQtCore.4*.dylib
lib/%N/lib/libQtDBus.4*.dylib
lib/%N/lib/libQtNetwork.4*.dylib
lib/%N/lib/libQtScript.4*.dylib
lib/%N/lib/libQtSql.4*.dylib
lib/%N/lib/libQtTest.4*.dylib
lib/%N/lib/libQtXml.4*.dylib
lib/%N/plugins/codecs
lib/%N/plugins/sqldrivers
<<
Shlibs: <<
%p/lib/%N/lib/libQtCore.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtDBus.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtNetwork.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtScript.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtSql.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtTest.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtXml.4.dylib 4.3.0 %n (>= 4.3.3-1)
<<
<<
SplitOff3: <<
Package: %N-designer
Depends: <<
%N-designer-shlibs (= %v-%r),
x11
<<
Replaces: %N (<< %v-1)
Files: <<
bin/designer*
share/applnk/Development/designer4.desktop
lib/%N/bin/designer
lib/%N/translations/designer_*
<<
<<
SplitOff4: <<
Package: %N-designer-shlibs
Depends: <<
%N-gui-shlibs (= %v-%r),
x11-shlibs
<<
Files: <<
lib/%N/lib/libQtDesigner.*.dylib
lib/%N/lib/libQtDesignerComponents.*.dylib
lib/%N/plugins/designer
<<
Shlibs: <<
%p/lib/%N/lib/libQtDesigner.4.dylib 4.3.0 %n (>= 4.3.3-1)
%p/lib/%N/lib/libQtDesignerComponents.4.dylib 4.3.0 %n (>= 4.3.3-1)
<<
<<
SplitOff5: <<
Package: %N-linguist
Depends: <<
%N-gui-shlibs (= %v-%r),
x11
<<
Replaces: %N (<< %v-1)
Files: <<
bin/l*
share/applnk/Development/linguist4.desktop
lib/%N/bin/l*
lib/%N/phrasebooks
lib/%N/translations/linguist_*
<<
<<
SplitOff6: <<
Package: %N-doc
Files: share/doc/%N
<<
Homepage: http://www.trolltech.com/
DescUsage: <<
To compile against this package, you need to make sure that
%p/lib/%N/bin is first in your PATH. $QTDIR is no longer necessary;
instead, qmake contains the information necessary to find your Qt
environment, and when you generate a project using qmake it knows
what to do.
If you need to manually find this package for whatever reason, you
need -I%p/lib/%N/include in your compiler flags, and
-L%p/lib/%N/lib in your linker flags. In this case, it's still a
good idea to set your PATH to %p/lib/%N/bin as well.
To build the demos and examples, it's enough to just run qmake on
the .pro file in the %p/share/doc/%N directory in the %N-doc
package:
mkdir /tmp/build-examples
cd /tmp/build-examples
%p/lib/%N/bin/qmake %p/share/doc/%N/examples/examples.pro
make
<<
DescPackaging: This package is dedicated to Boo Fulbright.
--- qt-copy-755604/config.tests/qws/opengles/opengles.pro 2007-08-02 11:33:10.000000000 -0400
+++ qt-copy-755604-new/config.tests/qws/opengles/opengles.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/3dnow/3dnow.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/3dnow/3dnow.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = 3dnow.cpp
-CONFIG -= x11 qt
-
+CONFIG -= x11 qt app_bundle
--- qt-copy-755604/config.tests/unix/clock-monotonic/clock-monotonic.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,3 @@
-CONFIG -= qt dylib mac_bundle
+CONFIG -= qt dylib app_bundle
SOURCES = clock-monotonic.cpp
include(clock-monotonic.pri)
--- qt-copy-755604/config.tests/unix/cups/cups.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/cups/cups.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = cups.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lcups
--- qt-copy-755604/config.tests/unix/db2/db2.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/db2/db2.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = db2.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -ldb2
--- qt-copy-755604/config.tests/unix/dbus/dbus.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/dbus/dbus.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = dbus.cpp
-CONFIG -= qt
-CONFIG -= app_bundle
+CONFIG -= qt app_bundle
--- qt-copy-755604/config.tests/unix/doubleformat/doubleformattest.pro 2007-08-02 11:33:07.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/doubleformat/doubleformattest.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/endian/endiantest.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/endian/endiantest.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/floatmath/floatmath.pro 2007-08-02 11:33:07.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/floatmath/floatmath.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,3 @@
SOURCES = floatmath.cpp
-CONFIG -= x11 qt
+CONFIG -= x11 qt app_bundle
--- qt-copy-755604/config.tests/unix/freetype/freetype.pro 2007-08-02 11:33:07.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/freetype/freetype.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,5 +1,5 @@
SOURCES = freetype.cpp
CONFIG += x11
-CONFIG -= qt
+CONFIG -= qt app_bundle
LIBS += -lfreetype
include(freetype.pri)
--- qt-copy-755604/config.tests/unix/getaddrinfo/getaddrinfo.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/getifaddrs/getifaddrs.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/getifaddrs/getifaddrs.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,6 +1,5 @@
TARGET=getifaddrs
-CONFIG -= qt
-mac:CONFIG -= app_bundle
+CONFIG -= qt app_bundle
QT =
TEMPLATE=app
SOURCES=getifaddrs.cpp
--- qt-copy-755604/config.tests/unix/ibase/ibase.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/ibase/ibase.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = ibase.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lgds
--- qt-copy-755604/config.tests/unix/inotify/inotify.pro 2007-08-02 11:33:07.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/inotify/inotify.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = inotifytest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
--- qt-copy-755604/config.tests/unix/ipv6/ipv6.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/ipv6/ipv6.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = ipv6test.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
--- qt-copy-755604/config.tests/unix/ipv6ifname/ipv6ifname.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,6 +1,5 @@
TARGET=ipv6ifname
-CONFIG -= qt
-mac:CONFIG -= app_bundle
+CONFIG -= qt app_bundle
QT =
TEMPLATE=app
SOURCES=ipv6ifname.cpp
--- qt-copy-755604/config.tests/unix/largefile/largefile.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/largefile/largefile.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES=largefiletest.cpp
-CONFIG-=qt dylib
-mac:CONFIG -= app_bundle
+CONFIG-=qt dylib app_bundle
--- qt-copy-755604/config.tests/unix/libjpeg/libjpeg.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/libjpeg/libjpeg.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = libjpeg.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -ljpeg
--- qt-copy-755604/config.tests/unix/libmng/libmng.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/libmng/libmng.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = libmng.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lmng
--- qt-copy-755604/config.tests/unix/libpng/libpng.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/libpng/libpng.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = libpng.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lpng
--- qt-copy-755604/config.tests/unix/libtiff/libtiff.pro 2007-08-02 11:33:07.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/libtiff/libtiff.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = libtiff.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -ltiff
--- qt-copy-755604/config.tests/unix/mmx/mmx.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/mmx/mmx.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = mmx.cpp
-CONFIG -= x11 qt
-
+CONFIG -= x11 qt app_bundle
--- qt-copy-755604/config.tests/unix/mysql_r/mysql_r.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/mysql_r/mysql_r.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = ../mysql/mysql.cpp
-CONFIG -= qt dylib
-CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lmysqlclient_r
--- qt-copy-755604/config.tests/unix/nis/nis.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/nis/nis.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/oci/oci.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/oci/oci.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = oci.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lclntsh
--- qt-copy-755604/config.tests/unix/odbc/odbc.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/odbc/odbc.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = odbc.cpp
-CONFIG -= qt dylib
-CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lodbc
--- qt-copy-755604/config.tests/unix/psql/psql.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/psql/psql.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = psql.cpp
-CONFIG -= qt dylib
-CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lpq
--- qt-copy-755604/config.tests/unix/ptrsize/ptrsizetest.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/ptrsize/ptrsizetest.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/unix/sqlite/sqlite.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/sqlite/sqlite.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = sqlite.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lsqlite3
--- qt-copy-755604/config.tests/unix/sqlite2/sqlite2.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/sqlite2/sqlite2.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = sqlite2.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lsqlite
--- qt-copy-755604/config.tests/unix/sse/sse.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/sse/sse.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = sse.cpp
-CONFIG -= x11 qt
-
+CONFIG -= x11 qt app_bundle
--- qt-copy-755604/config.tests/unix/sse2/sse2.pro 2007-08-02 11:33:09.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/sse2/sse2.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = sse2.cpp
-CONFIG -= x11 qt
-
+CONFIG -= x11 qt app_bundle
--- qt-copy-755604/config.tests/unix/stl/stl.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/stl/stl.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,2 @@
SOURCES = stltest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
--- qt-copy-755604/config.tests/unix/tds/tds.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/tds/tds.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = tds.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lsybdb
--- qt-copy-755604/config.tests/unix/tslib/tslib.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/tslib/tslib.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,3 +1,3 @@
SOURCES = tslib.cpp
-CONFIG -= qt
+CONFIG -= qt app_bundle
LIBS += -lts
--- qt-copy-755604/config.tests/unix/zlib/zlib.pro 2007-08-02 11:33:08.000000000 -0400
+++ qt-copy-755604-new/config.tests/unix/zlib/zlib.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,4 +1,3 @@
SOURCES = zlib.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lz
--- qt-copy-755604/config.tests/x11/fontconfig/fontconfig.pro 2007-08-02 11:33:10.000000000 -0400
+++ qt-copy-755604-new/config.tests/x11/fontconfig/fontconfig.pro 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/config.tests/x11/notype/notypetest.pro 2007-08-02 11:33:10.000000000 -0400
+++ qt-copy-755604-new/config.tests/x11/notype/notypetest.pro 2008-01-09 12:57:43.000000000 -0500
@@ -1,5 +1,5 @@
TEMPLATE=app
TARGET=notypetest
-CONFIG-=qt
+CONFIG-=qt app_bundle
CONFIG+=x11
SOURCES=notypetest.cpp
--- qt-copy-755604/configure 2007-12-11 18:43:14.000000000 -0500
+++ qt-copy-755604-new/configure 2008-01-09 12:57:43.000000000 -0500
@@ -994,16 +994,15 @@
CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
;;
x11)
- if [ "$Edition" = "Trolltech" ] && [ "$VAL" = "yes" ]; then
if [ "$PLATFORM_MAC" = "yes" ]; then
PLATFORM_MAC=no
elif [ "$PLATFORM_QWS" = "yes" ]; then
PLATFORM_QWS=no
fi
- PLATFORM_X11=yes
- else
- UNKNOWN_OPT=yes
+ if [ "$CFG_FRAMEWORK" = "auto" ]; then
+ CFG_FRAMEWORK=no
fi
+ PLATFORM_X11=yes
;;
sdk)
if [ "$PLATFORM_MAC" = "yes" ]; then
@@ -3645,6 +3644,10 @@
EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)"
fi
fi
+ if [ "$PLATFORM_X11" = "yes" ]; then
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -D__USE_WS_X11__=1"
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -D__USE_WS_X11__=1"
+ fi
[ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
if [ '!' -z "$D_FLAGS" ]; then
for DEF in $D_FLAGS; do
--- qt-copy-755604/configure-for-fink.sh 1969-12-31 19:00:00.000000000 -0500
+++ qt-copy-755604-new/configure-for-fink.sh 2008-01-09 12:57:43.000000000 -0500
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
+if [ -z "$1" ]; then
+ echo "usage: $0 /fink/prefix"
+ exit 1
+fi
+
+if [ -f /usr/lib/libresolv.dylib ]; then
+ LIBRESOLV="-lresolv"
+ perl -pi -e 's,#define QT_AOUT_UNDERSCORE,,' mkspecs/{darwin-g++,macx-g++}/qplatformdefs.h
+else
+ LIBRESOLV=""
+fi
+
+[ -z "$CC" ] && CC=gcc-4.0
+[ -z "$CXX" ] && CXX=g++-4.0
+
+FINKPREFIX="$1"; shift
+PKGNAME="$1"; shift
+QTDIR=`pwd`
+PATH="$QTDIR/bin:$FINKPREFIX/lib/freetype219/bin:$PATH"
+
+EXTRA_ARGS=""
+
+if [ "$PKGNAME" = "qt4-x11" ]; then
+ EXTRA_ARGS="-D__USE_WS_X11__=1 -x11 -platform darwin-g++ -xplatform darwin-g++"
+else
+ EXTRA_ARGS="-platform macx-g++ -xplatform macx-g++"
+fi
+
+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++/*
+
+echo "yes" | sh ./configure \
+ "-I$QTDIR/include" "-I$QTDIR/include/Qt" "-I$QTDIR/include/QtCore" \
+ "-I$FINKPREFIX/lib/freetype219/include" "-I$FINKPREFIX/lib/freetype219/include/freetype2" \
+ "-I$FINKPREFIX/lib/fontconfig2/include" "-I$FINKPREFIX/lib/fontconfig2/include" \
+ "-I/usr/X11R6/include" "-I$FINKPREFIX/include" \
+ "-L$FINKPREFIX/lib/freetype219/lib" "-L$FINKPREFIX/lib/fontconfig2/lib" \
+ "-L$FINKPREFIX/lib" "-L/usr/X11R6/lib" \
+ -DQT_DBUS_INIT_DEFAULT=1 $LIBRESOLV \
+ -prefix "$FINKPREFIX/lib/$PKGNAME" -docdir "$FINKPREFIX/share/doc/$PKGNAME" \
+ -no-exceptions -qt-gif -system-freetype \
+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
+ -plugin-sql-sqlite $EXTRA_ARGS "$@"
+
+# don't link against older versions of self
+/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,-L$FINKPREFIX/lib/$PKGNAME/lib,,g"
+
+# 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"
--- qt-copy-755604/mkspecs/common/mac-g++.conf 2007-08-02 11:33:06.000000000 -0400
+++ qt-copy-755604-new/mkspecs/common/mac-g++.conf 2008-01-09 12:57:43.000000000 -0500
@@ -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-755604/mkspecs/darwin-g++/qmake.conf 2007-08-02 11:33:05.000000000 -0400
+++ qt-copy-755604-new/mkspecs/darwin-g++/qmake.conf 2008-01-09 12:57:43.000000000 -0500
@@ -6,7 +6,7 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
-CONFIG += qt warn_on release link_prl native_precompiled_headers
+CONFIG += qt warn_on release global_init_link_order lib_version_first link_prl plugin_no_soname native_precompiled_headers
QT += core gui
DEFINES += __USE_WS_X11__
@@ -19,14 +19,17 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O2
+QMAKE_CFLAGS_RELEASE = -Os
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_EXTENSION_SHLIB = dylib
QMAKE_EXTENSION_PLUGIN = so
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
QMAKE_CFLAGS_THREAD =
+QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
QMAKE_CXX = c++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
@@ -38,9 +41,12 @@
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
QMAKE_CXXFLAGS_THREAD =
+QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-QMAKE_INCDIR = /usr/local/include
+QMAKE_INCDIR =
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
@@ -51,17 +57,21 @@
QMAKE_LINK = c++
QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
+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
-QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module -headerpad_max_install_names
-QMAKE_LFLAGS_PLUGIN = -bundle
+QMAKE_LFLAGS_SHLIB = -prebind -dynamiclib -single_module
+QMAKE_LFLAGS_PLUGIN = -prebind -bundle
QMAKE_LFLAGS_THREAD =
+QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE}
QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
+QMAKE_PCH_OUTPUT_EXT = .gch
+
+QMAKE_FIX_RPATH = install_name_tool -id
QMAKE_RPATH =
QMAKE_LIBS_DYNLOAD =
@@ -88,5 +98,6 @@
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
+
include(../common/unix.conf)
load(qt_config)
--- qt-copy-755604/mkspecs/macx-g++/qmake.conf 2007-08-02 11:33:05.000000000 -0400
+++ qt-copy-755604-new/mkspecs/macx-g++/qmake.conf 2008-01-09 12:57:43.000000000 -0500
@@ -8,10 +8,13 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
-CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+CONFIG += qt warn_on release app_bundle global_init_link_order lib_version_first link_prl plugin_no_soname native_precompiled_headers
QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac-g++.conf)
+QMAKE_EXTENSION_PLUGIN = bundle
+QMAKE_LFLAGS_PLUGIN = -prebind -bundle
+
load(qt_config)
--- qt-copy-755604/projects.pro 2007-10-09 18:33:43.000000000 -0400
+++ qt-copy-755604-new/projects.pro 2008-01-09 12:57:43.000000000 -0500
@@ -8,7 +8,7 @@
cross_compile: CONFIG += nostrip
isEmpty(QT_BUILD_PARTS) { #defaults
- QT_BUILD_PARTS = libs tools examples demos
+ QT_BUILD_PARTS = libs tools
} else { #make sure the order makes sense
contains(QT_BUILD_PARTS, tools) {
QT_BUILD_PARTS -= tools
@@ -29,10 +29,6 @@
isEqual(PROJECT, tools) {
!cross_compile:SUBDIRS += tools
else:SUBDIRS += tools/qtestlib
- } else:isEqual(PROJECT, examples) {
- SUBDIRS += examples
- } else:isEqual(PROJECT, demos) {
- SUBDIRS += demos
} else:isEqual(PROJECT, libs) {
include(src/src.pro)
} else:isEqual(PROJECT, qmake) {
--- qt-copy-755604/qmake/generators/mac/pbuilder_pbx.cpp 2007-12-11 18:40:09.000000000 -0500
+++ qt-copy-755604-new/qmake/generators/mac/pbuilder_pbx.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -47,7 +47,7 @@
# include
# include
#endif
-#ifdef Q_OS_DARWIN
+#ifdef Q_WS_MAC
#include
#include
#endif
@@ -1674,7 +1674,7 @@
} else {
QString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST");
if(version_plist.isEmpty()) {
-#ifdef Q_OS_DARWIN
+#ifdef Q_WS_MAC
ret = QLatin1String("34");
QCFType
OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);
--- qt-copy-755604/qmake/generators/unix/unixmake.cpp 2007-12-11 18:40:10.000000000 -0500
+++ qt-copy-755604-new/qmake/generators/unix/unixmake.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -43,6 +43,8 @@
#include
#include
+bool handleframeworks = false;
+
void
UnixMakefileGenerator::init()
{
@@ -338,6 +340,13 @@
}
}
}
+
+#if defined(Q_OS_DARWIN)
+ handleframeworks = true;
+#else
+ if (Option::target_mode == Option::TARG_MACX_MODE)
+ handleframeworks = true;
+#endif
}
void
@@ -435,9 +444,9 @@
libdirs.append(f);
} else if(opt.startsWith("-l")) {
stub = opt.mid(2);
- } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) {
+ } else if(handleframeworks && opt.startsWith("-F")) {
frameworkdirs.append(QMakeLocalFileName(opt.right(opt.length()-2)));
- } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) {
+ } else if(handleframeworks && opt.startsWith("-framework")) {
if(opt.length() > 11) {
opt = opt.mid(11);
} else {
@@ -557,11 +566,11 @@
break;
}
}
- } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) {
+ } else if(handleframeworks && opt.startsWith("-F")) {
QMakeLocalFileName f(opt.right(opt.length()-2));
if(!frameworkdirs.contains(f))
frameworkdirs.append(f);
- } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) {
+ } else if(handleframeworks && opt.startsWith("-framework")) {
if(opt.length() > 11)
opt = opt.mid(11);
else
@@ -600,13 +609,13 @@
QString opt = l.at(lit).trimmed();
if(opt.startsWith("-")) {
if(opt.startsWith("-L") ||
- (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) {
+ (handleframeworks && opt.startsWith("-F"))) {
if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1)
lflags.append(opt);
} else if(opt.startsWith("-l")) {
if(lit == l.size()-1 || l.indexOf(opt, lit+1) == -1)
lflags.append(opt);
- } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) {
+ } else if(handleframeworks && opt.startsWith("-framework")) {
if(opt.length() > 11)
opt = opt.mid(11);
else
--- qt-copy-755604/qmake/option.cpp 2007-12-11 18:40:10.000000000 -0500
+++ qt-copy-755604-new/qmake/option.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -90,7 +90,7 @@
QStringList Option::shellPath;
#if defined(Q_OS_WIN32)
Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_WS_MAC)
Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
#elif defined(Q_OS_QNX6)
Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE;
--- qt-copy-755604/src/corelib/corelib.pro 2007-08-02 11:30:39.000000000 -0400
+++ qt-copy-755604-new/src/corelib/corelib.pro 2008-01-09 12:57:43.000000000 -0500
@@ -14,7 +14,7 @@
include(kernel/kernel.pri)
include(codecs/codecs.pri)
-mac:LIBS += -framework ApplicationServices
+mac|darwin-*:LIBS += -framework ApplicationServices
mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
win32:DEFINES-=QT_NO_CAST_TO_ASCII
--- qt-copy-755604/src/corelib/global/qglobal.cpp 2007-12-11 18:38:43.000000000 -0500
+++ qt-copy-755604-new/src/corelib/global/qglobal.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -1607,7 +1607,7 @@
const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian);
#endif
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
#include "private/qcore_mac_p.h"
#include "qnamespace.h"
--- qt-copy-755604/src/corelib/global/qlibraryinfo.cpp 2007-12-11 18:38:42.000000000 -0500
+++ qt-copy-755604-new/src/corelib/global/qlibraryinfo.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -45,7 +45,7 @@
#else
# include "qcoreapplication.h"
#endif
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
# include "private/qcore_mac_p.h"
#endif
@@ -109,7 +109,7 @@
qtconfig = qmake_libraryInfoFile();
#else
if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
CFBundleRef bundleRef = CFBundleGetMainBundle();
if (bundleRef) {
QCFType
@@ -424,7 +424,7 @@
return QFileInfo(qmake_libraryInfoFile()).absolutePath();
#else
if (QCoreApplication::instance()) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
CFBundleRef bundleRef = CFBundleGetMainBundle();
if (bundleRef) {
QCFType
--- qt-copy-755604/src/corelib/global/qnamespace.h 2007-12-11 18:38:43.000000000 -0500
+++ qt-copy-755604-new/src/corelib/global/qnamespace.h 2008-01-09 12:57:43.000000000 -0500
@@ -958,7 +958,7 @@
};
#if defined(QT3_SUPPORT)
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
#ifndef qdoc
typedef int MacintoshVersion;
@@ -985,7 +985,7 @@
MV_PANTHER = QSysInfo::MV_PANTHER,
MV_TIGER = QSysInfo::MV_TIGER
};
-#endif // Q_OS_MAC
+#endif // Q_WS_MAC
#if defined(Q_OS_WIN)
#ifndef qdoc
--- qt-copy-755604/src/corelib/io/qfsfileengine_unix.cpp 2007-12-11 18:38:56.000000000 -0500
+++ qt-copy-755604-new/src/corelib/io/qfsfileengine_unix.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -49,7 +49,7 @@
#include
#include
#include
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
# include
#endif
@@ -500,7 +500,7 @@
return is_link;
}
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
static bool _q_isMacHidden(const QString &path)
{
OSErr err = noErr;
@@ -583,7 +583,7 @@
ret |= ExeOtherPerm;
}
if (type & TypesMask) {
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
bool foundAlias = false;
{
FSRef fref;
@@ -605,7 +605,7 @@
ret |= FileType;
else if (exists && (d->st.st_mode & S_IFMT) == S_IFDIR)
ret |= DirectoryType;
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
if((ret & DirectoryType) && (type & BundleType)) {
QCFType
kCFURLPOSIXPathStyle, true);
@@ -621,7 +621,7 @@
if (exists)
ret |= ExistsFlag;
if (fileName(BaseName)[0] == QLatin1Char('.')
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
|| _q_isMacHidden(d->filePath)
#endif
)
@@ -636,7 +636,7 @@
{
Q_D(const QFSFileEngine);
if (file == BundleName) {
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
QCFType
kCFURLPOSIXPathStyle, true);
if(CFDictionaryRef dict = CFBundleCopyInfoDictionaryForURL(url)) {
@@ -781,7 +781,7 @@
return ret;
}
}
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
{
FSRef fref;
if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d->filePath)).data(), &fref, 0) == noErr) {
--- qt-copy-755604/src/corelib/io/qprocess_unix.cpp 2007-12-11 18:38:56.000000000 -0500
+++ qt-copy-755604-new/src/corelib/io/qprocess_unix.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -78,7 +78,7 @@
#include "qprocess.h"
#include "qprocess_p.h"
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
#include
#endif
@@ -591,7 +591,7 @@
// Encode the program name.
QByteArray encodedProgramName = QFile::encodeName(program);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
// allow invoking of .app bundles on the Mac.
QFileInfo fileInfo(QString::fromUtf8(encodedProgramName.constData()));
if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) {
--- qt-copy-755604/src/corelib/io/qsettings.cpp 2007-12-11 18:38:56.000000000 -0500
+++ qt-copy-755604-new/src/corelib/io/qsettings.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -288,7 +288,7 @@
// see also qsettings_win.cpp and qsettings_mac.cpp
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC)
QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope,
const QString &organization, const QString &application)
{
@@ -921,7 +921,7 @@
extension = (format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini");
readFunc = 0;
writeFunc = 0;
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : Qt::CaseInsensitive;
#else
caseSensitivity = IniCaseSensitivity;
@@ -1067,7 +1067,7 @@
pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), userPath);
pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::SystemScope), systemPath);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::UserScope), userPath);
pathHash->insert(pathHashKey(QSettings::NativeFormat, QSettings::SystemScope), systemPath);
#endif
@@ -1453,7 +1453,7 @@
because they don't exist) are treated as empty files.
*/
if (file.isReadable() && fileInfo.size() != 0) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
if (format == QSettings::NativeFormat) {
ok = readPlistFile(confFile->name, &confFile->originalKeys);
} else
@@ -1499,7 +1499,7 @@
ParsedSettingsMap mergedKeys = confFile->mergedKeyMap();
if (file.isWritable()) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
if (format == QSettings::NativeFormat) {
ok = writePlistFile(confFile->name, mergedKeys);
} else
@@ -2591,7 +2591,7 @@
*/
QSettings::QSettings(QObject *parent)
: QObject(*QSettingsPrivate::create(NativeFormat, UserScope,
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
QCoreApplication::organizationDomain().isEmpty()
? QCoreApplication::organizationName()
: QCoreApplication::organizationDomain()
@@ -3254,7 +3254,7 @@
void QSettings::setSystemIniPath(const QString &dir)
{
setPath(IniFormat, SystemScope, dir);
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC)
setPath(NativeFormat, SystemScope, dir);
#endif
}
@@ -3268,7 +3268,7 @@
void QSettings::setUserIniPath(const QString &dir)
{
setPath(IniFormat, UserScope, dir);
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN) && !defined(Q_WS_MAC)
setPath(NativeFormat, UserScope, dir);
#endif
}
--- qt-copy-755604/src/corelib/io/qsettings_p.h 2007-12-11 18:38:56.000000000 -0500
+++ qt-copy-755604-new/src/corelib/io/qsettings_p.h 2008-01-09 12:57:43.000000000 -0500
@@ -273,7 +273,7 @@
void initAccess();
void syncConfFile(int confFileNo);
bool writeIniFile(QIODevice &device, const ParsedSettingsMap &map);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
bool readPlistFile(const QString &fileName, ParsedSettingsMap *map) const;
bool writePlistFile(const QString &fileName, const ParsedSettingsMap &map) const;
#endif
--- qt-copy-755604/src/corelib/plugin/qlibrary.cpp 2007-12-11 18:38:57.000000000 -0500
+++ qt-copy-755604-new/src/corelib/plugin/qlibrary.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -47,7 +47,7 @@
#include
#include
#include
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
# include
#endif
#ifndef NO_ERRNO_H
@@ -64,7 +64,7 @@
# define QLIBRARY_AS_DEBUG true
#endif
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
// We don't use separate debug and release libs on UNIX, so we want
// to allow loading plugins, regardless of how they were built.
# define QT_NO_DEBUG_PLUGIN_CHECK
@@ -289,7 +289,7 @@
return ret;
}
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
# define USE_MMAP
@@ -412,7 +412,7 @@
return ret;
}
-#endif // Q_OS_UNIX && !Q_OS_MAC
+#endif // Q_OS_UNIX && !Q_WS_MAC
typedef QMap
Q_GLOBAL_STATIC(LibraryMap, libraryMap)
@@ -585,7 +585,7 @@
key = reg.at(2).toLatin1();
success = qt_version != 0;
} else {
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_WS_MAC)
if (!pHnd) {
// use unix shortcut to avoid loading the library
success = qt_unix_query(fileName, &qt_version, &debug, &key, this);
--- qt-copy-755604/src/corelib/plugin/qlibrary_unix.cpp 2007-12-11 18:38:57.000000000 -0500
+++ qt-copy-755604-new/src/corelib/plugin/qlibrary_unix.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -43,7 +43,7 @@
#ifndef QT_NO_LIBRARY
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
# include
#endif
@@ -152,8 +152,9 @@
if (majorVerNum > -1) {
suffixes << QString::fromLatin1(".%1.bundle").arg(majorVerNum);
suffixes << QString::fromLatin1(".%1.dylib").arg(majorVerNum);
+ suffixes << QString::fromLatin1(".%1.so").arg(majorVerNum);
} else {
- suffixes << QLatin1String(".bundle") << QLatin1String(".dylib");
+ suffixes << QLatin1String(".bundle") << QLatin1String(".dylib") << QLatin1String(".so");
}
#endif
}
@@ -198,7 +199,7 @@
pHnd = dlopen(QFile::encodeName(attempt), dlFlags);
}
}
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
if (!pHnd) {
if (CFBundleRef bundle = CFBundleGetBundleWithIdentifier(QCFString(fileName))) {
QCFType
@@ -228,7 +229,7 @@
return true;
}
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
Q_CORE_EXPORT void *qt_mac_resolve_sys(void *handle, const char *symbol)
{
return dlsym(handle, symbol);
--- qt-copy-755604/src/corelib/tools/qlocale.cpp 2007-12-11 18:38:55.000000000 -0500
+++ qt-copy-755604-new/src/corelib/tools/qlocale.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -48,7 +48,7 @@
# include "qt_windows.h"
# include
#endif
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && defined(Q_WS_MAC)
# include "private/qcore_mac_p.h"
#endif
#include "private/qnumeric_p.h"
@@ -884,7 +884,7 @@
}
-#elif defined(Q_OS_MAC)
+#elif defined(Q_WS_MAC)
/******************************************************************************
** Wrappers for Mac locale system functions
*/
--- qt-copy-755604/src/corelib/tools/qpoint.h 2007-12-11 18:38:55.000000000 -0500
+++ qt-copy-755604-new/src/corelib/tools/qpoint.h 2008-01-09 12:57:43.000000000 -0500
@@ -77,7 +77,7 @@
private:
friend class QTransform;
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
int yp;
int xp;
#else
--- qt-copy-755604/src/corelib/tools/qrect.h 2007-12-11 18:38:55.000000000 -0500
+++ qt-copy-755604-new/src/corelib/tools/qrect.h 2008-01-09 12:57:43.000000000 -0500
@@ -165,7 +165,7 @@
#if defined(Q_WS_X11) || defined(Q_OS_TEMP)
friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2);
#endif
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
int y1;
int x1;
int y2;
--- qt-copy-755604/src/corelib/tools/qstring.cpp 2007-12-11 18:38:55.000000000 -0500
+++ qt-copy-755604-new/src/corelib/tools/qstring.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -49,7 +49,7 @@
#include "qhash.h"
#include "qdebug.h"
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
#include
#endif
@@ -4238,7 +4238,7 @@
default:
return 0;
}
-#elif defined (Q_OS_MAC)
+#elif defined (Q_WS_MAC)
// Use CFStringCompare for comparing strings on Mac. This makes Qt order
// strings the same way as native applications do, and also respects
// the "Order for sorted lists" setting in the International preferences
--- qt-copy-755604/src/gui/dialogs/qprintdialog.h 2007-12-11 18:39:13.000000000 -0500
+++ qt-copy-755604-new/src/gui/dialogs/qprintdialog.h 2008-01-09 12:57:43.000000000 -0500
@@ -59,7 +59,7 @@
int exec();
-#if defined (Q_OS_UNIX) && !defined (Q_OS_MAC) && defined (QT3_SUPPORT)
+#if defined (Q_OS_UNIX) && !defined (Q_WS_MAC) && defined (QT3_SUPPORT)
void setPrinter(QPrinter *, bool = false);
QPrinter *printer() const;
void addButton(QPushButton *button);
--- qt-copy-755604/src/gui/kernel/qapplication.h 2007-12-11 18:39:12.000000000 -0500
+++ qt-copy-755604-new/src/gui/kernel/qapplication.h 2008-01-09 12:57:43.000000000 -0500
@@ -287,7 +287,7 @@
#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
static QT3_SUPPORT Qt::WindowsVersion winVersion() { return (Qt::WindowsVersion)QSysInfo::WindowsVersion; }
#endif
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
static QT3_SUPPORT Qt::MacintoshVersion macVersion() { return (Qt::MacintoshVersion)QSysInfo::MacintoshVersion; }
#endif
# ifndef QT_NO_CURSOR
--- qt-copy-755604/src/gui/kernel/qapplication_p.h 2007-12-11 18:39:12.000000000 -0500
+++ qt-copy-755604-new/src/gui/kernel/qapplication_p.h 2008-01-09 12:57:43.000000000 -0500
@@ -82,7 +82,7 @@
# ifdef Q_OS_TEMP
extern DWORD qt_cever;
# endif
-#elif defined (Q_OS_MAC)
+#elif defined (Q_WS_MAC)
extern QSysInfo::MacVersion qt_macver;
#endif
#if defined(Q_WS_QWS)
--- qt-copy-755604/src/gui/widgets/qdockwidget.cpp 2007-12-11 18:39:23.000000000 -0500
+++ qt-copy-755604-new/src/gui/widgets/qdockwidget.cpp 2008-01-09 12:57:43.000000000 -0500
@@ -915,7 +915,7 @@
if (state->nca) {
endDrag();
}
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
else { // workaround for lack of mouse-grab on Mac
QMainWindowLayout *layout
= qobject_cast
@@ -928,7 +928,7 @@
#endif
break;
case QEvent::NonClientAreaMouseButtonRelease:
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
if (state)
endDrag();
#endif
--- qt-copy-755604/src/tools/uic/cpp/cppwriteinitialization.h 2007-12-11 18:39:48.000000000 -0500
+++ qt-copy-755604-new/src/tools/uic/cpp/cppwriteinitialization.h 2008-01-09 12:57:43.000000000 -0500
@@ -59,7 +59,7 @@
int compare(const FontHandle &) const;
private:
const DomFont *m_domFont;
-#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
+#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
friend uint qHash(const FontHandle &);
#endif
};
@@ -73,12 +73,12 @@
int compare(const SizePolicyHandle &) const;
private:
const DomSizePolicy *m_domSizePolicy;
-#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
+#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
friend uint qHash(const SizePolicyHandle &);
#endif
};
inline bool operator ==(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) == 0; }
-#if !(defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3))
+#if !(defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3))
inline bool operator <(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) < 0; }
#endif
@@ -217,7 +217,7 @@
QHash
// Map from font properties to font variable name for reuse
// Map from size policy to variable for reuse
-#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
+#if defined(Q_WS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
typedef QHash
typedef QHash
#else
Package: qt4-x11
Version: 4.4.1
Revision: 1
GCC: 4.0
CustomMirror: <<
Primary: http://ranger.users.finkproject.org/distfiles
eur-NL: http://ranger.users.finkproject.org/distfiles
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:custom:qt/qt-copy-853424.tar.bz2
Source-MD5: 84ff2a03fa92bd7870efe487fd5d197a
SourceDirectory: qt-copy
PatchScript: <<
mkdir .svn
./apply_patches
patch -p1 --fuzz=4 < %a/%{Ni}.patch
perl -pi -e 's,const char,char,g' config.tests/unix/*iconv/*.cpp
<<
Description: Cross-Platform framework (X11 version)
Depends: <<
%N-core-shlibs (= %v-%r),
%N-gui-shlibs (= %v-%r),
%N-designer (= %v-%r),
%N-linguist (= %v-%r),
%N-doc (= %v-%r),
pkgconfig (>= 0.22-1),
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
cctools (>= 446),
cups-dev,
dbus-dev (>= 1.2.1-1),
expat1,
fink (>= 0.17.3-1),
fontconfig2-dev (>= 2.3.2-13),
freetype219,
glib2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev (>= 1.12-3),
libjpeg,
libmng2,
libpng3 (>= 1.2.5-4),
macosx (>= 10.4.3-1),
pkgconfig (>= 0.22-1),
x11-dev
<<
BuildDependsOnly: true
BuildConflicts: kdelibs3-dev, kdelibs3-ssl-dev, kdelibs3-unified-dev, libevent1, pcre, clucene-core, %N
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
find . -name ._\* -exec rm -rf {} \;
sh ./configure-for-fink.sh "%p" "%N" -make "libs tools docs"
find src/3rdparty/webkit src/3rdparty/clucene tools/assistant -name Makefile\* -print0 | xargs -0 perl -pi -e 's,-I%p/include,-isystem %p/include,g'
make
<<
InstallScript: <<
#!/bin/sh -ev
#### MAIN INSTALL ####
unset QMAKESPEC
make 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
done
# add the WS_X11 stuff
cat <
#ifndef __USE_WS_X11__
#define __USE_WS_X11__ 1
#endif
END
cat %i/lib/%N/include/QtCore/qglobal.h >>%i/lib/%N/include/QtCore/qglobal.h.new
mv %i/lib/%N/include/QtCore/qglobal.h.new %i/lib/%N/include/QtCore/qglobal.h
#### FIX LA, PRL and PC FILES ####
perl -pi -e 's,%b/lib,%p/lib/%N/lib,g; s/-framework /-Wl,-framework,/g' %i/lib/%N/lib/pkgconfig/*.pc %i/lib/%N/lib/*.prl %i/lib/%N/lib/*.la
#### TUTORIALS AND EXAMPLES ####
# clean up the makefiles
perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find demos examples -name "*.pro"`
install -d -m 0755 %i/share/doc/%N/examples
install -d -m 0755 %i/share/doc/%N/demos
/bin/cp -fRL examples/* %i/share/doc/%N/examples/
/bin/cp -fRL demos/* %i/share/doc/%N/demos/
# kde icon for qt designer
install -d -m 0755 %i/share/applnk/Development
cat >%i/share/applnk/Development/designer4.desktop <
Name=Qt Designer 4
GenericName=Interface Designer
Exec=%p/lib/%N/bin/designer
Icon=designer
InitialPreference=5
MapNotify=true
MimeType=application/x-designer
Terminal=false
Encoding=UTF-8
Type=Application
EOF
cat >%i/share/applnk/Development/linguist4.desktop <
Name=Qt Linguist 4
GenericName=Translation Editor
Exec=%p/lib/%N/bin/linguist
Icon=linguist
InitialPreference=5
MapNotify=true
Terminal=false
Encoding=UTF-8
Type=Application
EOF
/usr/bin/find %i/share/doc/%N/ -name \*.moc -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%N/ -name \*.obj -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%N/examples -name Makefile\* -print0 | xargs -0 rm -rf >/dev/null 2>&1 || :
perl -pi -e 's/-framework ApplicationServices/-Wl,-framework,ApplicationServices/g' %i/lib/%N/lib/pkgconfig/*.pc
install -d -m 755 %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
<<
SplitOff: <<
Package: %N-gui-shlibs
Suggests: %N-designer, %N-linguist, %N-doc
Depends: <<
%N-core-shlibs (= %v-%r),
freetype219-shlibs,
libmng2-shlibs,
libpng3-shlibs (>= 1.2.5-4),
libjpeg-shlibs,
x11-shlibs
<<
Files: <<
lib/%N/lib/libQt3Support.4*.dylib
lib/%N/lib/libQtAssistantClient.4*.dylib
lib/%N/lib/libQtGui.4*.dylib
lib/%N/lib/libQtHelp.4*.dylib
lib/%N/lib/libQtOpenGL.4*.dylib
lib/%N/lib/libQtSvg.4*.dylib
lib/%N/lib/libQtWebKit.4*.dylib
lib/%N/plugins/accessible
lib/%N/plugins/iconengines
lib/%N/plugins/imageformats
lib/%N/plugins/inputmethods
<<
Shlibs: <<
%p/lib/%N/lib/libQt3Support.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtAssistantClient.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtGui.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtHelp.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtOpenGL.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtSvg.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtWebKit.4.dylib 4.4.0 %n (>= 4.4.0-1)
<<
PostInstScript: <<
(/%p/lib/fontconfig2/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || :
<<
<<
SplitOff2: <<
Package: %N-core-shlibs
Depends: dbus-shlibs (>= 1.2.1-1), fink (>= 0.17.1-1), glib2-shlibs (>= 2.12.0-1)
Files: <<
lib/%N/lib/libQtCore.4*.dylib
lib/%N/lib/libQtCLucene.4*.dylib
lib/%N/lib/libQtDBus.4*.dylib
lib/%N/lib/libQtNetwork.4*.dylib
lib/%N/lib/libQtScript.4*.dylib
lib/%N/lib/libQtSql.4*.dylib
lib/%N/lib/libQtTest.4*.dylib
lib/%N/lib/libQtXml.4*.dylib
lib/%N/lib/libQtXmlPatterns.4*.dylib
lib/%N/plugins/codecs
lib/%N/plugins/sqldrivers
<<
Shlibs: <<
%p/lib/%N/lib/libQtCore.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtCLucene.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtDBus.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtNetwork.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtScript.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtSql.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtTest.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtXml.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtXmlPatterns.4.dylib 4.4.0 %n (>= 4.4.0-1)
<<
<<
SplitOff3: <<
Package: %N-designer
Depends: %N-designer-shlibs (= %v-%r), x11
Replaces: %N (<< %v-1)
Files: <<
bin/designer*
share/applnk/Development/designer4.desktop
lib/%N/bin/designer
lib/%N/translations/designer_*
<<
<<
SplitOff4: <<
Package: %N-designer-shlibs
Depends: %N-gui-shlibs (= %v-%r), x11-shlibs
Files: <<
lib/%N/lib/libQtDesigner.*.dylib
lib/%N/lib/libQtDesignerComponents.*.dylib
lib/%N/plugins/designer
<<
Shlibs: <<
%p/lib/%N/lib/libQtDesigner.4.dylib 4.4.0 %n (>= 4.4.0-1)
%p/lib/%N/lib/libQtDesignerComponents.4.dylib 4.4.0 %n (>= 4.4.0-1)
<<
<<
SplitOff5: <<
Package: %N-linguist
Depends: %N-gui-shlibs (= %v-%r), x11
Replaces: %N (<< %v-1)
Files: <<
bin/l*
share/applnk/Development/linguist4.desktop
lib/%N/bin/l*
lib/%N/phrasebooks
lib/%N/translations/linguist_*
<<
<<
SplitOff6: <<
Package: %N-doc
Files: share/doc/%N
<<
DescPackaging: <<
This package is dedicated to Boo Fulbright.
<<
DescUsage: <<
To compile against this package, you need to make sure that
%p/lib/%N/bin is first in your PATH. $QTDIR is no longer necessary;
instead, qmake contains the information necessary to find your Qt
environment, and when you generate a project using qmake it knows
what to do.
If you need to manually find this package for whatever reason, you
need -I%p/lib/%N/include in your compiler flags, and
-L%p/lib/%N/lib in your linker flags. In this case, it's still a
good idea to set your PATH to %p/lib/%N/bin as well.
To build the demos and examples, it's enough to just run qmake on
the .pro file in the %p/share/doc/%N directory in the %N-doc
package:
mkdir /tmp/build-examples
cd /tmp/build-examples
%p/lib/%N/bin/qmake %p/share/doc/%N/examples/examples.pro
make
<<
DocFiles: GPL* LICENSE.* OPENSOURCE-NOTICE.TXT README*
License: GPL
Maintainer: Benjamin Reed
Homepage: http://www.trolltech.com/
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/3dnow/3dnow.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = 3dnow.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/clock-gettime/clock-gettime.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = clock-gettime.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/clock-monotonic/clock-monotonic.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = clock-monotonic.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/cups/cups.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = cups.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/db2/db2.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = db2.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/dbus/dbus.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = dbus.cpp
-CONFIG -= qt
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/doubleformat/doubleformattest.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = doubleformattest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/endian/endiantest.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = endiantest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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 2008-06-26 20:46:07.000000000 -0400
+++ qt-copy.new/config.tests/unix/floatmath/floatmath.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = floatmath.cpp
-CONFIG -= x11 qt
-
+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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/freetype/freetype.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,5 +1,5 @@
SOURCES = freetype.cpp
CONFIG += x11
-CONFIG -= qt
+CONFIG -= qt app_bundle
LIBS += -lfreetype
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-08-26 11:52:17.000000000 -0400
+++ qt-copy.new/config.tests/unix/getaddrinfo/getaddrinfo.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = getaddrinfotest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/getifaddrs/getifaddrs.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,5 +1,4 @@
SOURCES = getifaddrs.cpp
-CONFIG -= qt
-mac:CONFIG -= app_bundle
+CONFIG -= qt app_bundle
QT =
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/glib/glib.pro 2008-08-26 12:02:25.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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/gnu-libiconv/gnu-libiconv.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = gnu-libiconv.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/gstreamer/gstreamer.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,3 @@
SOURCES = gstreamer.cpp
-CONFIG -= qt
+CONFIG -= qt app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/ibase/ibase.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = ibase.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lgds
diff -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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/iconv/iconv.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,4 @@
SOURCES = iconv.cpp
CONFIG -= qt dylib app_bundle
mac:LIBS += -liconv
+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 2008-06-26 20:46:07.000000000 -0400
+++ qt-copy.new/config.tests/unix/inotify/inotify.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = inotifytest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/ipv6/ipv6.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = ipv6test.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/ipv6ifname/ipv6ifname.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,5 +1,4 @@
SOURCES = ipv6ifname.cpp
-CONFIG -= qt
-mac:CONFIG -= app_bundle
+CONFIG -= qt app_bundle
QT =
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/largefile/largefile.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES=largefiletest.cpp
-CONFIG-=qt dylib
-mac:CONFIG -= app_bundle
+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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/libjpeg/libjpeg.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = libjpeg.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/libmng/libmng.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = libmng.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/libpng/libpng.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = libpng.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:07.000000000 -0400
+++ qt-copy.new/config.tests/unix/libtiff/libtiff.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = libtiff.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/mmx/mmx.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = mmx.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/mremap/mremap.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = mremap.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/mysql/mysql.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = mysql.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/mysql_r/mysql_r.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = ../mysql/mysql.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/nis/nis.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,5 +1,4 @@
SOURCES = nis.cpp
-CONFIG -= qt dylib
-mac: CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
solaris-*:LIBS += -lnsl
else:LIBS += $$QMAKE_LIBS_NIS
diff -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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/oci/oci.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = oci.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/odbc/odbc.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = odbc.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/openssl/openssl.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = openssl.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+CONFIG -= x11 qt app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/psql/psql.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = psql.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/ptrsize/ptrsizetest.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = ptrsizetest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/sqlite/sqlite.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = sqlite.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
LIBS += -lsqlite3
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/sqlite2/sqlite2.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = sqlite2.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/sse/sse.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = sse.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+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-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/sse2/sse2.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = sse2.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/stl/stl.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = stltest.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/tds/tds.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = tds.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/tslib/tslib.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,3 +1,3 @@
SOURCES = tslib.cpp
-CONFIG -= qt
+CONFIG -= qt app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/unix/zlib/zlib.pro 2008-08-26 12:02:25.000000000 -0400
@@ -1,4 +1,3 @@
SOURCES = zlib.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
+CONFIG -= qt dylib app_bundle
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 2008-06-26 20:46:08.000000000 -0400
+++ qt-copy.new/config.tests/x11/opengl/opengl.pro 2008-08-26 12:02:25.000000000 -0400
@@ -7,4 +7,4 @@
}
CONFIG -= qt
-LIBS += -lGL -lGLU
+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 2008-08-26 11:52:17.000000000 -0400
+++ qt-copy.new/configure 2008-08-26 12:02:25.000000000 -0400
@@ -104,6 +104,7 @@
#-------------------------------------------------------------------------------
PLATFORM_X11=no
+PLATFORM_DARWIN=no
PLATFORM_MAC=no
PLATFORM_QWS=no
@@ -1052,6 +1053,7 @@
x11)
if [ "$PLATFORM_MAC" = "yes" ]; then
PLATFORM_MAC=no
+ PLATFORM_DARWIN=yes
elif [ "$PLATFORM_QWS" = "yes" ]; then
PLATFORM_QWS=no
fi
@@ -3953,6 +3955,9 @@
EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)"
fi
fi
+ if [ "$PLATFORM_X11" = "yes" ] && [ "$PLATFORM_DARWIN" = "yes" ]; then
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -D__USE_WS_X11__"
+ fi
[ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS"
if [ '!' -z "$D_FLAGS" ]; then
for DEF in $D_FLAGS; do
@@ -4711,7 +4716,7 @@
fi
if [ "$CFG_PHONON" != "no" ]; then
- if [ "$CFG_GSTREAMER" = "yes" ]; then
+ if [ "$CFG_GSTREAMER" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
CFG_PHONON=yes
else
if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
@@ -4727,7 +4732,7 @@
fi
fi # X11/QWS
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
if [ "$CFG_PHONON" != "no" ]; then
# Always enable Phonon (unless it was explicitly disabled)
CFG_PHONON=yes
@@ -4814,7 +4819,7 @@
fi
if [ "$CFG_ENDIAN" = "auto" ]; then
- if [ "$PLATFORM_MAC" = "yes" ]; then
+ if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
true #leave as auto
else
"$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
@@ -4835,7 +4840,7 @@
fi
if [ "$CFG_HOST_ENDIAN" = "auto" ]; then
- if [ "$PLATFORM_MAC" = "yes" ]; then
+ if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
true #leave as auto
else
"$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"
@@ -5286,7 +5291,7 @@
QT_CONFIG="$QT_CONFIG freetype"
fi
-if [ "x$PLATFORM_MAC" = "xyes" ]; then
+if [ "x$PLATFORM_MAC" = "xyes" ] || [ "x$PLATFORM_DARWIN" = "xyes" ]; then
#On Mac we implicitly link against libz, so we
#never use the 3rdparty stuff.
[ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
@@ -5363,7 +5368,7 @@
[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
if [ "$CFG_RPATH" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
fi
@@ -5782,7 +5787,7 @@
echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new"
fi
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_DARWIN" = "yes" ]; then
cat >>"$outpath/src/corelib/global/qconfig.h.new" <
# 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 2008-08-26 12:02:25.000000000 -0400
@@ -0,0 +1,56 @@
+#!/bin/sh -e
+
+MYDIR=`dirname $0`
+TOPDIR=`cd $MYDIR; pwd`
+
+FINKPREFIX="$1"; shift
+PKGNAME="$1"; shift
+
+if [ -z "$FINKPREFIX" ] || [ -z "$PKGNAME" ]; then
+ echo "usage: $0
+ exit 1
+fi
+
+QTDIR=`pwd`
+PATH="$QTDIR/bin:$FINKPREFIX/lib/freetype219/bin:$PATH"
+
+EXTRA_ARGS=""
+
+[ -z "$CC" ] && CC=gcc-4.0
+[ -z "$CXX" ] && CXX=g++-4.0
+
+if [ "$PKGNAME" = "qt4-x11" ]; then
+ EXTRA_ARGS="-x11 -platform darwin-g++ -xplatform darwin-g++"
+else
+ EXTRA_ARGS="-platform macx-g++ -xplatform macx-g++"
+fi
+
+
+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++/*
+
+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" \
+ -prefix "$FINKPREFIX/lib/$PKGNAME" -docdir "$FINKPREFIX/share/doc/$PKGNAME" \
+ -exceptions -qt-gif -system-freetype -no-phonon \
+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
+ -plugin-sql-sqlite -dbus-linked $EXTRA_ARGS "$@"
+
+# don't link against older versions of self
+/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e "s,-L$FINKPREFIX/lib/$PKGNAME/lib,,g"
+
+# 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 2008-08-26 11:52:16.000000000 -0400
+++ qt-copy.new/mkspecs/common/mac.conf 2008-08-26 12:02:25.000000000 -0400
@@ -17,7 +17,7 @@
QMAKE_RPATH =
QMAKE_LIBS_DYNLOAD =
-QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
+QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL
QMAKE_LIBS_THREAD =
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-06-26 20:46:01.000000000 -0400
+++ qt-copy.new/mkspecs/darwin-g++/qmake.conf 2008-08-26 12:02:25.000000000 -0400
@@ -6,7 +6,7 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
-CONFIG += qt warn_on release link_prl native_precompiled_headers
+CONFIG += qt warn_on release lib_version_first link_prl native_precompiled_headers
QT += core gui
DEFINES += __USE_WS_X11__
@@ -69,12 +69,13 @@
QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
QMAKE_RPATH =
+QMAKE_FIX_RPATH = install_name_tool -id
QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
-QMAKE_LIBS_OPENGL = -lGLU -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
+QMAKE_LIBS_OPENGL = -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+QMAKE_LIBS_OPENGL_QT = -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
QMAKE_LIBS_THREAD =
QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
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 2008-06-26 20:39:40.000000000 -0400
+++ qt-copy.new/qmake/generators/mac/pbuilder_pbx.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -54,7 +54,7 @@
# include
# include
#endif
-#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MAC
#include
#include
#endif
@@ -1689,7 +1689,7 @@
} else {
QString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST");
if(version_plist.isEmpty()) {
-#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MAC
ret = QLatin1String("34");
QCFType
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 2008-06-26 20:39:42.000000000 -0400
+++ qt-copy.new/qmake/main.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -61,8 +61,6 @@
// for Borland, main is defined to qMain which breaks qmake
#undef main
-#ifdef Q_OS_MAC
-#endif
/* This is to work around lame implementation on Darwin. It has been noted that the getpwd(3) function
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/JavaScriptCore/kjs/collector.cpp qt-copy.new/src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
--- qt-copy/src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp 2008-08-26 11:51:00.000000000 -0400
+++ qt-copy.new/src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -38,6 +38,8 @@
#if PLATFORM(DARWIN)
+#include
+#include
#include
#include
#include
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 2008-08-26 11:51:01.000000000 -0400
+++ qt-copy.new/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -2080,7 +2080,7 @@
"AIX"
#elif defined Q_OS_WIN32
"%2"
-#elif defined Q_OS_DARWIN
+#elif defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
#ifdef __i386__ || __x86_64__
"Intel Mac OS X"
#else
diff -Nurd qt-copy/src/corelib/codecs/qiconvcodec.cpp qt-copy.new/src/corelib/codecs/qiconvcodec.cpp
--- qt-copy/src/corelib/codecs/qiconvcodec.cpp 2008-08-26 11:50:44.000000000 -0400
+++ qt-copy.new/src/corelib/codecs/qiconvcodec.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -62,7 +62,7 @@
#elif defined(Q_OS_AIX)
# define NO_BOM
# define UTF16 "UCS-2"
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# define NO_BOM
# if Q_BYTE_ORDER == Q_BIG_ENDIAN
# 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 2008-06-26 20:33:49.000000000 -0400
+++ qt-copy.new/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -43,7 +43,7 @@
#include "qtconcurrentiteratekernel.h"
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
#include
#include
@@ -70,7 +70,7 @@
MedianSize = 7
};
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN) | defined(Q_OS_MAC)
static qint64 getticks()
{
diff -Nurd qt-copy/src/corelib/corelib.pro qt-copy.new/src/corelib/corelib.pro
--- qt-copy/src/corelib/corelib.pro 2008-06-26 20:33:55.000000000 -0400
+++ qt-copy.new/src/corelib/corelib.pro 2008-08-26 12:02:25.000000000 -0400
@@ -16,7 +16,7 @@
include(codecs/codecs.pri)
include(xml/xml.pri)
-mac|darwin:LIBS += -framework ApplicationServices
+mac:LIBS += -framework ApplicationServices
mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
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 2008-08-26 11:50:45.000000000 -0400
+++ qt-copy.new/src/corelib/global/qglobal.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -1204,7 +1204,7 @@
\macro Q_OS_DARWIN
\relates
- Defined on Darwin OS (synonym for Q_OS_MAC).
+ Defined on Darwin OS.
*/
/*!
diff -Nurd qt-copy/src/corelib/global/qglobal.h qt-copy.new/src/corelib/global/qglobal.h
--- qt-copy/src/corelib/global/qglobal.h 2008-08-26 11:50:45.000000000 -0400
+++ qt-copy.new/src/corelib/global/qglobal.h 2008-08-26 12:02:25.000000000 -0400
@@ -125,7 +125,7 @@
#endif /* __cplusplus */
-#if defined(Q_OS_MAC) && !defined(Q_CC_INTEL)
+#if ( defined(Q_OS_DARWIN) || defined(Q_OS_MAC) ) && !defined(Q_CC_INTEL)
#define QT_BEGIN_HEADER extern "C++" {
#define QT_END_HEADER }
#define QT_BEGIN_INCLUDE_HEADER }
@@ -140,7 +140,7 @@
/*
The operating system, must be one of: (Q_OS_x)
- DARWIN - Darwin OS (synonym for Q_OS_MAC)
+ DARWIN - Darwin OS (pure Darwin or Mac OS X using X11)
MSDOS - MS-DOS and Windows
OS2 - OS/2
OS2EMX - XFree86 on OS/2 (not PM)
@@ -257,12 +257,15 @@
# define Q_OS_WIN
#endif
-#if defined(Q_OS_DARWIN)
+#if defined(Q_OS_DARWIN) && !defined(__USE_WS_X11__)
+# undef Q_OS_DARWIN
# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
# if defined(Q_OS_DARWIN64)
+# undef Q_OS_DARWIN64
# define Q_OS_MAC64
# elif defined(Q_OS_DARWIN32)
+# undef Q_OS_DARWIN32
# define Q_OS_MAC32
# endif
#endif
@@ -273,11 +276,11 @@
# define Q_OS_UNIX
#endif
-#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
+#if ( defined(Q_OS_DARWIN) || defined(Q_OS_MAC) ) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
-#ifdef Q_OS_DARWIN
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# ifdef MAC_OS_X_VERSION_MIN_REQUIRED
# undef MAC_OS_X_VERSION_MIN_REQUIRED
# endif
@@ -434,7 +437,7 @@
# define Q_WRONG_SB_CTYPE_MACROS
# endif
/* Apple's GCC 3.1 chokes on our streaming qDebug() */
-# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
+# if ( defined(Q_OS_DARWIN) || defined(Q_OS_MAC) ) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM
# endif
# if (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) && !defined(QT_MOC_CPP)
@@ -704,7 +707,7 @@
# define Q_WS_PM
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
-# if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
+# if defined(Q_OS_MAC) && !defined(Q_WS_QWS)
# define Q_WS_MAC
# define Q_WS_MACX
# if defined(Q_OS_MAC64)
@@ -1263,7 +1266,7 @@
static WinVersion windowsVersion();
#endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
enum MacVersion {
MV_Unknown = 0x0000,
@@ -1839,7 +1842,7 @@
Q_DECLARE_TYPEINFO(quint64, Q_PRIMITIVE_TYPE);
Q_DECLARE_TYPEINFO(float, Q_PRIMITIVE_TYPE);
Q_DECLARE_TYPEINFO(double, Q_PRIMITIVE_TYPE);
-#ifndef Q_OS_DARWIN
+#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC)
Q_DECLARE_TYPEINFO(long double, Q_PRIMITIVE_TYPE);
#endif
diff -Nurd qt-copy/src/corelib/io/qfile.cpp qt-copy.new/src/corelib/io/qfile.cpp
--- qt-copy/src/corelib/io/qfile.cpp 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/io/qfile.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -64,7 +64,7 @@
static QByteArray locale_encode(const QString &f)
{
-#ifndef Q_OS_DARWIN
+#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC)
return f.toLocal8Bit();
#else
// Mac always expects UTF-8... and decomposed...
@@ -74,7 +74,7 @@
static QString locale_decode(const QByteArray &f)
{
-#ifndef Q_OS_DARWIN
+#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC)
return QString::fromLocal8Bit(f);
#else
// 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 2008-06-26 20:33:52.000000000 -0400
+++ qt-copy.new/src/corelib/io/qfilesystemwatcher.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -59,7 +59,7 @@
#elif defined(Q_OS_LINUX)
# include "qfilesystemwatcher_inotify_p.h"
# include "qfilesystemwatcher_dnotify_p.h"
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# include "qfilesystemwatcher_kqueue_p.h"
#endif
@@ -240,7 +240,7 @@
if(!eng)
eng = QDnotifyFileSystemWatcherEngine::create();
return eng;
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
return QKqueueFileSystemWatcherEngine::create();
#else
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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/io/qfsfileengine_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -387,7 +387,7 @@
}
return true;
}
-#if defined(Q_OS_DARWIN) // Mac X doesn't support trailing /'s
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC) // Mac X doesn't support trailing /'s
if (dirName[dirName.length() - 1] == QLatin1Char('/'))
dirName = dirName.left(dirName.length() - 1);
#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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/io/qprocess.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -1752,7 +1752,7 @@
}
QT_BEGIN_INCLUDE_NAMESPACE
-#ifdef Q_OS_MAC
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# include
# define environ (*_NSGetEnviron())
#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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/io/qprocess_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -538,7 +538,7 @@
// if LD_LIBRARY_PATH exists in the current environment, but
// not in the environment list passed by the programmer, then
// copy it over.
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
static const char libraryPath[] = "DYLD_LIBRARY_PATH";
#else
static const char libraryPath[] = "LD_LIBRARY_PATH";
@@ -653,7 +653,7 @@
// Add every argument to the list
for (int i = 0; i < arguments.count(); ++i) {
QString arg = arguments.at(i);
-#ifdef Q_OS_MAC
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
// Mac OS X uses UTF8 for exec, regardless of the system locale.
argv[i + 1] = ::strdup(arg.toUtf8().constData());
#else
@@ -1285,7 +1285,7 @@
char **argv = new char *[arguments.size() + 2];
for (int i = 0; i < arguments.size(); ++i) {
-#ifdef Q_OS_MAC
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
argv[i + 1] = ::strdup(arguments.at(i).toUtf8().constData());
#else
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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/plugin/qlibrary.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -518,7 +518,7 @@
if (completeSuffix.isEmpty())
return false;
QStringList suffixes = completeSuffix.split(QLatin1Char('.'));
-# if defined(Q_OS_DARWIN)
+# if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
// On Mac, libs look like libmylib.1.0.0.dylib
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 2008-06-26 20:33:55.000000000 -0400
+++ qt-copy.new/src/corelib/plugin/qlibrary_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -159,7 +159,7 @@
suffixes << QLatin1String(".so");
}
#endif
-# ifdef Q_OS_MAC
+# if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
if (!fullVersion.isEmpty()) {
suffixes << QString::fromLatin1(".%1.bundle").arg(fullVersion);
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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/thread/qthread.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -65,7 +65,7 @@
/*
# elif defined(Q_OS_HPUX)
# include
-# elif defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_MAC)
+# elif defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# include
# endif
#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 2008-08-26 11:50:47.000000000 -0400
+++ qt-copy.new/src/corelib/thread/qthread_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -349,7 +349,7 @@
d->priority = priority;
-#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC) || ( !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) )
switch (priority) {
case InheritPriority:
{
@@ -506,7 +506,7 @@
// copied from start() with a few modifications:
-#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC) || ( !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) )
int sched_policy;
sched_param param;
diff -Nurd qt-copy/src/corelib/tools/qdumper.cpp qt-copy.new/src/corelib/tools/qdumper.cpp
--- qt-copy/src/corelib/tools/qdumper.cpp 2008-06-26 20:33:48.000000000 -0400
+++ qt-copy.new/src/corelib/tools/qdumper.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -483,7 +483,7 @@
S(d, "completeBaseName", info.completeBaseName());
S(d, "completeSuffix", info.completeSuffix());
S(d, "baseName", info.baseName());
-#ifdef Q_OS_MACX
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
BL(d, "isBundle", info.isBundle());
S(d, "bundleName", info.bundleName());
#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 2008-06-26 20:33:49.000000000 -0400
+++ qt-copy.new/src/corelib/xml/qxmlstream.h 2008-08-26 12:02:25.000000000 -0400
@@ -85,7 +85,7 @@
// We are taking the optimist scenario here to avoid creating more
// symbols to be supported.
-#if defined(Q_OS_MAC) || defined(Q_OS_AIX)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC) || defined(Q_OS_AIX)
# if !defined QT_BUILD_XML_LIB
# define Q_XMLSTREAM_RENAME_SYMBOLS
# endif
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 2008-08-26 11:50:56.000000000 -0400
+++ qt-copy.new/src/network/kernel/qhostinfo_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -117,7 +117,7 @@
if (address.setAddress(hostName)) {
// Reverse lookup
// Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead.
-#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN)
+#if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) && !defined (Q_OS_MAC)
sockaddr_in sa4;
#ifndef QT_NO_IPV6
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 2008-08-26 11:50:56.000000000 -0400
+++ qt-copy.new/src/network/ssl/qsslsocket_openssl_symbols.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -300,7 +300,7 @@
static QStringList findAllLibSsl()
{
QStringList paths;
-# ifdef Q_OS_DARWIN
+# if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
paths = QString::fromLatin1(qgetenv("DYLD_LIBRARY_PATH"))
.split(QLatin1Char(':'), QString::SkipEmptyParts);
# 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 2008-08-26 11:50:57.000000000 -0400
+++ qt-copy.new/src/qt3support/other/q3process_unix.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -791,7 +791,7 @@
} else { // start process with environment settins as specified in env
// construct the environment for exec
int numEntries = env->count();
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
QString ld_library_path(QLatin1String("DYLD_LIBRARY_PATH"));
#else
QString ld_library_path(QLatin1String("LD_LIBRARY_PATH"));
diff -Nurd qt-copy/src/qt3support/qt3support.pro qt-copy.new/src/qt3support/qt3support.pro
--- qt-copy/src/qt3support/qt3support.pro 2008-06-26 20:35:32.000000000 -0400
+++ qt-copy.new/src/qt3support/qt3support.pro 2008-08-26 12:02:25.000000000 -0400
@@ -22,6 +22,7 @@
include(painting/painting.pri)
mac:LIBS += -framework Carbon
+darwin-*:LIBS += -lresolv
QMAKE_LIBS += $$QMAKE_LIBS_COMPAT $$QMAKE_LIBS_NETWORK
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 2008-08-26 11:51:00.000000000 -0400
+++ qt-copy.new/src/script/qscriptengine_p.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -1591,7 +1591,7 @@
m_callDepth = 0;
#if defined(Q_OS_WIN)
m_maxCallDepth = 88;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
m_maxCallDepth = 640;
#elif defined(QT_ARCH_ARM)
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 2008-06-26 20:40:57.000000000 -0400
+++ qt-copy.new/tools/assistant/lib/fulltextsearch/qclucene-config_p.h 2008-08-26 12:02:25.000000000 -0400
@@ -347,7 +347,7 @@
#endif
#if !defined(__SUNPRO_CC) && !defined(__SUNPRO_C) && !defined(__MINGW32__) && \
- !defined(Q_OS_MAC) && !defined(__HP_aCC)
+ !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC) && !defined(__HP_aCC)
/* Define to 1 if you have the `wcscasecmp' function. */
# ifndef _CL_HAVE_WCSCASECMP
# define _CL_HAVE_WCSCASECMP 1
diff -Nurd qt-copy/tools/qvfb/qlock.cpp qt-copy.new/tools/qvfb/qlock.cpp
--- qt-copy/tools/qvfb/qlock.cpp 2008-06-26 20:40:08.000000000 -0400
+++ qt-copy.new/tools/qvfb/qlock.cpp 2008-08-26 12:02:25.000000000 -0400
@@ -48,11 +48,11 @@
#include "qwssignalhandler_p.h"
#include
#include
-#if defined(Q_OS_DARWIN)
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
# define Q_NO_SEMAPHORE
# include
# include
-#else // Q_OS_DARWIN
+#else // Q_OS_DARWIN || Q_OS_MAC
# include
# if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) && !defined(QT_LSB)) \
|| defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) \
@@ -66,7 +66,7 @@
unsigned short *array; /* array for GETALL, SETALL */
};
# endif
-#endif // Q_OS_DARWIN
+#endif // Q_OS_DARWIN || Q_OS_MAC
#include
#include
#include