[23495] trunk/dports/x11/qt3
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 2 20:09:37 PDT 2007
Revision: 23495
http://trac.macosforge.org/projects/macports/changeset/23495
Author: takanori at macports.org
Date: 2007-04-02 20:09:36 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Version bump to qt3 3.3.8.
Drop maintainership.
Modified Paths:
--------------
trunk/dports/x11/qt3/Portfile
trunk/dports/x11/qt3/files/CompileScript.sh
trunk/dports/x11/qt3/files/InstallScript.sh
trunk/dports/x11/qt3/files/qt3-panther.patch
trunk/dports/x11/qt3/files/qt3-tiger.patch
Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile 2007-04-03 02:53:55 UTC (rev 23494)
+++ trunk/dports/x11/qt3/Portfile 2007-04-03 03:09:36 UTC (rev 23495)
@@ -1,12 +1,12 @@
# $Id$
-#Synced with Fink, Version 3.3.6-1023
+#Synced with Fink, Version 3.3.8-1021
PortSystem 1.0
name qt3
-version 3.3.7
+version 3.3.8
categories x11
-maintainers takanori at macports.org
+maintainers nomaintainer at macports.org
description Qt Tool Kit
long_description Qt 3 is a multiplatform C++ application development framework.
homepage http://www.trolltech.com/products/qt/index.html
@@ -16,7 +16,7 @@
http://ranger.befunk.com/fink/:fink
distname qt-x11-free-${version}
distfiles ${distname}.tar.bz2:qt3 \
- qt-upstream-patches-0003.tar.bz2:fink
+ qt-upstream-patches-0004.tar.bz2:fink
use_bzip2 yes
depends_lib lib:libGL.1:XFree86 \
@@ -28,8 +28,8 @@
port:xrender \
port:zlib
-checksums ${distname}.tar.bz2 md5 655e21cf6a7e66daf8ec6ceda81aae1e \
- qt-upstream-patches-0003.tar.bz2 md5 cfe0cc6a7a8411bce151ebfaaa7e03e7
+checksums ${distname}.tar.bz2 md5 cf3c43a7dfde5bfb76f8001102fe6e85 \
+ qt-upstream-patches-0004.tar.bz2 md5 1f27d5222813a0a29fe53fd8669e2239
patchfiles qt3-tiger.patch dp01.patch
patch {
@@ -67,7 +67,9 @@
patches/0059-qpopup_has_mouse.patch \
patches/0060-qpopup_ignore_mousepos.patch \
patches/0061-qscrollview-propagate-horizontal-wheelevent.patch \
- patches/0069-fix-minsize.patch } {
+ patches/0073-xinerama-aware-qpopup.patch \
+ patches/0076-fix-qprocess.diff \
+ patches/0077-utf8-decoder-fixes.diff } {
system "cd ${worksrcpath} && patch -p0 --fuzz=4 < ${workpath}/${p}"
}
}
@@ -87,7 +89,7 @@
}
}
-configure.args -fast -buildkey qt3-jaguar \
+configure.args -buildkey qt3-jaguar \
-platform darwin-g++ -xplatform darwin-g++ \
-prefix '${prefix}/lib/qt3' -docdir '${prefix}/share/doc/qt3' \
-headerdir '${prefix}/include/qt3' -libdir '${prefix}/lib' \
Modified: trunk/dports/x11/qt3/files/CompileScript.sh
===================================================================
--- trunk/dports/x11/qt3/files/CompileScript.sh 2007-04-03 02:53:55 UTC (rev 23494)
+++ trunk/dports/x11/qt3/files/CompileScript.sh 2007-04-03 03:09:36 UTC (rev 23495)
@@ -8,7 +8,7 @@
# DOREMOVE=1
# fi
# done
-#darwinports
+#macports
#
#fink
@@ -16,7 +16,7 @@
# echo "WARNING: found suspicious file or directory \"$file\" -- moving to \"${file}.bad\""
# /bin/mv "/lib/${file}" "/lib/${file}.bad"
# done
-#darwinports
+#macports
for file in `ls -1 /lib/ 2>/dev/null | grep -E '(qt-mt|qt3)' | grep -v '.bad$'`; do
echo "WARNING: found suspicious file or directory \"$file\" -- please remove it first.\""
exit 1
@@ -41,7 +41,7 @@
# cat /tmp/dpkg.output
# fi
# fi
-#darwinports
+#macports
#
#fink
@@ -50,7 +50,7 @@
# export DYLD_LIBRARY_PATH="$QTDIR/lib:$QTDIR/plugins/designer:$QTDIR/plugins/imageformats"
# export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
# export INSTALL_ROOT=""
-#darwinports
+#macports
unset QMAKESPEC
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:$QTDIR/plugins/designer:$QTDIR/plugins/imageformats"
@@ -75,7 +75,7 @@
# '-I%p/lib/freetype219/include' '-I%p/lib/freetype219/include/freetype2' '-L%p/lib/freetype219/lib' \
# '-I%p/include' '-L%p/lib' \
# '-I/usr/X11R6/include' '-L/usr/X11R6/lib' \
-# $LIBRESOLV -fast -buildkey qt3-jaguar \
+# $LIBRESOLV -buildkey qt3-jaguar \
# -platform darwin-g++ -xplatform darwin-g++ \
# -prefix '%p/lib/qt3' -docdir '%p/share/doc/%n' \
# -headerdir '%p/include/qt' -libdir '%p/lib' \
@@ -84,7 +84,7 @@
# -system-libpng -system-libjpeg -system-zlib -largefile \
# -sm -xinerama -xrender -xft -xkb \
# -plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql
-#darwinports
+#macports
echo "yes" | ./configure \
'-I$(QTDIR)/include' '-L$(QTDIR)/lib' \
'-I%p/include' '-L%p/lib' \
Modified: trunk/dports/x11/qt3/files/InstallScript.sh
===================================================================
--- trunk/dports/x11/qt3/files/InstallScript.sh 2007-04-03 02:53:55 UTC (rev 23494)
+++ trunk/dports/x11/qt3/files/InstallScript.sh 2007-04-03 03:09:36 UTC (rev 23495)
@@ -15,48 +15,44 @@
# %p/bin
install -d -m 0755 %i/bin
- for file in `cd %i/lib/qt3/bin; ls`; do
- ln -sf %p/lib/qt3/bin/$file %i/bin/$file
+ for file in `cd %i/lib/%N/bin; ls`; do
+ ln -sf %p/lib/%N/bin/$file %i/bin/$file
done
#fink
# # %p/include/qt
# install -d -m 0755 %i/include
-# ln -sf %p/include/qt %i/lib/qt3/include
-#darwinports
+# ln -sf %p/include/qt %i/lib/%N/include
+#macports
# %p/include/qt3
install -d -m 0755 %i/include
- ln -sf %p/include/qt3 %i/lib/qt3/include
+ ln -sf %p/include/qt3 %i/lib/%N/include
# %p/lib
- install -d -m 0755 %i/lib/qt3/lib
- mv %i/lib/*.* %i/lib/qt3/lib/
+ install -d -m 0755 %i/lib/%N/lib
+ mv %i/lib/*.* %i/lib/%N/lib/
- for file in `cd %i/lib/qt3/lib; ls`; do
- [ "$file" != "pkgconfig" ] && ln -sf %p/lib/qt3/lib/$file %i/lib/$file
+ for file in `cd %i/lib/%N/lib; ls`; do
+ [ "$file" != "pkgconfig" ] && ln -sf %N/lib/$file %i/lib/$file
done
-#fink
-# install -d -m 0755 %i/lib/pkgconfig
-# ln -sf %p/lib/qt3/lib/pkgconfig/qt-mt.pc %i/lib/pkgconfig/
-#darwinports
- perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/pkgconfig/qt-mt.pc
- install -d -m 0755 %i/lib/qt3/lib/pkgconfig
- ln -sf %p/lib/pkgconfig/qt-mt.pc %i/lib/qt3/lib/pkgconfig/
- # %p/lib/qt3/doc
- ln -sf %p/share/doc/%N %i/lib/qt3/doc
+ # clean up some bad data in the .la and .pc files
+ perl -pi -e "s,^libdir=.*,libdir='%p/lib/%N/lib',; s,-L..QTDIR./lib ,,; s,^includedir=.*,includedir='%p/lib/%N/include'," %i/lib/%N/lib/*.la %i/lib/pkgconfig/*.pc
+ # %p/lib/%N/doc
+ ln -sf ../../share/doc/%N %i/lib/%N/doc
+
+ # mkspecs bad symlink
+ rm -rf %i/lib/%N/mkspecs/default
+ ln -sf darwin-g++ %i/lib/%N/mkspecs/default
+
#### CLEAN UP FILES ####
# fix the -L$(QTDIR) junk in the .la file
- perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/qt3/lib/*.la
+ perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/%N/lib/*.la
# remove the .prl files, we don't want them
-#fink
-# rm -rf %i/lib/qt3/lib/*.prl
-#darwinports
- rm -rf %i/lib/qt3/lib/*.prl
- rm -rf %i/lib/*.prl
+ rm -rf %i/lib{,/%N/lib}/*.prl
#### MAN PAGES ####
@@ -113,4 +109,3 @@
install -d -m 755 %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
- touch %i/share/doc/installed-packages/%N-dev
Modified: trunk/dports/x11/qt3/files/qt3-panther.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-panther.patch 2007-04-03 02:53:55 UTC (rev 23494)
+++ trunk/dports/x11/qt3/files/qt3-panther.patch 2007-04-03 03:09:36 UTC (rev 23495)
@@ -1,5 +1,6 @@
---- qt-x11-free-3.3.6/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.6-new/Makefile 2006-03-19 19:02:19.000000000 -0500
+
+--- qt-x11-free-3.3.7/Makefile 2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.7-new/Makefile 2006-12-11 14:27:23.000000000 -0500
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -9,8 +10,8 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500
-+++ qt-x11-free-3.3.6-new/configure 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/configure 2006-03-08 07:11:24.000000000 -0500
++++ qt-x11-free-3.3.7-new/configure 2006-12-11 14:29:31.000000000 -0500
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -20,6 +21,18 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+@@ -554,9 +554,9 @@
+ QMAKE_PROJECTS="$QMAKE_PROJECTS $relpath/$VAL"
+ else
+ if [ -d $relpath/$VAL ]; then
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
+ else
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
+ fi
+ fi
+ ;;
@@ -1051,8 +1051,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
@@ -40,11 +53,20 @@
;;
*)
;;
---- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/include/qglobal.h 2006-03-19 19:02:19.000000000 -0500
+@@ -3509,7 +3509,7 @@
+
+ echo "Finding project files. Please wait..."
+ if [ -z "$QMAKE_PROJECTS" ]; then
+- QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'`
++ QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/ | sed 's-/\./-/-'`
+ else
+ QT_PROJECTS=
+ for a in `echo $QMAKE_PROJECTS`; do
+--- qt-x11-free-3.3.7/include/qglobal.h 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/include/qglobal.h 2006-12-11 14:27:23.000000000 -0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -73,8 +95,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf 2006-03-08 11:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-20 10:03:17.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qmake.conf 2006-10-19 10:26:15.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qmake.conf 2006-12-11 14:27:23.000000000 -0500
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -169,8 +191,8 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qplatformdefs.h 2006-12-11 14:27:23.000000000 -0500
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -186,8 +208,8 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.6/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.7-new/qmake/Makefile.unix 2006-12-11 14:27:23.000000000 -0500
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I at BUILD_PATH@/include/qmake -I at BUILD_PATH@/include -I at SOURCE_PATH@/include \
@@ -199,8 +221,8 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.6/qmake/main.cpp 2006-03-08 11:48:02.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/main.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/qmake/main.cpp 2006-10-19 10:25:42.000000000 -0400
++++ qt-x11-free-3.3.7-new/qmake/main.cpp 2006-12-11 14:27:23.000000000 -0500
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -210,8 +232,8 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
---- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp 2006-03-08 11:47:45.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/kernel/qprocess_unix.cpp 2006-10-19 10:25:12.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/kernel/qprocess_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -761,7 +761,7 @@
#endif
i++;
@@ -248,8 +270,8 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.6/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/moc/moc.pro 2006-12-11 14:27:24.000000000 -0500
@@ -48,6 +48,8 @@
unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp
@@ -259,8 +281,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/src/network/qdns.cpp 2006-03-08 11:47:43.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/network/qdns.cpp 2006-10-19 10:25:09.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/network/qdns.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -270,8 +292,8 @@
#endif
//#define QDNS_DEBUG
---- qt-x11-free-3.3.6/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/qt_professional.pri 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/qt_professional.pri 2006-12-11 14:27:24.000000000 -0500
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -280,8 +302,8 @@
INCLUDEPATH += $$QT_SOURCE_TREE/src/network
include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
DEFINES *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.6/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/qtmain.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/qtmain.pro 2006-12-11 14:27:24.000000000 -0500
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -290,8 +312,8 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
---- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qdir_unix.cpp 2006-10-19 10:25:02.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qdir_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -301,8 +323,8 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.6/src/tools/qglobal.cpp 2006-03-08 11:47:40.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.cpp 2006-10-19 10:25:04.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -312,11 +334,11 @@
#include "qt_mac.h"
---- qt-x11-free-3.3.6/src/tools/qglobal.h 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.h 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.h 2006-12-11 14:27:24.000000000 -0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -345,8 +367,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qgpluginmanager.cpp 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qgpluginmanager.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -356,8 +378,8 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
---- qt-x11-free-3.3.6/src/tools/qlibrary.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qlibrary.cpp 2006-10-19 10:25:00.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qlibrary.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -367,8 +389,8 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qmutex_unix.cpp 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qmutex_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -378,8 +400,19 @@
// POSIX 1003.1c-1995 - We love this OS
# define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
# if defined(QT_CHECK_RANGE)
---- qt-x11-free-3.3.6/src/tools/qstring.cpp 2006-03-08 11:47:39.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-10-19 10:25:00.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qsettings.cpp 2006-12-11 14:27:25.000000000 -0500
+@@ -981,7 +981,7 @@
+
+ if ( filename.isEmpty() ) {
+
+-#ifdef QT_CHECK_STATE
++#if 0 // this error is damn annoying
+ qWarning("QSettings::sync: filename is null/empty");
+ #endif // QT_CHECK_STATE
+
+--- qt-x11-free-3.3.7/src/tools/qstring.cpp 2006-10-19 10:25:03.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qstring.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -416,8 +449,8 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
---- qt-x11-free-3.3.6/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/tools/qt_tools.pri 2006-12-11 14:27:24.000000000 -0500
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -429,8 +462,8 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.6/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/assistant/assistant.pro 2006-12-11 14:27:24.000000000 -0500
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -440,8 +473,8 @@
target.path = $$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/app/app.pro 2006-12-11 14:27:24.000000000 -0500
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -452,8 +485,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/designer/designer.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -462,8 +495,8 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
---- qt-x11-free-3.3.6/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/editor/editor.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -471,8 +504,8 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- qt-x11-free-3.3.6/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/uic/uic.pro 2006-12-11 14:27:24.000000000 -0500
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -480,8 +513,8 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist/linguist.pro 2006-12-11 14:27:24.000000000 -0500
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -491,8 +524,8 @@
PROJECTNAME = Qt Linguist
---- qt-x11-free-3.3.6/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -502,8 +535,8 @@
lrelease \
lupdate \
qm2ts
---- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lrelease/lrelease.pro 2006-12-11 14:27:24.000000000 -0500
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -511,8 +544,8 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lupdate/lupdate.pro 2006-12-11 14:27:25.000000000 -0500
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -521,8 +554,8 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/qm2ts/qm2ts.pro 2006-12-11 14:27:25.000000000 -0500
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -530,8 +563,8 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/qtconfig/qtconfig.pro 2006-12-11 14:27:25.000000000 -0500
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
@@ -540,62 +573,3 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler !win32*
---- qt-x11-free-3.3.6/qmake/project.cpp 2006-03-08 11:48:02.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/project.cpp 2006-03-25 11:02:35.000000000 -0500
-@@ -95,6 +95,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- ret << (qInstallPathData() + concat);
- #endif
-+ ret << ("@PREFIX@/share/qt3" + concat);
-
- /* prefer $QTDIR if it is set */
- if (getenv("QTDIR"))
-@@ -936,6 +937,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- feature_roots << (qInstallPathData() + concat);
- #endif
-+ feature_roots << ("@PREFIX@/share/qt3" + concat);
- for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
- QString prf = (*it) + QDir::separator() + file;
- if(QFile::exists(prf)) {
---- qt-x11-free-3.3.6/src/kernel/qapplication.cpp 2006-03-08 11:47:50.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qapplication.cpp 2006-03-25 10:56:45.000000000 -0500
-@@ -1726,6 +1726,7 @@
- installPathPlugins.replace('\\', '/');
- #endif
- app_libpaths->append(installPathPlugins);
-+ app_libpaths->append("@PREFIX@/lib/qt3-plugins");
- }
-
- QString app_location;
---- qt-x11-free-3.3.6/tools/designer/designer/mainwindowactions.cpp 2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/mainwindowactions.cpp 2006-03-25 11:03:35.000000000 -0500
-@@ -1446,6 +1446,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- QFile f;
- for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
- if ( QFile::exists( (*it) + "/templates/" )) {
---- qt-x11-free-3.3.6/tools/designer/designer/newformimpl.cpp 2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/newformimpl.cpp 2006-03-25 11:03:56.000000000 -0500
-@@ -285,6 +285,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
- QString path = (*it) + "/templates";
- if ( QFile::exists( path )) {
---- qt-x11-free-3.3.6/src/tools/qsettings.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qsettings.cpp 2006-03-25 13:55:36.000000000 -0500
-@@ -981,7 +981,7 @@
-
- if ( filename.isEmpty() ) {
-
--#ifdef QT_CHECK_STATE
-+#if 0 // this error is damn annoying
- qWarning("QSettings::sync: filename is null/empty");
- #endif // QT_CHECK_STATE
-
Modified: trunk/dports/x11/qt3/files/qt3-tiger.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-tiger.patch 2007-04-03 02:53:55 UTC (rev 23494)
+++ trunk/dports/x11/qt3/files/qt3-tiger.patch 2007-04-03 03:09:36 UTC (rev 23495)
@@ -1,5 +1,6 @@
---- qt-x11-free-3.3.6/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.6-new/Makefile 2006-03-19 19:02:19.000000000 -0500
+
+--- qt-x11-free-3.3.7/Makefile 2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.7-new/Makefile 2006-12-11 14:27:23.000000000 -0500
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -9,8 +10,8 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500
-+++ qt-x11-free-3.3.6-new/configure 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/configure 2006-03-08 07:11:24.000000000 -0500
++++ qt-x11-free-3.3.7-new/configure 2006-12-11 14:29:31.000000000 -0500
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -20,6 +21,18 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+@@ -554,9 +554,9 @@
+ QMAKE_PROJECTS="$QMAKE_PROJECTS $relpath/$VAL"
+ else
+ if [ -d $relpath/$VAL ]; then
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
+ else
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
+ fi
+ fi
+ ;;
@@ -1051,8 +1051,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
@@ -40,11 +53,20 @@
;;
*)
;;
---- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/include/qglobal.h 2006-03-19 19:02:19.000000000 -0500
+@@ -3509,7 +3509,7 @@
+
+ echo "Finding project files. Please wait..."
+ if [ -z "$QMAKE_PROJECTS" ]; then
+- QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'`
++ QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/ | sed 's-/\./-/-'`
+ else
+ QT_PROJECTS=
+ for a in `echo $QMAKE_PROJECTS`; do
+--- qt-x11-free-3.3.7/include/qglobal.h 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/include/qglobal.h 2006-12-11 14:27:23.000000000 -0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -73,8 +95,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf 2006-03-08 11:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-20 10:03:17.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qmake.conf 2006-10-19 10:26:15.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qmake.conf 2006-12-11 14:27:23.000000000 -0500
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -169,8 +191,8 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qplatformdefs.h 2006-12-11 14:27:23.000000000 -0500
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -186,8 +208,8 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.6/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.7-new/qmake/Makefile.unix 2006-12-11 14:27:23.000000000 -0500
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I at BUILD_PATH@/include/qmake -I at BUILD_PATH@/include -I at SOURCE_PATH@/include \
@@ -199,8 +221,8 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.6/qmake/main.cpp 2006-03-08 11:48:02.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/main.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/qmake/main.cpp 2006-10-19 10:25:42.000000000 -0400
++++ qt-x11-free-3.3.7-new/qmake/main.cpp 2006-12-11 14:27:23.000000000 -0500
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -210,8 +232,8 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
---- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp 2006-03-08 11:47:45.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/kernel/qprocess_unix.cpp 2006-10-19 10:25:12.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/kernel/qprocess_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -761,7 +761,7 @@
#endif
i++;
@@ -248,8 +270,8 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.6/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/moc/moc.pro 2006-12-11 14:27:24.000000000 -0500
@@ -48,6 +48,8 @@
unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp
@@ -259,8 +281,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/src/network/qdns.cpp 2006-03-08 11:47:43.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/network/qdns.cpp 2006-10-19 10:25:09.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/network/qdns.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -270,8 +292,8 @@
#endif
//#define QDNS_DEBUG
---- qt-x11-free-3.3.6/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/qt_professional.pri 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/qt_professional.pri 2006-12-11 14:27:24.000000000 -0500
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -280,8 +302,8 @@
INCLUDEPATH += $$QT_SOURCE_TREE/src/network
include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
DEFINES *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.6/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/qtmain.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/qtmain.pro 2006-12-11 14:27:24.000000000 -0500
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -290,8 +312,8 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
---- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qdir_unix.cpp 2006-10-19 10:25:02.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qdir_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -301,8 +323,8 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.6/src/tools/qglobal.cpp 2006-03-08 11:47:40.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.cpp 2006-10-19 10:25:04.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -312,11 +334,11 @@
#include "qt_mac.h"
---- qt-x11-free-3.3.6/src/tools/qglobal.h 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.h 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.h 2006-12-11 14:27:24.000000000 -0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -345,8 +367,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp 2006-03-08 11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qgpluginmanager.cpp 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qgpluginmanager.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -356,8 +378,8 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
---- qt-x11-free-3.3.6/src/tools/qlibrary.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qlibrary.cpp 2006-10-19 10:25:00.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qlibrary.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -367,8 +389,8 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qmutex_unix.cpp 2006-10-19 10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qmutex_unix.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -378,8 +400,19 @@
// POSIX 1003.1c-1995 - We love this OS
# define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
# if defined(QT_CHECK_RANGE)
---- qt-x11-free-3.3.6/src/tools/qstring.cpp 2006-03-08 11:47:39.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-10-19 10:25:00.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qsettings.cpp 2006-12-11 14:27:25.000000000 -0500
+@@ -981,7 +981,7 @@
+
+ if ( filename.isEmpty() ) {
+
+-#ifdef QT_CHECK_STATE
++#if 0 // this error is damn annoying
+ qWarning("QSettings::sync: filename is null/empty");
+ #endif // QT_CHECK_STATE
+
+--- qt-x11-free-3.3.7/src/tools/qstring.cpp 2006-10-19 10:25:03.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qstring.cpp 2006-12-11 14:27:24.000000000 -0500
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -416,8 +449,8 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
---- qt-x11-free-3.3.6/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/tools/qt_tools.pri 2006-12-11 14:27:24.000000000 -0500
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -429,8 +462,8 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.6/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/assistant/assistant.pro 2006-12-11 14:27:24.000000000 -0500
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -440,8 +473,8 @@
target.path = $$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/app/app.pro 2006-12-11 14:27:24.000000000 -0500
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -452,8 +485,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/designer/designer.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -462,8 +495,8 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
---- qt-x11-free-3.3.6/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/editor/editor.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -471,8 +504,8 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- qt-x11-free-3.3.6/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/uic/uic.pro 2006-12-11 14:27:24.000000000 -0500
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -480,8 +513,8 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist/linguist.pro 2006-12-11 14:27:24.000000000 -0500
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -491,8 +524,8 @@
PROJECTNAME = Qt Linguist
---- qt-x11-free-3.3.6/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist.pro 2006-12-11 14:27:24.000000000 -0500
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -502,8 +535,8 @@
lrelease \
lupdate \
qm2ts
---- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lrelease/lrelease.pro 2006-12-11 14:27:24.000000000 -0500
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -511,8 +544,8 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lupdate/lupdate.pro 2006-12-11 14:27:25.000000000 -0500
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -521,8 +554,8 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/qm2ts/qm2ts.pro 2006-12-11 14:27:25.000000000 -0500
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -530,8 +563,8 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/qtconfig/qtconfig.pro 2006-12-11 14:27:25.000000000 -0500
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
@@ -540,62 +573,3 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler !win32*
---- qt-x11-free-3.3.6/qmake/project.cpp 2006-03-08 11:48:02.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/project.cpp 2006-03-25 11:02:35.000000000 -0500
-@@ -95,6 +95,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- ret << (qInstallPathData() + concat);
- #endif
-+ ret << ("@PREFIX@/share/qt3" + concat);
-
- /* prefer $QTDIR if it is set */
- if (getenv("QTDIR"))
-@@ -936,6 +937,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- feature_roots << (qInstallPathData() + concat);
- #endif
-+ feature_roots << ("@PREFIX@/share/qt3" + concat);
- for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) {
- QString prf = (*it) + QDir::separator() + file;
- if(QFile::exists(prf)) {
---- qt-x11-free-3.3.6/src/kernel/qapplication.cpp 2006-03-08 11:47:50.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qapplication.cpp 2006-03-25 10:56:45.000000000 -0500
-@@ -1726,6 +1726,7 @@
- installPathPlugins.replace('\\', '/');
- #endif
- app_libpaths->append(installPathPlugins);
-+ app_libpaths->append("@PREFIX@/lib/qt3-plugins");
- }
-
- QString app_location;
---- qt-x11-free-3.3.6/tools/designer/designer/mainwindowactions.cpp 2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/mainwindowactions.cpp 2006-03-25 11:03:35.000000000 -0500
-@@ -1446,6 +1446,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- QFile f;
- for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
- if ( QFile::exists( (*it) + "/templates/" )) {
---- qt-x11-free-3.3.6/tools/designer/designer/newformimpl.cpp 2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/newformimpl.cpp 2006-03-25 11:03:56.000000000 -0500
-@@ -285,6 +285,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- for ( QStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) {
- QString path = (*it) + "/templates";
- if ( QFile::exists( path )) {
---- qt-x11-free-3.3.6/src/tools/qsettings.cpp 2006-03-08 11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qsettings.cpp 2006-03-25 13:55:36.000000000 -0500
-@@ -981,7 +981,7 @@
-
- if ( filename.isEmpty() ) {
-
--#ifdef QT_CHECK_STATE
-+#if 0 // this error is damn annoying
- qWarning("QSettings::sync: filename is null/empty");
- #endif // QT_CHECK_STATE
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070402/2b668358/attachment.html
More information about the macports-changes
mailing list