[30053] trunk/dports/x11/qt3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 19 00:08:13 PDT 2007
Revision: 30053
http://trac.macosforge.org/projects/macports/changeset/30053
Author: takanori at macports.org
Date: 2007-10-19 00:08:12 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
* Synced with Fink, Version 3.3.8-1026.
Modified Paths:
--------------
trunk/dports/x11/qt3/Portfile
trunk/dports/x11/qt3/files/InstallScript.sh
trunk/dports/x11/qt3/files/qt3-panther.patch
trunk/dports/x11/qt3/files/qt3-tiger.patch
Removed Paths:
-------------
trunk/dports/x11/qt3/files/170529.diff
Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile 2007-10-19 06:49:45 UTC (rev 30052)
+++ trunk/dports/x11/qt3/Portfile 2007-10-19 07:08:12 UTC (rev 30053)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.3.8-1021
+#Synced with Fink, Version 3.3.8-1026
PortSystem 1.0
name qt3
version 3.3.8
-revision 1
+revision 2
categories x11
maintainers nomaintainer at macports.org
description Qt Tool Kit
@@ -73,8 +73,6 @@
patches/0077-utf8-decoder-fixes.diff } {
system "cd ${worksrcpath} && patch -p0 --fuzz=4 < ${workpath}/${p}"
}
- # See http://trolltech.com/company/newsroom/announcements/press.2007-07-27.7503755960 (CVE-2007-3388)
- system "cd ${worksrcpath} && patch -p4 < ${filespath}/170529.diff"
}
post-patch {
@@ -149,21 +147,21 @@
}
variant mysql {
- depends_lib-append lib:libmysqlclient.10:mysql
+ depends_lib-append port:mysql
configure.args-delete -no-sql-mysql
configure.args-append -qt-sql-mysql -L${prefix}/lib/mysql \
-I${prefix}/include/mysql -plugin-sql-mysql
}
variant odbc {
- depends_lib-append lib:libodbc.1:unixODBC
+ depends_lib-append port:unixODBC
configure.args-delete -no-sql-odbc
configure.args-append -qt-sql-odbc -L${prefix}/lib \
-I${prefix}/include -plugin-sql-odbc
}
variant psql {
- depends_lib-append lib:libpq.2:postgresql
+ depends_lib-append port:postgresql
configure.args-delete -no-sql-psql
configure.args-append -qt-sql-psql -plugin-sql-psql
}
Deleted: trunk/dports/x11/qt3/files/170529.diff
===================================================================
--- trunk/dports/x11/qt3/files/170529.diff 2007-10-19 06:49:45 UTC (rev 30052)
+++ trunk/dports/x11/qt3/files/170529.diff 2007-10-19 07:08:12 UTC (rev 30053)
@@ -1,189 +0,0 @@
---- //depot/qt/3/src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
-+++ //depot/qt/3/src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
-
-@@ -6349,7 +6349,7 @@
- cur = tag->prev;
- if ( !cur ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
- #endif
- return; // something is wrong - give up
- }
-@@ -6372,7 +6372,7 @@
- break;
- } else if ( !cur->leftTag ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
- #endif
- return; // something is amiss - give up
- }
---- //depot/qt/3/src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -1043,8 +1043,8 @@
- return FALSE;
- if ( !sqlCursor()->canInsert() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::insertCurrent: insert not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endInsert();
- return FALSE;
-@@ -1117,16 +1117,16 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: no primary index for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: no primary index for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
- }
- if ( !sqlCursor()->canUpdate() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: updates not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
-@@ -1191,8 +1191,8 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::deleteCurrent: no primary index " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::deleteCurrent: no primary index %s",
-+ sqlCursor()->name().latin1() );
- #endif
- return FALSE;
- }
-
---- //depot/qt/3/src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -234,7 +234,8 @@
- db->open();
- #ifdef QT_CHECK_RANGE
- if ( !db->isOpen() )
-- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
-+ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
-+ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
- #endif
- }
- return db;
-@@ -686,7 +687,7 @@
- if ( !d->driver ) {
- #ifdef QT_CHECK_RANGE
- qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
-+ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
- #endif
- d->driver = new QNullDriver();
- d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
-
---- //depot/qt/3/src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -273,7 +273,7 @@
- if ( field )
- newSort.append( *field, desc );
- else
-- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
-+ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
- }
- return newSort;
- }
-
---- //depot/qt/3/src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -298,7 +298,7 @@
- return i;
- }
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::position: unable to find field " + name );
-+ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
- #endif
- return -1;
- }
-@@ -313,7 +313,7 @@
- checkDetach();
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif
- return 0;
- }
-@@ -344,7 +344,7 @@
- {
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif // QT_CHECK_RANGE
- return 0;
- }
-
---- //depot/qt/3/src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -680,7 +680,7 @@
- if ( code != -1 )
- qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
- else
-- qWarning( msg );
-+ qWarning( "%s", msg );
- #endif
- #else
- Q_UNUSED( msg );
-
---- //depot/qt/3/src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ //depot/qt/3/src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -978,7 +978,7 @@
- // ### catch references to embedded .svg files
- QPixmap pix;
- if ( !pix.load( href ) ) {
-- qWarning( "QSvgDevice::play: Couldn't load image "+href );
-+ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
- break;
- }
- pt->drawPixmap( QRect( x1, y1, w, h ), pix );
-@@ -1024,8 +1024,8 @@
- break;
- }
- case InvalidElement:
-- qWarning( "QSvgDevice::play: unknown element type " +
-- node.nodeName() );
-+ qWarning( "QSvgDevice::play: unknown element type %s",
-+ node.nodeName().latin1() );
- break;
- };
-
-@@ -1111,7 +1111,7 @@
- {
- QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
- if ( reg.search( str ) == -1 ) {
-- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
-+ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
- if ( ok )
- *ok = FALSE;
- return 0.0;
-@@ -1140,7 +1140,7 @@
- else if ( u == "pc" )
- dbl *= m.logicalDpiX() / 6.0;
- else
-- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
-+ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
- }
- if ( ok )
- *ok = TRUE;
Modified: trunk/dports/x11/qt3/files/InstallScript.sh
===================================================================
--- trunk/dports/x11/qt3/files/InstallScript.sh 2007-10-19 06:49:45 UTC (rev 30052)
+++ trunk/dports/x11/qt3/files/InstallScript.sh 2007-10-19 07:08:12 UTC (rev 30053)
@@ -7,7 +7,7 @@
export DYLD_LIBRARY_PATH="$QTDIR/lib:$QTDIR/plugins/designer:$QTDIR/plugins/imageformats"
export PATH="$QTDIR/bin:$PATH"
- make install INSTALL_ROOT=%d
+ make -j1 install INSTALL_ROOT=%d
#### COMPATIBILITY WITH OLD QT3 PACKAGES ####
@@ -21,12 +21,12 @@
#fink
# # %p/include/qt
-# install -d -m 0755 %i/include
-# ln -sf %p/include/qt %i/lib/%N/include
+# install -d -m 0755 %i/lib/%N/include
+# /bin/cp -fRL %i/include/qt/* %i/lib/%N/include/
#macports
# %p/include/qt3
- install -d -m 0755 %i/include
- ln -sf %p/include/qt3 %i/lib/%N/include
+ install -d -m 0755 %i/lib/%N/include
+ /bin/cp -fRL %i/include/qt3/* %i/lib/%N/include/
# %p/lib
install -d -m 0755 %i/lib/%N/lib
Modified: trunk/dports/x11/qt3/files/qt3-panther.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-panther.patch 2007-10-19 06:49:45 UTC (rev 30052)
+++ trunk/dports/x11/qt3/files/qt3-panther.patch 2007-10-19 07:08:12 UTC (rev 30053)
@@ -1,6 +1,6 @@
---- 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
+--- qt-x11-free-3.3.8/Makefile 2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.8-new/Makefile 2007-10-04 16:09:34.000000000 -0400
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -10,8 +10,19 @@
@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.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
+--- qt-x11-free-3.3.8/config.tests/x11/xfreetype.test 2004-08-09 16:16:57.000000000 -0400
++++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test 2007-10-04 16:09:34.000000000 -0400
+@@ -41,7 +41,7 @@
+ LIBS="Xft2 Xft"
+ for LIB in $LIBS; do
+ for LIBDIR in $LIBDIRS; do
+- EXTENSIONS="a so sl"
++ EXTENSIONS="a so sl dylib"
+ for E in $EXTENSIONS; do
+ if [ -f "$LIBDIR/lib$LIB.$E" ]; then
+ F="$LIB"
+--- qt-x11-free-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500
++++ qt-x11-free-3.3.8-new/configure 2007-10-04 16:09:34.000000000 -0400
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -44,7 +55,7 @@
# generate qconfig.cpp
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-@@ -3085,7 +3085,7 @@
+@@ -3087,7 +3087,7 @@
COMPILER_VERSION="3.*"
;;
*4.*)
@@ -53,7 +64,7 @@
;;
*)
;;
-@@ -3509,7 +3509,7 @@
+@@ -3525,7 +3525,7 @@
echo "Finding project files. Please wait..."
if [ -z "$QMAKE_PROJECTS" ]; then
@@ -62,11 +73,11 @@
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
+--- qt-x11-free-3.3.8/include/qglobal.h 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/include/qglobal.h 2007-10-04 16:09:34.000000000 -0400
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030307
+ #define QT_VERSION 0x030308
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -95,8 +106,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- 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
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf 2007-02-02 09:01:44.000000000 -0500
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf 2007-10-04 16:09:55.000000000 -0400
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -145,9 +156,10 @@
-QMAKE_LINK = c++
-QMAKE_LINK_SHLIB = c++
+-QMAKE_LFLAGS =
+QMAKE_LINK = g++-3.3
+QMAKE_LINK_SHLIB = g++-3.3
- QMAKE_LFLAGS =
++QMAKE_LFLAGS = -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
@@ -191,8 +203,8 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
---- 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
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h 2007-10-04 16:09:34.000000000 -0400
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -208,8 +220,8 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
---- 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
+--- qt-x11-free-3.3.8/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.8-new/qmake/Makefile.unix 2007-10-04 16:09:34.000000000 -0400
@@ -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 \
@@ -221,8 +233,8 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- 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
+--- qt-x11-free-3.3.8/qmake/main.cpp 2007-02-02 09:01:27.000000000 -0500
++++ qt-x11-free-3.3.8-new/qmake/main.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -232,8 +244,8 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
---- 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
+--- qt-x11-free-3.3.8/src/kernel/qprocess_unix.cpp 2007-02-02 09:01:11.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -761,7 +761,7 @@
#endif
i++;
@@ -270,8 +282,8 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- 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
+--- qt-x11-free-3.3.8/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/moc/moc.pro 2007-10-04 16:09:34.000000000 -0400
@@ -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
@@ -281,8 +293,8 @@
target.path=$$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/src/network/qdns.cpp 2007-02-02 09:01:09.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/network/qdns.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -292,8 +304,8 @@
#endif
//#define QDNS_DEBUG
---- 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
+--- qt-x11-free-3.3.8/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/qt_professional.pri 2007-10-04 16:09:34.000000000 -0400
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -302,8 +314,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.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
+--- qt-x11-free-3.3.8/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/qtmain.pro 2007-10-04 16:09:34.000000000 -0400
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -312,8 +324,114 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
---- 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
+--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp 2007-01-11 08:46:33.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -1043,8 +1043,8 @@
+ return FALSE;
+ if ( !sqlCursor()->canInsert() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::insertCurrent: insert not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endInsert();
+ return FALSE;
+@@ -1117,16 +1117,16 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: no primary index for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: no primary index for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+ }
+ if ( !sqlCursor()->canUpdate() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: updates not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+@@ -1191,8 +1191,8 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::deleteCurrent: no primary index " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::deleteCurrent: no primary index %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ return FALSE;
+ }
+--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp 2007-01-11 10:03:02.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -234,7 +234,8 @@
+ db->open();
+ #ifdef QT_CHECK_RANGE
+ if ( !db->isOpen() )
+- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
++ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
++ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
+ #endif
+ }
+ return db;
+@@ -686,7 +687,7 @@
+ if ( !d->driver ) {
+ #ifdef QT_CHECK_RANGE
+ qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
++ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+ #endif
+ d->driver = new QNullDriver();
+ d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
+--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp 2007-01-11 08:46:35.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -273,7 +273,7 @@
+ if ( field )
+ newSort.append( *field, desc );
+ else
+- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
++ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+ }
+ return newSort;
+ }
+--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp 2007-01-11 08:46:35.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -298,7 +298,7 @@
+ return i;
+ }
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::position: unable to find field " + name );
++ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+ #endif
+ return -1;
+ }
+@@ -313,7 +313,7 @@
+ checkDetach();
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif
+ return 0;
+ }
+@@ -344,7 +344,7 @@
+ {
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif // QT_CHECK_RANGE
+ return 0;
+ }
+--- qt-x11-free-3.3.8/src/tools/qdir_unix.cpp 2007-02-02 09:01:05.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -323,8 +441,8 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
---- 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
+--- qt-x11-free-3.3.8/src/tools/qglobal.cpp 2007-02-02 09:01:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -334,11 +452,20 @@
#include "qt_mac.h"
---- 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
+@@ -680,7 +680,7 @@
+ if ( code != -1 )
+ qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
+ else
+- qWarning( msg );
++ qWarning( "%s", msg );
+ #endif
+ #else
+ Q_UNUSED( msg );
+--- qt-x11-free-3.3.8/src/tools/qglobal.h 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.h 2007-10-04 16:09:34.000000000 -0400
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030307
+ #define QT_VERSION 0x030308
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -367,8 +494,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- 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
+--- qt-x11-free-3.3.8/src/tools/qgpluginmanager.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -378,8 +505,8 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
---- 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
+--- qt-x11-free-3.3.8/src/tools/qlibrary.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -389,8 +516,19 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
---- 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
+--- qt-x11-free-3.3.8/src/tools/qlibrary_unix.cpp 2007-02-02 09:01:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -114,7 +114,7 @@
+
+ QString filename = library->library();
+
+- pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY );
++ pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY | RTLD_LOCAL );
+ #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+ if ( !pHnd )
+ qWarning( "%s", DL_PREFIX(dlerror)() );
+--- qt-x11-free-3.3.8/src/tools/qmutex_unix.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -400,8 +538,8 @@
// 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.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
+--- qt-x11-free-3.3.8/src/tools/qsettings.cpp 2007-02-02 09:01:03.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qsettings.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -981,7 +981,7 @@
if ( filename.isEmpty() ) {
@@ -411,8 +549,8 @@
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
+--- qt-x11-free-3.3.8/src/tools/qstring.cpp 2007-02-02 09:01:05.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qstring.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -449,8 +587,8 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
---- 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
+--- qt-x11-free-3.3.8/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qt_tools.pri 2007-10-04 16:09:34.000000000 -0400
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -462,8 +600,68 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- 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
+--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02 09:01:23.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -6349,7 +6349,7 @@
+ cur = tag->prev;
+ if ( !cur ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
+ #endif
+ return; // something is wrong - give up
+ }
+@@ -6372,7 +6372,7 @@
+ break;
+ } else if ( !cur->leftTag ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
+ #endif
+ return; // something is amiss - give up
+ }
+--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp 2007-02-02 09:01:03.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -978,7 +978,7 @@
+ // ### catch references to embedded .svg files
+ QPixmap pix;
+ if ( !pix.load( href ) ) {
+- qWarning( "QSvgDevice::play: Couldn't load image "+href );
++ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
+ break;
+ }
+ pt->drawPixmap( QRect( x1, y1, w, h ), pix );
+@@ -1024,8 +1024,8 @@
+ break;
+ }
+ case InvalidElement:
+- qWarning( "QSvgDevice::play: unknown element type " +
+- node.nodeName() );
++ qWarning( "QSvgDevice::play: unknown element type %s",
++ node.nodeName().latin1() );
+ break;
+ };
+
+@@ -1111,7 +1111,7 @@
+ {
+ QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
+ if ( reg.search( str ) == -1 ) {
+- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
++ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
+ if ( ok )
+ *ok = FALSE;
+ return 0.0;
+@@ -1140,7 +1140,7 @@
+ else if ( u == "pc" )
+ dbl *= m.logicalDpiX() / 6.0;
+ else
+- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
++ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
+ }
+ if ( ok )
+ *ok = TRUE;
+--- qt-x11-free-3.3.8/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2007-10-04 16:09:34.000000000 -0400
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -473,8 +671,8 @@
target.path = $$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/app/app.pro 2007-10-04 16:09:34.000000000 -0400
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -485,8 +683,8 @@
target.path=$$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -495,8 +693,8 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
---- 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
+--- qt-x11-free-3.3.8/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -504,8 +702,8 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- 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
+--- qt-x11-free-3.3.8/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro 2007-10-04 16:09:34.000000000 -0400
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -513,8 +711,8 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -524,8 +722,8 @@
PROJECTNAME = Qt Linguist
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -535,8 +733,8 @@
lrelease \
lupdate \
qm2ts
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro 2007-10-04 16:09:34.000000000 -0400
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -544,8 +742,8 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro 2007-10-04 16:09:34.000000000 -0400
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -554,8 +752,8 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro 2007-10-04 16:09:34.000000000 -0400
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -563,8 +761,8 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
---- 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
+--- qt-x11-free-3.3.8/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro 2007-10-04 16:09:34.000000000 -0400
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
Modified: trunk/dports/x11/qt3/files/qt3-tiger.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-tiger.patch 2007-10-19 06:49:45 UTC (rev 30052)
+++ trunk/dports/x11/qt3/files/qt3-tiger.patch 2007-10-19 07:08:12 UTC (rev 30053)
@@ -1,6 +1,6 @@
---- 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
+--- qt-x11-free-3.3.8/Makefile 2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.8-new/Makefile 2007-10-04 16:09:34.000000000 -0400
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -10,8 +10,19 @@
@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.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
+--- qt-x11-free-3.3.8/config.tests/x11/xfreetype.test 2004-08-09 16:16:57.000000000 -0400
++++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test 2007-10-04 16:09:34.000000000 -0400
+@@ -41,7 +41,7 @@
+ LIBS="Xft2 Xft"
+ for LIB in $LIBS; do
+ for LIBDIR in $LIBDIRS; do
+- EXTENSIONS="a so sl"
++ EXTENSIONS="a so sl dylib"
+ for E in $EXTENSIONS; do
+ if [ -f "$LIBDIR/lib$LIB.$E" ]; then
+ F="$LIB"
+--- qt-x11-free-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500
++++ qt-x11-free-3.3.8-new/configure 2007-10-04 16:09:34.000000000 -0400
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -44,7 +55,7 @@
# generate qconfig.cpp
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-@@ -3085,7 +3085,7 @@
+@@ -3087,7 +3087,7 @@
COMPILER_VERSION="3.*"
;;
*4.*)
@@ -53,7 +64,7 @@
;;
*)
;;
-@@ -3509,7 +3509,7 @@
+@@ -3525,7 +3525,7 @@
echo "Finding project files. Please wait..."
if [ -z "$QMAKE_PROJECTS" ]; then
@@ -62,11 +73,11 @@
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
+--- qt-x11-free-3.3.8/include/qglobal.h 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/include/qglobal.h 2007-10-04 16:09:34.000000000 -0400
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030307
+ #define QT_VERSION 0x030308
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -95,8 +106,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- 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
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf 2007-02-02 09:01:44.000000000 -0500
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf 2007-10-04 16:09:55.000000000 -0400
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -145,9 +156,10 @@
-QMAKE_LINK = c++
-QMAKE_LINK_SHLIB = c++
+-QMAKE_LFLAGS =
+QMAKE_LINK = g++-4.0
+QMAKE_LINK_SHLIB = g++-4.0
- QMAKE_LFLAGS =
++QMAKE_LFLAGS = -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
@@ -191,8 +203,8 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
---- 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
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h 2007-10-04 16:09:34.000000000 -0400
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -208,8 +220,8 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
---- 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
+--- qt-x11-free-3.3.8/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.8-new/qmake/Makefile.unix 2007-10-04 16:09:34.000000000 -0400
@@ -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 \
@@ -221,8 +233,8 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- 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
+--- qt-x11-free-3.3.8/qmake/main.cpp 2007-02-02 09:01:27.000000000 -0500
++++ qt-x11-free-3.3.8-new/qmake/main.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -232,8 +244,8 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
---- 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
+--- qt-x11-free-3.3.8/src/kernel/qprocess_unix.cpp 2007-02-02 09:01:11.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -761,7 +761,7 @@
#endif
i++;
@@ -270,8 +282,8 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- 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
+--- qt-x11-free-3.3.8/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/moc/moc.pro 2007-10-04 16:09:34.000000000 -0400
@@ -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
@@ -281,8 +293,8 @@
target.path=$$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/src/network/qdns.cpp 2007-02-02 09:01:09.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/network/qdns.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -292,8 +304,8 @@
#endif
//#define QDNS_DEBUG
---- 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
+--- qt-x11-free-3.3.8/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/qt_professional.pri 2007-10-04 16:09:34.000000000 -0400
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -302,8 +314,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.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
+--- qt-x11-free-3.3.8/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/qtmain.pro 2007-10-04 16:09:34.000000000 -0400
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -312,8 +324,114 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
---- 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
+--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp 2007-01-11 08:46:33.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -1043,8 +1043,8 @@
+ return FALSE;
+ if ( !sqlCursor()->canInsert() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::insertCurrent: insert not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endInsert();
+ return FALSE;
+@@ -1117,16 +1117,16 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: no primary index for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: no primary index for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+ }
+ if ( !sqlCursor()->canUpdate() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: updates not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+@@ -1191,8 +1191,8 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::deleteCurrent: no primary index " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::deleteCurrent: no primary index %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ return FALSE;
+ }
+--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp 2007-01-11 10:03:02.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -234,7 +234,8 @@
+ db->open();
+ #ifdef QT_CHECK_RANGE
+ if ( !db->isOpen() )
+- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
++ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
++ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
+ #endif
+ }
+ return db;
+@@ -686,7 +687,7 @@
+ if ( !d->driver ) {
+ #ifdef QT_CHECK_RANGE
+ qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
++ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+ #endif
+ d->driver = new QNullDriver();
+ d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
+--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp 2007-01-11 08:46:35.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -273,7 +273,7 @@
+ if ( field )
+ newSort.append( *field, desc );
+ else
+- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
++ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+ }
+ return newSort;
+ }
+--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp 2007-01-11 08:46:35.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -298,7 +298,7 @@
+ return i;
+ }
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::position: unable to find field " + name );
++ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+ #endif
+ return -1;
+ }
+@@ -313,7 +313,7 @@
+ checkDetach();
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif
+ return 0;
+ }
+@@ -344,7 +344,7 @@
+ {
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif // QT_CHECK_RANGE
+ return 0;
+ }
+--- qt-x11-free-3.3.8/src/tools/qdir_unix.cpp 2007-02-02 09:01:05.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -323,8 +441,8 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
---- 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
+--- qt-x11-free-3.3.8/src/tools/qglobal.cpp 2007-02-02 09:01:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -334,11 +452,20 @@
#include "qt_mac.h"
---- 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
+@@ -680,7 +680,7 @@
+ if ( code != -1 )
+ qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
+ else
+- qWarning( msg );
++ qWarning( "%s", msg );
+ #endif
+ #else
+ Q_UNUSED( msg );
+--- qt-x11-free-3.3.8/src/tools/qglobal.h 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.h 2007-10-04 16:09:34.000000000 -0400
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030307
+ #define QT_VERSION 0x030308
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -367,8 +494,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- 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
+--- qt-x11-free-3.3.8/src/tools/qgpluginmanager.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -378,8 +505,8 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
---- 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
+--- qt-x11-free-3.3.8/src/tools/qlibrary.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -389,8 +516,19 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
---- 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
+--- qt-x11-free-3.3.8/src/tools/qlibrary_unix.cpp 2007-02-02 09:01:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -114,7 +114,7 @@
+
+ QString filename = library->library();
+
+- pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY );
++ pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY | RTLD_LOCAL );
+ #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+ if ( !pHnd )
+ qWarning( "%s", DL_PREFIX(dlerror)() );
+--- qt-x11-free-3.3.8/src/tools/qmutex_unix.cpp 2007-02-02 09:01:04.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -400,8 +538,8 @@
// 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.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
+--- qt-x11-free-3.3.8/src/tools/qsettings.cpp 2007-02-02 09:01:03.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qsettings.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -981,7 +981,7 @@
if ( filename.isEmpty() ) {
@@ -411,8 +549,8 @@
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
+--- qt-x11-free-3.3.8/src/tools/qstring.cpp 2007-02-02 09:01:05.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qstring.cpp 2007-10-04 16:09:34.000000000 -0400
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -449,8 +587,8 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
---- 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
+--- qt-x11-free-3.3.8/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/tools/qt_tools.pri 2007-10-04 16:09:34.000000000 -0400
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -462,8 +600,68 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- 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
+--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02 09:01:23.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -6349,7 +6349,7 @@
+ cur = tag->prev;
+ if ( !cur ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
+ #endif
+ return; // something is wrong - give up
+ }
+@@ -6372,7 +6372,7 @@
+ break;
+ } else if ( !cur->leftTag ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
+ #endif
+ return; // something is amiss - give up
+ }
+--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp 2007-02-02 09:01:03.000000000 -0500
++++ qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp 2007-10-04 16:09:34.000000000 -0400
+@@ -978,7 +978,7 @@
+ // ### catch references to embedded .svg files
+ QPixmap pix;
+ if ( !pix.load( href ) ) {
+- qWarning( "QSvgDevice::play: Couldn't load image "+href );
++ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
+ break;
+ }
+ pt->drawPixmap( QRect( x1, y1, w, h ), pix );
+@@ -1024,8 +1024,8 @@
+ break;
+ }
+ case InvalidElement:
+- qWarning( "QSvgDevice::play: unknown element type " +
+- node.nodeName() );
++ qWarning( "QSvgDevice::play: unknown element type %s",
++ node.nodeName().latin1() );
+ break;
+ };
+
+@@ -1111,7 +1111,7 @@
+ {
+ QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
+ if ( reg.search( str ) == -1 ) {
+- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
++ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
+ if ( ok )
+ *ok = FALSE;
+ return 0.0;
+@@ -1140,7 +1140,7 @@
+ else if ( u == "pc" )
+ dbl *= m.logicalDpiX() / 6.0;
+ else
+- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
++ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
+ }
+ if ( ok )
+ *ok = TRUE;
+--- qt-x11-free-3.3.8/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2007-10-04 16:09:34.000000000 -0400
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -473,8 +671,8 @@
target.path = $$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/app/app.pro 2007-10-04 16:09:34.000000000 -0400
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -485,8 +683,8 @@
target.path=$$bins.path
INSTALLS += target
---- 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
+--- qt-x11-free-3.3.8/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -495,8 +693,8 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
---- 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
+--- qt-x11-free-3.3.8/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -504,8 +702,8 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- 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
+--- qt-x11-free-3.3.8/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro 2007-10-04 16:09:34.000000000 -0400
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -513,8 +711,8 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -524,8 +722,8 @@
PROJECTNAME = Qt Linguist
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist.pro 2007-10-04 16:09:34.000000000 -0400
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -535,8 +733,8 @@
lrelease \
lupdate \
qm2ts
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro 2007-10-04 16:09:34.000000000 -0400
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -544,8 +742,8 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro 2007-10-04 16:09:34.000000000 -0400
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -554,8 +752,8 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
---- 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
+--- qt-x11-free-3.3.8/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro 2007-10-04 16:09:34.000000000 -0400
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -563,8 +761,8 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
---- 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
+--- qt-x11-free-3.3.8/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro 2007-10-04 16:09:34.000000000 -0400
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071019/a814a42d/attachment-0001.html
More information about the macports-changes
mailing list