Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv14348/10.4/unstable/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
fix RTLD_LOCAL issue plus some other stuff
Index: qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- qt3.info 30 Mar 2007 20:28:06 -0000 1.17
+++ qt3.info 4 Sep 2007 14:28:56 -0000 1.18
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.8
-Revision: 1021
+Revision: 1023
Description: Cross-Platform GUI application framework
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -206,7 +206,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 ####
@@ -219,8 +219,8 @@
done
# %p/include/qt
- install -d -m 0755 %i/include
- ln -sf ../../include/qt %i/lib/%N/include
+ install -d -m 0755 %i/lib/%N/include
+ /bin/cp -fRL %i/include/qt/* %i/lib/%N/include/
# %p/lib
install -d -m 0755 %i/lib/%N/lib
Index: qt3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- qt3.patch 14 Jul 2007 15:36:05 -0000 1.11
+++ qt3.patch 4 Sep 2007 14:28:56 -0000 1.12
@@ -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-07-17 23:15:56.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-07-17
23:15:56.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-07-17 23:15:56.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-07-17 23:15:56.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-07-17
23:15:56.000000000 -0400
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -191,8 +202,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-07-17
23:15:56.000000000 -0400
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -208,8 +219,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-07-17 23:15:56.000000000
-0400
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
[EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL
PROTECTED]@/include \
@@ -221,8 +232,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-07-17 23:15:56.000000000
-0400
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -232,8 +243,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-07-17
23:15:56.000000000 -0400
@@ -761,7 +761,7 @@
#endif
i++;
@@ -270,8 +281,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-07-17 23:15:56.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 +292,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-07-17 23:15:56.000000000
-0400
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -292,8 +303,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-07-17
23:15:56.000000000 -0400
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -302,8 +313,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-07-17 23:15:56.000000000
-0400
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -312,8 +323,8 @@
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/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-07-17
23:15:56.000000000 -0400
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -323,8 +334,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-07-17
23:15:56.000000000 -0400
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -334,11 +345,11 @@
#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
+--- 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-07-17 23:15:56.000000000
-0400
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030307
+ #define QT_VERSION 0x030308
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -367,8 +378,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-07-17
23:15:56.000000000 -0400
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -378,8 +389,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-07-17
23:15:56.000000000 -0400
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -389,8 +400,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-07-17
23:18:10.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-07-17
23:15:56.000000000 -0400
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -400,8 +422,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-07-17
23:15:56.000000000 -0400
@@ -981,7 +981,7 @@
if ( filename.isEmpty() ) {
@@ -411,8 +433,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-07-17
23:15:56.000000000 -0400
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -449,8 +471,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-07-17
23:15:56.000000000 -0400
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -462,8 +484,8 @@
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/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
++++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2007-07-17
23:15:56.000000000 -0400
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -473,8 +495,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-07-17
23:15:56.000000000 -0400
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -485,8 +507,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-07-17
23:15:56.000000000 -0400
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -495,8 +517,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-07-17
23:15:56.000000000 -0400
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -504,8 +526,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-07-17
23:15:56.000000000 -0400
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -513,8 +535,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-07-17
23:15:56.000000000 -0400
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -524,8 +546,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-07-17
23:15:56.000000000 -0400
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -535,8 +557,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-07-17
23:15:56.000000000 -0400
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -544,8 +566,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-07-17
23:15:56.000000000 -0400
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -554,8 +576,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-07-17
23:15:56.000000000 -0400
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -563,8 +585,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-07-17
23:15:56.000000000 -0400
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
@@ -573,15 +595,192 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler !win32*
-diff -ruN qt-x11-free-3.3.7/config.tests/x11/xfreetype.test
qt-x11-free-3.3.7-patched/config.tests/x11/xfreetype.test
---- qt-x11-free-3.3.7/config.tests/x11/xfreetype.test 2004-08-09
13:16:57.000000000 -0700
-+++ qt-x11-free-3.3.7-patched/config.tests/x11/xfreetype.test 2007-07-12
13:31:03.000000000 -0700
-@@ -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/src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
++++ qt/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
+ }
+--- qt/src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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;
+ }
+
+--- qt/src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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" ) );
+
+--- qt/src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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;
+ }
+
+--- qt/src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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;
+ }
+
+--- qt/src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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 );
+
+--- qt/src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
++++ qt/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;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
