Update of /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22021/10.3/main/finkinfo/x11
Modified Files: qt3-mysql.info qt3-postgresql.info qt3.info qt3.patch Log Message: new qt3 Index: qt3.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3.info,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- qt3.info 2 Mar 2006 05:33:09 -0000 1.49 +++ qt3.info 15 Mar 2006 22:20:18 -0000 1.50 @@ -1,6 +1,6 @@ Package: qt3 -Version: 3.3.5 -Revision: 17 +Version: 3.3.6 +Revision: 11 Description: Cross-Platform GUI application framework License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> @@ -29,7 +29,7 @@ Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0002.tar.bz2 SourceDirectory: qt-x11-free-%v Source2ExtractDir: qt-x11-free-%v -Source-MD5: 05d04688c0c0230ed54e89102d689ca4 +Source-MD5: dc1384c03ac08af21f6fefab32d982cf Source2-MD5: 85bd46f2c4b820ae6b64271dae173b4b PatchScript: << #!/bin/sh -ex @@ -46,11 +46,8 @@ patches/0038-dragobject-dont-prefer-unknown.rr.patch \ patches/0047-fix-kmenu-width.rr.diff \ patches/0048-qclipboard_hack_80072.rr.patch \ - patches/0051-qtoolbar_77047.rr.patch \ patches/0056-khotkeys_input_84434.rr.patch \ - patches/qt-x11-free-3.3.4-assistant_de.patch \ patches/qt-x11-free-3.3.4-fullscreen.patch \ - patches/qt-x11-free-3.3.5-warning.patch \ ; do echo "patching with $patch" patch -p1 --fuzz=4 < $patch Index: qt3-postgresql.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3-postgresql.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- qt3-postgresql.info 11 Feb 2006 16:47:53 -0000 1.13 +++ qt3-postgresql.info 15 Mar 2006 22:20:18 -0000 1.14 @@ -1,5 +1,5 @@ Package: qt3-postgresql -Version: 3.3.5 +Version: 3.3.6 Revision: 11 Description: Cross-Platform GUI application framework (PostgreSQL Plugin) License: GPL @@ -23,7 +23,7 @@ << Source: mirror:custom:qt-x11-free-%v.tar.bz2 SourceDirectory: qt-x11-free-%v -Source-MD5: 05d04688c0c0230ed54e89102d689ca4 +Source-MD5: dc1384c03ac08af21f6fefab32d982cf PatchScript: perl -pi.bak -e 's,REQUIRES.*=.*sql.*,,' plugins/src/sqldrivers/*/*.pro CompileScript: << Index: qt3-mysql.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3-mysql.info,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- qt3-mysql.info 11 Feb 2006 16:47:53 -0000 1.10 +++ qt3-mysql.info 15 Mar 2006 22:20:18 -0000 1.11 @@ -1,5 +1,5 @@ Package: qt3-mysql -Version: 3.3.5 +Version: 3.3.6 Revision: 11 Description: Cross-Platform GUI application framework (MySQL Plugin) License: GPL @@ -23,7 +23,7 @@ << Source: mirror:custom:qt-x11-free-%v.tar.bz2 SourceDirectory: qt-x11-free-%v -Source-MD5: 05d04688c0c0230ed54e89102d689ca4 +Source-MD5: dc1384c03ac08af21f6fefab32d982cf PatchScript: perl -pi.bak -e 's,REQUIRES.*=.*sql.*,,' plugins/src/sqldrivers/*/*.pro CompileScript: << Index: qt3.patch =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3.patch,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- qt3.patch 2 Mar 2006 05:33:09 -0000 1.37 +++ qt3.patch 15 Mar 2006 22:20:18 -0000 1.38 @@ -1,5 +1,6 @@ ---- qt-x11-free-3.3.5/Makefile 2005-01-03 11:08:00.000000000 -0500 -+++ qt-x11-free-3.3.5-new/Makefile 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile +--- 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-15 13:32:32.000000000 -0500 @@ -11,7 +11,7 @@ install: FORCE @$(MAKE) qt.install @@ -9,8 +10,9 @@ @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.5/configure 2005-08-22 05:31:26.000000000 -0400 -+++ qt-x11-free-3.3.5-new/configure 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure +--- 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-15 13:32:32.000000000 -0500 @@ -36,7 +36,7 @@ # need that throughout the script @@ -20,7 +22,7 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -@@ -1046,8 +1046,8 @@ +@@ -1051,8 +1051,8 @@ [ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX # default PREFIX/translations [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations @@ -31,95 +33,12 @@ # generate qconfig.cpp [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools -@@ -3031,7 +3031,7 @@ - COMPILER_VERSION="3.*" - ;; - *4.*) -- COMPILER_VERSION="4" -+ COMPILER_VERSION="4.*" - ;; - *) - ;; ---- qt-x11-free-3.3.5/include/private/qcom_p.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/private/qcom_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -53,6 +53,10 @@ - #include "quuid.h" - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - #ifndef QT_NO_COMPONENT - - class QObject; ---- qt-x11-free-3.3.5/include/private/qimageformatinterface_p.h 2005-09-02 08:43:04.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/private/qimageformatinterface_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -40,6 +40,9 @@ - #include <private/qcom_p.h> - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - // - // W A R N I N G ---- qt-x11-free-3.3.5/include/private/qucom_p.h 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/private/qucom_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -59,6 +59,10 @@ - #undef check - #endif - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - struct QUObject; - struct QUInterfaceDescription; - struct QUnknownInterface; ---- qt-x11-free-3.3.5/include/private/qucomextra_p.h 2005-09-02 08:43:01.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/private/qucomextra_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -54,6 +54,9 @@ - #include <private/qucom_p.h> - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - class QVariant; - ---- qt-x11-free-3.3.5/include/qasyncimageio.h 2005-09-02 08:43:05.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qasyncimageio.h 2006-02-11 11:24:10.000000000 -0500 -@@ -44,6 +44,9 @@ - - #ifndef QT_NO_ASYNC_IMAGE_IO - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - class Q_EXPORT QImageConsumer { - public: ---- qt-x11-free-3.3.5/include/qfiledialog.h 2005-09-02 08:42:52.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qfiledialog.h 2006-02-11 11:24:10.000000000 -0500 -@@ -58,6 +58,10 @@ - #include "qurlinfo.h" - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - #ifndef QT_NO_FILEDIALOG - - class Q_EXPORT QFileIconProvider : public QObject ---- qt-x11-free-3.3.5/include/qglobal.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qglobal.h 2006-02-11 11:36:55.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h +--- 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-15 13:32:32.000000000 -0500 @@ -44,6 +44,10 @@ */ - #define QT_VERSION 0x030305 + #define QT_VERSION 0x030306 +#ifndef __DARWIN_X11__ +#define __DARWIN_X11__ @@ -128,7 +47,7 @@ /* The operating system, must be one of: (Q_OS_x) -@@ -545,6 +549,8 @@ +@@ -562,6 +566,8 @@ #if defined(Q_OS_MAC9) # define Q_WS_MAC9 @@ -137,7 +56,7 @@ #elif defined(Q_OS_MSDOS) # define Q_WS_WIN16 # error "Qt requires Win32 and does not work with Windows 3.x" -@@ -865,6 +871,10 @@ +@@ -882,6 +888,10 @@ # define Q_TEMPLATE_EXTERN # undef Q_DISABLE_COPY /* avoid unresolved externals */ # endif @@ -148,21 +67,9 @@ #else # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL ---- qt-x11-free-3.3.5/include/qnetworkprotocol.h 2005-09-02 08:43:05.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qnetworkprotocol.h 2006-02-11 11:24:10.000000000 -0500 -@@ -47,6 +47,10 @@ - - #ifndef QT_NO_NETWORKPROTOCOL - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - class QNetworkProtocol; - class QNetworkOperation; - class QTimer; ---- qt-x11-free-3.3.5/include/qprogressbar.h 2005-09-02 08:43:14.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qprogressbar.h 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h +--- qt-x11-free-3.3.6/include/qprogressbar.h 2006-03-08 11:47:58.000000000 -0500 ++++ qt-x11-free-3.3.6-new/include/qprogressbar.h 2006-03-15 13:32:32.000000000 -0500 @@ -61,6 +61,7 @@ public: QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 ); @@ -179,20 +86,9 @@ private: int total_steps; ---- qt-x11-free-3.3.5/include/qtooltip.h 2005-09-02 08:43:15.000000000 -0400 -+++ qt-x11-free-3.3.5-new/include/qtooltip.h 2006-02-11 11:24:10.000000000 -0500 -@@ -42,6 +42,9 @@ - - #ifndef QT_NO_TOOLTIP - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - class QTipManager; - class QIconViewToolTip; ---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf 2005-09-02 08:43:37.000000000 -0400 -+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qmake.conf 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf +--- 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-15 13:32:32.000000000 -0500 @@ -9,19 +9,19 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app @@ -298,8 +194,9 @@ +QMAKE_DEL_DIR = /bin/rmdir +QMAKE_CHK_DIR_EXISTS = /bin/test -d +QMAKE_MKDIR = /bin/mkdir -p ---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400 -+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qplatformdefs.h 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h +--- 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-15 13:32:32.000000000 -0500 @@ -74,12 +74,13 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN @@ -315,8 +212,9 @@ +#define QT_MITSHM #endif // QPLATFORMDEFS_H ---- qt-x11-free-3.3.5/qmake/Makefile.unix 2004-09-13 14:24:42.000000000 -0400 -+++ qt-x11-free-3.3.5-new/qmake/Makefile.unix 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix +--- 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-15 13:32:32.000000000 -0500 @@ -36,8 +36,8 @@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ [EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@/include \ @@ -328,8 +226,9 @@ qmake: $(OBJS) $(QOBJS) $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) ---- qt-x11-free-3.3.5/qmake/main.cpp 2005-09-02 08:43:19.000000000 -0400 -+++ qt-x11-free-3.3.5-new/qmake/main.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp +--- 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-15 13:32:32.000000000 -0500 @@ -49,7 +49,7 @@ // for Borland, main is defined to qMain which breaks qmake @@ -339,58 +238,9 @@ // for qurl bool qt_resolve_symlinks = FALSE; #endif ---- qt-x11-free-3.3.5/src/dialogs/qfiledialog.h 2005-09-02 08:42:52.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/dialogs/qfiledialog.h 2006-02-11 11:24:10.000000000 -0500 -@@ -58,6 +58,10 @@ - #include "qurlinfo.h" - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - #ifndef QT_NO_FILEDIALOG - - class Q_EXPORT QFileIconProvider : public QObject ---- qt-x11-free-3.3.5/src/kernel/qasyncimageio.h 2005-09-02 08:43:05.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qasyncimageio.h 2006-02-11 11:24:10.000000000 -0500 -@@ -44,6 +44,9 @@ - - #ifndef QT_NO_ASYNC_IMAGE_IO - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - class Q_EXPORT QImageConsumer { - public: ---- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h 2005-09-02 08:43:04.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -40,6 +40,9 @@ - #include <private/qcom_p.h> - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - // - // W A R N I N G ---- qt-x11-free-3.3.5/src/kernel/qnetworkprotocol.h 2005-09-02 08:43:05.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qnetworkprotocol.h 2006-02-11 11:24:10.000000000 -0500 -@@ -47,6 +47,10 @@ - - #ifndef QT_NO_NETWORKPROTOCOL - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - class QNetworkProtocol; - class QNetworkOperation; - class QTimer; ---- qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp 2005-09-02 08:43:01.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qprocess_unix.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp +--- 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-15 13:32:32.000000000 -0500 @@ -761,7 +761,7 @@ #endif i++; @@ -427,20 +277,22 @@ arglistQ[0] = fileInfo.absFilePath().local8Bit(); #else arglistQ[0] = fileInfo.filePath().local8Bit(); ---- qt-x11-free-3.3.5/src/kernel/qucomextra_p.h 2005-09-02 08:43:01.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/kernel/qucomextra_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -54,6 +54,9 @@ - #include <private/qucom_p.h> - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif +diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp +--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp 2006-03-08 11:47:47.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp 2006-03-15 13:32:33.000000000 -0500 +@@ -2671,6 +2671,9 @@ - class QVariant; + void QWidget::createInputContext() + { ++ if( !isInputMethodEnabled() || QApplication::closingDown() ) ++ return; ++ + QWidget *tlw = topLevelWidget(); + QTLWExtra *topdata = tlw->topData(); ---- qt-x11-free-3.3.5/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/src/moc/moc.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro +--- 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-15 13:32:32.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 @@ -450,8 +302,9 @@ target.path=$$bins.path INSTALLS += target ---- qt-x11-free-3.3.5/src/network/qdns.cpp 2005-09-02 08:42:59.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/network/qdns.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp +--- 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-15 13:32:32.000000000 -0500 @@ -76,7 +76,7 @@ #include "qcleanuphandler.h" #include <limits.h> @@ -461,8 +314,9 @@ #endif //#define QDNS_DEBUG ---- qt-x11-free-3.3.5/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500 -+++ qt-x11-free-3.3.5-new/src/qt_professional.pri 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri +--- 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-15 13:32:32.000000000 -0500 @@ -25,7 +25,6 @@ unix { NETWORK_H = $$NETWORK_CPP @@ -471,8 +325,9 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/network include( $$QT_SOURCE_TREE/src/network/qt_network.pri ) DEFINES *= QT_MODULE_NETWORK ---- qt-x11-free-3.3.5/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/src/qtmain.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro +--- 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-15 13:32:33.000000000 -0500 @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = qtmain @@ -481,21 +336,9 @@ DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += qt staticlib warn_on release ---- qt-x11-free-3.3.5/src/tools/qcom_p.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qcom_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -53,6 +53,10 @@ - #include "quuid.h" - #endif // QT_H - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - #ifndef QT_NO_COMPONENT - - class QObject; ---- qt-x11-free-3.3.5/src/tools/qdir_unix.cpp 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qdir_unix.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -88,7 +88,7 @@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const @@ -505,8 +348,9 @@ QString name = dirName; if (dirName[dirName.length() - 1] == "/") name = dirName.left( dirName.length() - 1 ); ---- qt-x11-free-3.3.5/src/tools/qglobal.cpp 2005-09-02 08:42:55.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qglobal.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -161,7 +161,7 @@ return TRUE; } @@ -516,11 +360,12 @@ #include "qt_mac.h" ---- qt-x11-free-3.3.5/src/tools/qglobal.h 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qglobal.h 2006-02-11 11:36:55.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.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-15 13:32:33.000000000 -0500 @@ -44,6 +44,10 @@ */ - #define QT_VERSION 0x030305 + #define QT_VERSION 0x030306 +#ifndef __DARWIN_X11__ +#define __DARWIN_X11__ @@ -529,7 +374,7 @@ /* The operating system, must be one of: (Q_OS_x) -@@ -545,6 +549,8 @@ +@@ -562,6 +566,8 @@ #if defined(Q_OS_MAC9) # define Q_WS_MAC9 @@ -538,7 +383,7 @@ #elif defined(Q_OS_MSDOS) # define Q_WS_WIN16 # error "Qt requires Win32 and does not work with Windows 3.x" -@@ -865,6 +871,10 @@ +@@ -882,6 +888,10 @@ # define Q_TEMPLATE_EXTERN # undef Q_DISABLE_COPY /* avoid unresolved externals */ # endif @@ -549,8 +394,9 @@ #else # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL ---- qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qgpluginmanager.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -316,7 +316,7 @@ #if defined(Q_OS_WIN32) @@ -560,8 +406,9 @@ QString filter = "*.dylib; *.so; *.bundle"; #elif defined(Q_OS_HPUX) QString filter = "*.sl"; ---- qt-x11-free-3.3.5/src/tools/qlibrary.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qlibrary.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -400,7 +400,7 @@ filename += ".dll"; #else @@ -571,8 +418,9 @@ filters << ".so"; filters << ".bundle"; filters << ".dylib"; //the last one is also the default one.. ---- qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp 2005-09-02 08:42:53.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qmutex_unix.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -44,7 +44,7 @@ // POSIX threads mutex types #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \ @@ -582,8 +430,9 @@ // 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.5/src/tools/qstring.cpp 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qstring.cpp 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp +--- 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-15 13:32:33.000000000 -0500 @@ -1362,7 +1362,7 @@ QStringData* QString::makeSharedNull() { @@ -620,8 +469,9 @@ if ( sl == 1 ) return findRev( *str.unicode(), index, cs ); #endif ---- qt-x11-free-3.3.5/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500 -+++ qt-x11-free-3.3.5-new/src/tools/qt_tools.pri 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri +--- 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-15 13:32:33.000000000 -0500 @@ -101,10 +101,6 @@ $$TOOLS_CPP/qwaitcondition_unix.cpp @@ -633,21 +483,9 @@ unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp SOURCES += $$TOOLS_CPP/qbitarray.cpp \ ---- qt-x11-free-3.3.5/src/tools/qucom_p.h 2005-09-02 08:42:54.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/tools/qucom_p.h 2006-02-11 11:24:10.000000000 -0500 -@@ -59,6 +59,10 @@ - #undef check - #endif - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif -+ - struct QUObject; - struct QUInterfaceDescription; - struct QUnknownInterface; ---- qt-x11-free-3.3.5/src/widgets/qprogressbar.cpp 2005-09-02 08:43:14.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.cpp 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp +--- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp 2006-03-08 11:47:58.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp 2006-03-15 13:32:33.000000000 -0500 @@ -105,7 +105,6 @@ initFrame(); } @@ -677,8 +515,9 @@ /*! This method is called to generate the text displayed in the center ---- qt-x11-free-3.3.5/src/widgets/qprogressbar.h 2005-09-02 08:43:14.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.h 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h +--- qt-x11-free-3.3.6/src/widgets/qprogressbar.h 2006-03-08 11:47:58.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h 2006-03-15 13:32:33.000000000 -0500 @@ -61,6 +61,7 @@ public: QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 ); @@ -695,20 +534,9 @@ private: int total_steps; ---- qt-x11-free-3.3.5/src/widgets/qtooltip.h 2005-09-02 08:43:15.000000000 -0400 -+++ qt-x11-free-3.3.5-new/src/widgets/qtooltip.h 2006-02-11 11:24:10.000000000 -0500 -@@ -42,6 +42,9 @@ - - #ifndef QT_NO_TOOLTIP - -+#if __GNUC__ - 0 > 3 -+#pragma GCC system_header -+#endif - - class QTipManager; - class QIconViewToolTip; ---- qt-x11-free-3.3.5/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/assistant/assistant.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro +--- 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-15 13:32:33.000000000 -0500 @@ -32,6 +32,8 @@ win32:RC_FILE = assistant.rc @@ -718,8 +546,9 @@ target.path = $$bins.path INSTALLS += target ---- qt-x11-free-3.3.5/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/designer/app/app.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro +--- 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-15 13:32:33.000000000 -0500 @@ -20,7 +20,8 @@ QMAKE_INFO_PLIST = Info_mac.plist staticlib:CONFIG -= global_init_link_order #yuck @@ -730,8 +559,9 @@ target.path=$$bins.path INSTALLS += target ---- qt-x11-free-3.3.5/tools/designer/designer/designer.pro 2004-07-29 09:09:50.000000000 -0400 -+++ qt-x11-free-3.3.5-new/tools/designer/designer/designer.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro +--- 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-15 13:32:33.000000000 -0500 @@ -1,6 +1,6 @@ TEMPLATE = lib @@ -740,8 +570,9 @@ CONFIG -= dll !force_static:!win32:contains(QT_PRODUCT,qt-internal) { CONFIG -= staticlib ---- qt-x11-free-3.3.5/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/designer/editor/editor.pro 2006-02-11 11:24:10.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro +--- 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-15 13:32:33.000000000 -0500 @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on staticlib @@ -749,8 +580,9 @@ CONFIG -= dll HEADERS = editor.h \ parenmatcher.h \ ---- qt-x11-free-3.3.5/tools/designer/uic/form.cpp 2005-08-31 06:13:47.000000000 -0400 -+++ qt-x11-free-3.3.5-new/tools/designer/uic/form.cpp 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp +--- qt-x11-free-3.3.6/tools/designer/uic/form.cpp 2005-08-31 06:13:47.000000000 -0400 ++++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp 2006-03-15 13:32:33.000000000 -0500 @@ -731,6 +731,13 @@ while ( !n2.isNull() ) { if ( n2.tagName() == "includehint" ) { @@ -765,8 +597,9 @@ localIncludes += file; } n2 = n2.nextSibling().toElement(); ---- qt-x11-free-3.3.5/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/designer/uic/uic.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro +--- 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-15 13:32:33.000000000 -0500 @@ -40,3 +40,6 @@ LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb SOURCES += mwerks_mac.cpp @@ -774,8 +607,9 @@ +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic + ---- qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/linguist/linguist/linguist.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro +--- 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-15 13:32:33.000000000 -0500 @@ -43,6 +43,8 @@ staticlib:CONFIG -= global_init_link_order #yuck RC_FILE = linguist.icns @@ -785,8 +619,9 @@ PROJECTNAME = Qt Linguist ---- qt-x11-free-3.3.5/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400 -+++ qt-x11-free-3.3.5-new/tools/linguist/linguist.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro +--- 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-15 13:32:33.000000000 -0500 @@ -1,8 +1,5 @@ TEMPLATE = subdirs SUBDIRS = linguist \ @@ -796,8 +631,9 @@ lrelease \ lupdate \ qm2ts ---- qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/linguist/lrelease/lrelease.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro +--- 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-15 13:32:33.000000000 -0500 @@ -15,3 +15,6 @@ target.path=$$bins.path @@ -805,8 +641,9 @@ + +QMAKE_CFLAGS += -mdynamic-no-pic +QMAKE_CXXFLAGS += -mdynamic-no-pic ---- qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/linguist/lupdate/lupdate.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro +--- 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-15 13:32:33.000000000 -0500 @@ -19,3 +19,7 @@ target.path=$$bins.path @@ -815,8 +652,9 @@ +macx:CFLAGS += -mdynamic-no-pic +macx:CXXFLAGS += -mdynamic-no-pic + ---- qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.5-new/tools/linguist/qm2ts/qm2ts.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro +--- 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-15 13:32:33.000000000 -0500 @@ -13,3 +13,6 @@ target.path=$$bins.path @@ -824,8 +662,9 @@ + +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic ---- qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400 -+++ qt-x11-free-3.3.5-new/tools/qtconfig/qtconfig.pro 2006-02-11 11:24:11.000000000 -0500 +diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro +--- 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-15 13:32:33.000000000 -0500 @@ -15,4 +15,7 @@ INSTALLS += target INCLUDEPATH += . @@ -834,15 +673,3 @@ +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic REQUIRES=full-config nocrosscompiler !win32* ---- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig 2006-03-02 00:21:49.000000000 -0500 -+++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp 2006-03-02 00:22:47.000000000 -0500 -@@ -2670,6 +2670,9 @@ - - void QWidget::createInputContext() - { -+ if( !isInputMethodEnabled() || QApplication::closingDown() ) -+ return; -+ - QWidget *tlw = topLevelWidget(); - QTLWExtra *topdata = tlw->topData(); - ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits