Update of /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16318/10.4/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
qt3 using native dlcompat
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt3.info 10 Mar 2005 14:59:40 -0000 1.3
+++ qt3.info 17 Mar 2005 20:13:50 -0000 1.4
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.4
-Revision: 21
+Revision: 22
GCC: 3.3
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qt3.patch 31 Jan 2005 23:12:56 -0000 1.6
+++ qt3.patch 17 Mar 2005 20:13:50 -0000 1.7
@@ -1,6 +1,6 @@
diff -uNr qt-x11-free-3.3.4/Makefile qt-x11-free-3.3.4-new/Makefile
--- qt-x11-free-3.3.4/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.4-new/Makefile 2005-01-31 10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/Makefile 2005-03-17 13:50:52.000000000 -0500
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -12,7 +12,7 @@
@echo "The Qt examples are built in the directories in ./examples"
diff -uNr qt-x11-free-3.3.4/configure qt-x11-free-3.3.4-new/configure
--- qt-x11-free-3.3.4/configure 2004-10-18 13:17:00.000000000 -0400
-+++ qt-x11-free-3.3.4-new/configure 2005-01-31 10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/configure 2005-03-17 13:50:52.000000000 -0500
@@ -1046,8 +1046,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
@@ -26,7 +26,7 @@
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
diff -uNr qt-x11-free-3.3.4/include/qdragobject.h
qt-x11-free-3.3.4-new/include/qdragobject.h
--- qt-x11-free-3.3.4/include/qdragobject.h 2005-01-21 12:16:16.000000000
-0500
-+++ qt-x11-free-3.3.4-new/include/qdragobject.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/include/qdragobject.h 2005-03-17
13:50:53.000000000 -0500
@@ -245,10 +245,11 @@
void move( const QPoint & );
void drop();
@@ -42,7 +42,7 @@
QWidget * dragSource;
diff -uNr qt-x11-free-3.3.4/include/qglobal.h
qt-x11-free-3.3.4-new/include/qglobal.h
--- qt-x11-free-3.3.4/include/qglobal.h 2005-01-21 12:16:04.000000000
-0500
-+++ qt-x11-free-3.3.4-new/include/qglobal.h 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/include/qglobal.h 2005-03-17 13:50:53.000000000
-0500
@@ -44,6 +44,10 @@
*/
#define QT_VERSION 0x030304
@@ -65,7 +65,7 @@
# error "Qt requires Win32 and does not work with Windows 3.x"
diff -uNr qt-x11-free-3.3.4/include/qiconview.h
qt-x11-free-3.3.4-new/include/qiconview.h
--- qt-x11-free-3.3.4/include/qiconview.h 2005-01-21 12:16:07.000000000
-0500
-+++ qt-x11-free-3.3.4-new/include/qiconview.h 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/include/qiconview.h 2005-03-17 13:50:53.000000000
-0500
@@ -496,6 +496,8 @@
const QPoint &relativeTo,
const QIconViewItem *item ) const;
@@ -77,7 +77,7 @@
diff -uNr qt-x11-free-3.3.4/include/qprogressbar.h
qt-x11-free-3.3.4-new/include/qprogressbar.h
--- qt-x11-free-3.3.4/include/qprogressbar.h 2005-01-21 12:16:22.000000000
-0500
-+++ qt-x11-free-3.3.4-new/include/qprogressbar.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/include/qprogressbar.h 2005-03-17
13:50:53.000000000 -0500
@@ -61,6 +61,7 @@
public:
QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
@@ -96,7 +96,7 @@
int total_steps;
diff -uNr qt-x11-free-3.3.4/include/qvaluelist.h
qt-x11-free-3.3.4-new/include/qvaluelist.h
--- qt-x11-free-3.3.4/include/qvaluelist.h 2005-01-21 12:16:04.000000000
-0500
-+++ qt-x11-free-3.3.4-new/include/qvaluelist.h 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/include/qvaluelist.h 2005-03-17 13:50:53.000000000
-0500
@@ -638,13 +638,11 @@
l.clear();
Q_UINT32 c;
@@ -114,7 +114,7 @@
}
diff -uNr qt-x11-free-3.3.4/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qmake.conf
--- qt-x11-free-3.3.4/mkspecs/darwin-g++/qmake.conf 2005-01-21
12:16:43.000000000 -0500
-+++ qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qmake.conf 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qmake.conf 2005-03-17
13:50:53.000000000 -0500
@@ -9,19 +9,19 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -209,7 +209,7 @@
+QMAKE_MKDIR = /bin/mkdir -p
diff -uNr qt-x11-free-3.3.4/mkspecs/darwin-g++/qplatformdefs.h
qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qplatformdefs.h
--- qt-x11-free-3.3.4/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27
11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qplatformdefs.h 2005-01-31
10:10:01.000000000 -0500
++++ qt-x11-free-3.3.4-new/mkspecs/darwin-g++/qplatformdefs.h 2005-03-17
13:50:53.000000000 -0500
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -227,7 +227,7 @@
#endif // QPLATFORMDEFS_H
diff -uNr qt-x11-free-3.3.4/mkspecs/linux-g++/qplatformdefs.h
qt-x11-free-3.3.4-new/mkspecs/linux-g++/qplatformdefs.h
--- qt-x11-free-3.3.4/mkspecs/linux-g++/qplatformdefs.h 2003-05-27
11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.4-new/mkspecs/linux-g++/qplatformdefs.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/mkspecs/linux-g++/qplatformdefs.h 2005-03-17
13:50:53.000000000 -0500
@@ -102,5 +102,6 @@
#define QT_VSNPRINTF ::vsnprintf
#endif
@@ -237,7 +237,7 @@
#endif // QPLATFORMDEFS_H
diff -uNr qt-x11-free-3.3.4/qmake/Makefile.unix
qt-x11-free-3.3.4-new/qmake/Makefile.unix
--- qt-x11-free-3.3.4/qmake/Makefile.unix 2004-09-13 14:24:42.000000000
-0400
-+++ qt-x11-free-3.3.4-new/qmake/Makefile.unix 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/qmake/Makefile.unix 2005-03-17 13:50:53.000000000
-0500
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
[EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL
PROTECTED]@/include \
@@ -251,7 +251,7 @@
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
diff -uNr qt-x11-free-3.3.4/qmake/main.cpp qt-x11-free-3.3.4-new/qmake/main.cpp
--- qt-x11-free-3.3.4/qmake/main.cpp 2005-01-21 12:16:26.000000000 -0500
-+++ qt-x11-free-3.3.4-new/qmake/main.cpp 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/qmake/main.cpp 2005-03-17 13:50:53.000000000
-0500
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -263,7 +263,7 @@
#endif
diff -uNr qt-x11-free-3.3.4/src/iconview/qiconview.cpp
qt-x11-free-3.3.4-new/src/iconview/qiconview.cpp
--- qt-x11-free-3.3.4/src/iconview/qiconview.cpp 2005-01-21
12:16:07.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/iconview/qiconview.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/iconview/qiconview.cpp 2005-03-17
13:50:53.000000000 -0500
@@ -236,6 +236,7 @@
QPoint dragStartPos;
QFontMetrics *fm;
@@ -530,7 +530,7 @@
#endif // QT_NO_ICONVIEW
diff -uNr qt-x11-free-3.3.4/src/iconview/qiconview.h
qt-x11-free-3.3.4-new/src/iconview/qiconview.h
--- qt-x11-free-3.3.4/src/iconview/qiconview.h 2005-01-21 12:16:07.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/iconview/qiconview.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/iconview/qiconview.h 2005-03-17
13:50:53.000000000 -0500
@@ -496,6 +496,8 @@
const QPoint &relativeTo,
const QIconViewItem *item ) const;
@@ -542,7 +542,7 @@
diff -uNr qt-x11-free-3.3.4/src/kernel/qapplication_x11.cpp
qt-x11-free-3.3.4-new/src/kernel/qapplication_x11.cpp
--- qt-x11-free-3.3.4/src/kernel/qapplication_x11.cpp 2005-01-21
12:16:10.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qapplication_x11.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qapplication_x11.cpp 2005-03-17
13:50:53.000000000 -0500
@@ -3405,10 +3405,23 @@
// update the size for desktop widget
@@ -637,7 +637,7 @@
d->error = (! d->release || event->xkey.time - d->timestamp > 10);
diff -uNr qt-x11-free-3.3.4/src/kernel/qclipboard_x11.cpp
qt-x11-free-3.3.4-new/src/kernel/qclipboard_x11.cpp
--- qt-x11-free-3.3.4/src/kernel/qclipboard_x11.cpp 2005-01-21
12:16:10.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qclipboard_x11.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qclipboard_x11.cpp 2005-03-17
13:50:53.000000000 -0500
@@ -109,6 +109,7 @@
static bool pending_clipboard_changed = FALSE;
static bool pending_selection_changed = FALSE;
@@ -679,7 +679,7 @@
if ( started > now ) // crossed midnight
diff -uNr qt-x11-free-3.3.4/src/kernel/qdesktopwidget_x11.cpp
qt-x11-free-3.3.4-new/src/kernel/qdesktopwidget_x11.cpp
--- qt-x11-free-3.3.4/src/kernel/qdesktopwidget_x11.cpp 2005-01-21
12:16:15.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qdesktopwidget_x11.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qdesktopwidget_x11.cpp 2005-03-17
13:50:53.000000000 -0500
@@ -44,6 +44,9 @@
// defined in qapplication_x11.cpp
extern Atom qt_net_workarea;
@@ -715,7 +715,7 @@
rects[i].setRect(x, y, w, h);
diff -uNr qt-x11-free-3.3.4/src/kernel/qdnd_x11.cpp
qt-x11-free-3.3.4-new/src/kernel/qdnd_x11.cpp
--- qt-x11-free-3.3.4/src/kernel/qdnd_x11.cpp 2005-01-21 12:16:13.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qdnd_x11.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qdnd_x11.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -49,13 +49,15 @@
#include "qdragobject.h"
#include "qobjectlist.h"
@@ -996,7 +996,7 @@
#endif // QT_NO_DRAGANDDROP
diff -uNr qt-x11-free-3.3.4/src/kernel/qdragobject.cpp
qt-x11-free-3.3.4-new/src/kernel/qdragobject.cpp
--- qt-x11-free-3.3.4/src/kernel/qdragobject.cpp 2005-01-21
12:16:11.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qdragobject.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qdragobject.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -890,6 +890,16 @@
{
if(!e)
@@ -1016,7 +1016,7 @@
str = *e->cache.txt.str;
diff -uNr qt-x11-free-3.3.4/src/kernel/qdragobject.h
qt-x11-free-3.3.4-new/src/kernel/qdragobject.h
--- qt-x11-free-3.3.4/src/kernel/qdragobject.h 2005-01-21 12:16:16.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qdragobject.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qdragobject.h 2005-03-17
13:50:54.000000000 -0500
@@ -245,10 +245,11 @@
void move( const QPoint & );
void drop();
@@ -1032,7 +1032,7 @@
QWidget * dragSource;
diff -uNr qt-x11-free-3.3.4/src/kernel/qpixmap_x11.cpp
qt-x11-free-3.3.4-new/src/kernel/qpixmap_x11.cpp
--- qt-x11-free-3.3.4/src/kernel/qpixmap_x11.cpp 2005-01-21
12:16:11.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qpixmap_x11.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qpixmap_x11.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -37,7 +37,19 @@
// NOT REVISED
@@ -1905,7 +1905,7 @@
diff -uNr qt-x11-free-3.3.4/src/kernel/qpngio.cpp
qt-x11-free-3.3.4-new/src/kernel/qpngio.cpp
--- qt-x11-free-3.3.4/src/kernel/qpngio.cpp 2005-01-21 12:16:15.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qpngio.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qpngio.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -110,10 +110,18 @@
static
void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float
screen_gamma=0.0 )
@@ -1930,7 +1930,7 @@
png_uint_32 width;
diff -uNr qt-x11-free-3.3.4/src/kernel/qprocess_unix.cpp
qt-x11-free-3.3.4-new/src/kernel/qprocess_unix.cpp
--- qt-x11-free-3.3.4/src/kernel/qprocess_unix.cpp 2005-01-21
12:16:11.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/kernel/qprocess_unix.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/kernel/qprocess_unix.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -761,7 +761,7 @@
#endif
i++;
@@ -1987,7 +1987,7 @@
const QString mac_bundle_suffix = ".app/Contents/MacOS/";
diff -uNr qt-x11-free-3.3.4/src/moc/moc.pro
qt-x11-free-3.3.4-new/src/moc/moc.pro
--- qt-x11-free-3.3.4/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/moc/moc.pro 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/moc/moc.pro 2005-03-17 13:50:54.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
@@ -1997,9 +1997,32 @@
target.path=$$bins.path
INSTALLS += target
+diff -uNr qt-x11-free-3.3.4/src/network/qdns.cpp
qt-x11-free-3.3.4-new/src/network/qdns.cpp
+--- qt-x11-free-3.3.4/src/network/qdns.cpp 2005-01-21 12:16:09.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/network/qdns.cpp 2005-03-17 13:51:41.000000000
-0500
+@@ -76,7 +76,7 @@
+ #include "qcleanuphandler.h"
+ #include <limits.h>
+ #ifdef Q_OS_MAC
+-#include "../3rdparty/dlcompat/dlfcn.h"
++#include <dlfcn.h>
+ #endif
+
+ //#define QDNS_DEBUG
+diff -uNr qt-x11-free-3.3.4/src/qt_professional.pri
qt-x11-free-3.3.4-new/src/qt_professional.pri
+--- qt-x11-free-3.3.4/src/qt_professional.pri 2004-02-06 07:08:19.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/qt_professional.pri 2005-03-17
13:56:57.000000000 -0500
+@@ -25,7 +25,6 @@
+ unix {
+ NETWORK_H = $$NETWORK_CPP
+ }
+- mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
+ INCLUDEPATH += $$QT_SOURCE_TREE/src/network
+ include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
+ DEFINES *= QT_MODULE_NETWORK
diff -uNr qt-x11-free-3.3.4/src/qtmain.pro qt-x11-free-3.3.4-new/src/qtmain.pro
--- qt-x11-free-3.3.4/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/qtmain.pro 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/qtmain.pro 2005-03-17 13:50:54.000000000
-0500
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -2010,7 +2033,7 @@
CONFIG += qt staticlib warn_on release
diff -uNr qt-x11-free-3.3.4/src/tools/qdir_unix.cpp
qt-x11-free-3.3.4-new/src/tools/qdir_unix.cpp
--- qt-x11-free-3.3.4/src/tools/qdir_unix.cpp 2005-01-21 12:16:05.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qdir_unix.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qdir_unix.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -2022,7 +2045,7 @@
name = dirName.left( dirName.length() - 1 );
diff -uNr qt-x11-free-3.3.4/src/tools/qglobal.cpp
qt-x11-free-3.3.4-new/src/tools/qglobal.cpp
--- qt-x11-free-3.3.4/src/tools/qglobal.cpp 2005-01-21 12:16:06.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qglobal.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qglobal.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -2034,7 +2057,7 @@
diff -uNr qt-x11-free-3.3.4/src/tools/qglobal.h
qt-x11-free-3.3.4-new/src/tools/qglobal.h
--- qt-x11-free-3.3.4/src/tools/qglobal.h 2005-01-21 12:16:04.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qglobal.h 2005-01-31 10:07:36.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/tools/qglobal.h 2005-03-17 13:50:54.000000000
-0500
@@ -44,6 +44,10 @@
*/
#define QT_VERSION 0x030304
@@ -2057,7 +2080,7 @@
# error "Qt requires Win32 and does not work with Windows 3.x"
diff -uNr qt-x11-free-3.3.4/src/tools/qgpluginmanager.cpp
qt-x11-free-3.3.4-new/src/tools/qgpluginmanager.cpp
--- qt-x11-free-3.3.4/src/tools/qgpluginmanager.cpp 2005-01-21
12:16:04.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/tools/qgpluginmanager.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qgpluginmanager.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -2069,7 +2092,7 @@
QString filter = "*.sl";
diff -uNr qt-x11-free-3.3.4/src/tools/qlibrary.cpp
qt-x11-free-3.3.4-new/src/tools/qlibrary.cpp
--- qt-x11-free-3.3.4/src/tools/qlibrary.cpp 2005-01-21 12:16:04.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qlibrary.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qlibrary.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -401,7 +401,7 @@
filename += ".dll";
#else
@@ -2081,7 +2104,7 @@
filters << ".dylib"; //the last one is also the default one..
diff -uNr qt-x11-free-3.3.4/src/tools/qmutex_unix.cpp
qt-x11-free-3.3.4-new/src/tools/qmutex_unix.cpp
--- qt-x11-free-3.3.4/src/tools/qmutex_unix.cpp 2005-01-21
12:16:04.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/tools/qmutex_unix.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qmutex_unix.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -2093,7 +2116,7 @@
# if defined(QT_CHECK_RANGE)
diff -uNr qt-x11-free-3.3.4/src/tools/qstring.cpp
qt-x11-free-3.3.4-new/src/tools/qstring.cpp
--- qt-x11-free-3.3.4/src/tools/qstring.cpp 2005-01-21 12:16:05.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qstring.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qstring.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -2130,9 +2153,23 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
+diff -uNr qt-x11-free-3.3.4/src/tools/qt_tools.pri
qt-x11-free-3.3.4-new/src/tools/qt_tools.pri
+--- qt-x11-free-3.3.4/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000
-0500
++++ qt-x11-free-3.3.4-new/src/tools/qt_tools.pri 2005-03-17
13:53:38.000000000 -0500
+@@ -101,10 +101,6 @@
+ $$TOOLS_CPP/qwaitcondition_unix.cpp
+
+ mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
+- mac {
+- SOURCES+=3rdparty/dlcompat/dlfcn.c
+- INCLUDEPATH+=3rdparty/dlcompat
+- }
+ unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
+
+ SOURCES += $$TOOLS_CPP/qbitarray.cpp \
diff -uNr qt-x11-free-3.3.4/src/tools/qvaluelist.h
qt-x11-free-3.3.4-new/src/tools/qvaluelist.h
--- qt-x11-free-3.3.4/src/tools/qvaluelist.h 2005-01-21 12:16:04.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/tools/qvaluelist.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/tools/qvaluelist.h 2005-03-17
13:50:54.000000000 -0500
@@ -638,13 +638,11 @@
l.clear();
Q_UINT32 c;
@@ -2150,7 +2187,7 @@
}
diff -uNr qt-x11-free-3.3.4/src/widgets/qpopupmenu.cpp
qt-x11-free-3.3.4-new/src/widgets/qpopupmenu.cpp
--- qt-x11-free-3.3.4/src/widgets/qpopupmenu.cpp 2005-01-21
12:16:22.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/widgets/qpopupmenu.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/widgets/qpopupmenu.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -253,6 +253,8 @@
} scroll;
QSize calcSize;
@@ -2227,7 +2264,7 @@
diff -uNr qt-x11-free-3.3.4/src/widgets/qprogressbar.cpp
qt-x11-free-3.3.4-new/src/widgets/qprogressbar.cpp
--- qt-x11-free-3.3.4/src/widgets/qprogressbar.cpp 2005-01-21
12:16:22.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/widgets/qprogressbar.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/widgets/qprogressbar.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -47,6 +47,14 @@
#endif
#include <limits.h>
@@ -2326,7 +2363,7 @@
This method is called to generate the text displayed in the center
diff -uNr qt-x11-free-3.3.4/src/widgets/qprogressbar.h
qt-x11-free-3.3.4-new/src/widgets/qprogressbar.h
--- qt-x11-free-3.3.4/src/widgets/qprogressbar.h 2005-01-21
12:16:22.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/widgets/qprogressbar.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/widgets/qprogressbar.h 2005-03-17
13:50:54.000000000 -0500
@@ -61,6 +61,7 @@
public:
QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
@@ -2345,7 +2382,7 @@
int total_steps;
diff -uNr qt-x11-free-3.3.4/src/widgets/qscrollview.cpp
qt-x11-free-3.3.4-new/src/widgets/qscrollview.cpp
--- qt-x11-free-3.3.4/src/widgets/qscrollview.cpp 2005-01-21
12:16:23.000000000 -0500
-+++ qt-x11-free-3.3.4-new/src/widgets/qscrollview.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/widgets/qscrollview.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -1180,7 +1180,7 @@
void QScrollView::wheelEvent( QWheelEvent *e )
{
@@ -2376,7 +2413,7 @@
e->accept();
diff -uNr qt-x11-free-3.3.4/src/widgets/qtoolbar.cpp
qt-x11-free-3.3.4-new/src/widgets/qtoolbar.cpp
--- qt-x11-free-3.3.4/src/widgets/qtoolbar.cpp 2005-01-21 12:16:21.000000000
-0500
-+++ qt-x11-free-3.3.4-new/src/widgets/qtoolbar.cpp 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/src/widgets/qtoolbar.cpp 2005-03-17
13:50:54.000000000 -0500
@@ -648,7 +648,7 @@
QString s = b->textLabel();
if ( s.isEmpty() )
@@ -2388,7 +2425,7 @@
id = d->extensionPopup->insertItem( b->iconSet(), s, b,
SLOT( emulateClick() ) ) ;
diff -uNr qt-x11-free-3.3.4/tools/assistant/assistant.pro
qt-x11-free-3.3.4-new/tools/assistant/assistant.pro
--- qt-x11-free-3.3.4/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/assistant/assistant.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/assistant/assistant.pro 2005-03-17
13:50:54.000000000 -0500
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -2400,7 +2437,7 @@
INSTALLS += target
diff -uNr qt-x11-free-3.3.4/tools/designer/app/app.pro
qt-x11-free-3.3.4-new/tools/designer/app/app.pro
--- qt-x11-free-3.3.4/tools/designer/app/app.pro 2004-01-16
19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/app/app.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/app/app.pro 2005-03-17
13:50:54.000000000 -0500
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -2413,7 +2450,7 @@
INSTALLS += target
diff -uNr qt-x11-free-3.3.4/tools/designer/designer/designer.pro
qt-x11-free-3.3.4-new/tools/designer/designer/designer.pro
--- qt-x11-free-3.3.4/tools/designer/designer/designer.pro 2004-07-29
09:09:50.000000000 -0400
-+++ qt-x11-free-3.3.4-new/tools/designer/designer/designer.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/designer/designer.pro 2005-03-17
13:50:54.000000000 -0500
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -2424,7 +2461,7 @@
CONFIG -= staticlib
diff -uNr qt-x11-free-3.3.4/tools/designer/designer/hierarchyview.cpp
qt-x11-free-3.3.4-new/tools/designer/designer/hierarchyview.cpp
--- qt-x11-free-3.3.4/tools/designer/designer/hierarchyview.cpp
2003-12-05 07:47:56.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/designer/hierarchyview.cpp
2005-01-31 10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/designer/hierarchyview.cpp
2005-03-17 13:50:54.000000000 -0500
@@ -605,6 +605,7 @@
formWindow->mainWindow()->setupTabWidgetHierarchyMenu(
this, SLOT( addTabPage() ),
@@ -2435,7 +2472,7 @@
}
diff -uNr qt-x11-free-3.3.4/tools/designer/designer/mainwindow.cpp
qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.cpp
--- qt-x11-free-3.3.4/tools/designer/designer/mainwindow.cpp 2005-01-21
07:50:19.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.cpp
2005-01-31 10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.cpp
2005-03-17 13:50:54.000000000 -0500
@@ -2457,8 +2457,8 @@
{
QPopupMenu *menu = new QPopupMenu( parent );
@@ -2449,7 +2486,7 @@
actionEditCopy->addTo( menu );
diff -uNr qt-x11-free-3.3.4/tools/designer/designer/mainwindow.h
qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.h
--- qt-x11-free-3.3.4/tools/designer/designer/mainwindow.h 2005-01-21
07:43:42.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.h 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/designer/mainwindow.h 2005-03-17
13:50:54.000000000 -0500
@@ -107,6 +107,7 @@
QPopupMenu *setupNormalHierarchyMenu( QWidget *parent );
@@ -2460,7 +2497,7 @@
bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
diff -uNr qt-x11-free-3.3.4/tools/designer/editor/editor.pro
qt-x11-free-3.3.4-new/tools/designer/editor/editor.pro
--- qt-x11-free-3.3.4/tools/designer/editor/editor.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/editor/editor.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/editor/editor.pro 2005-03-17
13:50:55.000000000 -0500
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -2470,7 +2507,7 @@
parenmatcher.h \
diff -uNr qt-x11-free-3.3.4/tools/designer/uic/uic.pro
qt-x11-free-3.3.4-new/tools/designer/uic/uic.pro
--- qt-x11-free-3.3.4/tools/designer/uic/uic.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/designer/uic/uic.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/designer/uic/uic.pro 2005-03-17
13:50:55.000000000 -0500
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -2480,7 +2517,7 @@
+
diff -uNr qt-x11-free-3.3.4/tools/linguist/linguist/linguist.pro
qt-x11-free-3.3.4-new/tools/linguist/linguist/linguist.pro
--- qt-x11-free-3.3.4/tools/linguist/linguist/linguist.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/linguist/linguist/linguist.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/linguist/linguist/linguist.pro 2005-03-17
13:50:55.000000000 -0500
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -2492,7 +2529,7 @@
diff -uNr qt-x11-free-3.3.4/tools/linguist/linguist.pro
qt-x11-free-3.3.4-new/tools/linguist/linguist.pro
--- qt-x11-free-3.3.4/tools/linguist/linguist.pro 2004-06-08
04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.4-new/tools/linguist/linguist.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/linguist/linguist.pro 2005-03-17
13:50:55.000000000 -0500
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -2504,7 +2541,7 @@
qm2ts
diff -uNr qt-x11-free-3.3.4/tools/linguist/lrelease/lrelease.pro
qt-x11-free-3.3.4-new/tools/linguist/lrelease/lrelease.pro
--- qt-x11-free-3.3.4/tools/linguist/lrelease/lrelease.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/linguist/lrelease/lrelease.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/linguist/lrelease/lrelease.pro 2005-03-17
13:50:55.000000000 -0500
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -2514,7 +2551,7 @@
+QMAKE_CXXFLAGS += -mdynamic-no-pic
diff -uNr qt-x11-free-3.3.4/tools/linguist/lupdate/lupdate.pro
qt-x11-free-3.3.4-new/tools/linguist/lupdate/lupdate.pro
--- qt-x11-free-3.3.4/tools/linguist/lupdate/lupdate.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/linguist/lupdate/lupdate.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/linguist/lupdate/lupdate.pro 2005-03-17
13:50:55.000000000 -0500
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -2525,7 +2562,7 @@
+
diff -uNr qt-x11-free-3.3.4/tools/linguist/qm2ts/qm2ts.pro
qt-x11-free-3.3.4-new/tools/linguist/qm2ts/qm2ts.pro
--- qt-x11-free-3.3.4/tools/linguist/qm2ts/qm2ts.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.4-new/tools/linguist/qm2ts/qm2ts.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/linguist/qm2ts/qm2ts.pro 2005-03-17
13:50:55.000000000 -0500
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -2535,7 +2572,7 @@
+CXXFLAGS += -mdynamic-no-pic
diff -uNr qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.4-new/tools/qtconfig/qtconfig.pro
--- qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro 2004-06-08
04:08:54.000000000 -0400
-+++ qt-x11-free-3.3.4-new/tools/qtconfig/qtconfig.pro 2005-01-31
10:07:36.000000000 -0500
++++ qt-x11-free-3.3.4-new/tools/qtconfig/qtconfig.pro 2005-03-17
13:50:55.000000000 -0500
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
