Update of /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/10.3/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
new i18n, buncha un-built updates
Index: qt3.info
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- qt3.info 21 Aug 2004 23:05:12 -0000 1.12
+++ qt3.info 27 Aug 2004 17:54:40 -0000 1.13
@@ -1,14 +1,14 @@
Package: qt3
-Version: 3.3.2
-Revision: 22
+Version: 3.3.3
+Revision: 21
GCC: 3.3
Source: mirror:sourceforge:fink/qt-x11-free-%v.tar.bz2
-Source-MD5: 903cad618274ad84d7d13fd0027a6c3c
+Source-MD5: 3e0a0c8429b0a974b39b5f535ddff01c
SourceDirectory: qt-x11-free-%v
Description: Cross-Platform GUI application framework
Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r), %N-doc
(>= %v-%r), pkgconfig
Suggests: libpng3, libjpeg
-BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, fink (>= 0.17.3-1),
libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, mysql12-dev, postgresql74-dev |
postgresql74-ssl-dev, unixodbc2 | unixodbc2-nox, x11-dev
+BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, fink (>= 0.17.3-1),
libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, mysql12-dev, postgresql74-dev |
postgresql74-ssl-dev, x11-dev
Replaces: qt, qt2, %N-doc, %N-bin, %N-dev
Conflicts: qt, qt2
Provides: %N-bin
@@ -80,7 +80,7 @@
-qt-gif -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng \
-system-libpng -system-libjpeg -system-zlib -largefile \
-sm -xinerama -xrender -xft -xkb \
- -plugin-sql-mysql -plugin-sql-odbc -plugin-sql-psql -plugin-sql-sqlite
+ -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite
find . -name Makefile -print | xargs perl -pi.bak -e 's,-I%p/include/qt,,g'
make symlinks src-qmake src-moc sub-src sub-tools
@@ -179,7 +179,7 @@
Suggests: %N-designer, %N-linguist, %N-doc
Replaces: qt-shlibs, qt
Conflicts: qt-shlibs, qt
- Depends: fink (>= 0.17.1-1), libgl-shlibs, libpng3-shlibs (>= 1.2.5-4),
libjpeg-shlibs, mysql12-shlibs, postgresql74-shlibs | postgresql74-ssl-shlibs,
unixodbc2-shlibs | unixodbc2-nox-shlibs, x11-shlibs
+ Depends: fink (>= 0.17.1-1), libgl-shlibs, libpng3-shlibs (>= 1.2.5-4),
libjpeg-shlibs, mysql12-shlibs, postgresql74-shlibs | postgresql74-ssl-shlibs,
x11-shlibs
Shlibs: <<
%p/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.2-1)
%p/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.2-1)
Index: qt3.patch
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- qt3.patch 1 Jul 2004 16:59:23 -0000 1.9
+++ qt3.patch 27 Aug 2004 17:54:40 -0000 1.10
@@ -1,6 +1,6 @@
-diff -uNr qt-x11-free-3.3.2/Makefile qt-x11-free-3.3.2-new/Makefile
---- qt-x11-free-3.3.2/Makefile Mon Aug 11 10:37:25 2003
-+++ qt-x11-free-3.3.2-new/Makefile Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/Makefile qt-x11-free-3.3.3-patched/Makefile
+--- qt-x11-free-3.3.3/Makefile Mon Aug 11 10:37:25 2003
++++ qt-x11-free-3.3.3-patched/Makefile Sun Aug 15 17:11:32 2004
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -10,10 +10,10 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
-diff -uNr qt-x11-free-3.3.2/configure qt-x11-free-3.3.2-new/configure
---- qt-x11-free-3.3.2/configure Wed Mar 31 11:40:12 2004
-+++ qt-x11-free-3.3.2-new/configure Thu Jun 24 11:30:21 2004
-@@ -1023,8 +1023,8 @@
+diff -uNr qt-x11-free-3.3.3/configure qt-x11-free-3.3.3-patched/configure
+--- qt-x11-free-3.3.3/configure Mon Jun 14 05:18:55 2004
++++ qt-x11-free-3.3.3-patched/configure Sun Aug 15 17:11:32 2004
+@@ -1045,8 +1045,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
@@ -24,9 +24,9 @@
# generate qconfig.cpp
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-diff -uNr qt-x11-free-3.3.2/include/qglobal.h qt-x11-free-3.3.2-new/include/qglobal.h
---- qt-x11-free-3.3.2/include/qglobal.h Mon Apr 19 05:35:55 2004
-+++ qt-x11-free-3.3.2-new/include/qglobal.h Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/include/qglobal.h
qt-x11-free-3.3.3-patched/include/qglobal.h
+--- qt-x11-free-3.3.3/include/qglobal.h Thu Aug 5 10:41:56 2004
++++ qt-x11-free-3.3.3-patched/include/qglobal.h Sun Aug 15 17:11:32 2004
@@ -79,6 +79,10 @@
UNIX - Any UNIX BSD/SYSV system
*/
@@ -37,7 +37,7 @@
+
#if defined(__DARWIN_X11__)
# define Q_OS_DARWIN
- #elif defined(__APPLE__) && defined(__GNUC__)
+ #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__))
@@ -545,6 +549,8 @@
#if defined(Q_OS_MAC9)
@@ -47,9 +47,9 @@
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
-diff -uNr qt-x11-free-3.3.2/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.3.2-new/mkspecs/darwin-g++/qmake.conf
---- qt-x11-free-3.3.2/mkspecs/darwin-g++/qmake.conf Mon Apr 19 05:36:44 2004
-+++ qt-x11-free-3.3.2-new/mkspecs/darwin-g++/qmake.conf Thu Jun 24 11:30:36
2004
+diff -uNr qt-x11-free-3.3.3/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.3.3-patched/mkspecs/darwin-g++/qmake.conf
+--- qt-x11-free-3.3.3/mkspecs/darwin-g++/qmake.conf Thu Aug 5 10:42:57 2004
++++ qt-x11-free-3.3.3-patched/mkspecs/darwin-g++/qmake.conf Sun Aug 15 17:11:32
2004
@@ -9,19 +9,19 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -133,9 +133,9 @@
QMAKE_AR = ar cq
QMAKE_RANLIB = ranlib -s
-diff -uNr qt-x11-free-3.3.2/qmake/Makefile.unix
qt-x11-free-3.3.2-new/qmake/Makefile.unix
---- qt-x11-free-3.3.2/qmake/Makefile.unix Thu Nov 13 15:38:03 2003
-+++ qt-x11-free-3.3.2-new/qmake/Makefile.unix Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/qmake/Makefile.unix
qt-x11-free-3.3.3-patched/qmake/Makefile.unix
+--- qt-x11-free-3.3.3/qmake/Makefile.unix Wed Jun 2 18:24:30 2004
++++ qt-x11-free-3.3.3-patched/qmake/Makefile.unix Sun Aug 15 17:11:32 2004
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
[EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL
PROTECTED]@/include \
@@ -147,9 +147,9 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
-diff -uNr qt-x11-free-3.3.2/qmake/main.cpp qt-x11-free-3.3.2-new/qmake/main.cpp
---- qt-x11-free-3.3.2/qmake/main.cpp Mon Apr 19 05:36:24 2004
-+++ qt-x11-free-3.3.2-new/qmake/main.cpp Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/qmake/main.cpp qt-x11-free-3.3.3-patched/qmake/main.cpp
+--- qt-x11-free-3.3.3/qmake/main.cpp Thu Aug 5 10:42:29 2004
++++ qt-x11-free-3.3.3-patched/qmake/main.cpp Sun Aug 15 17:11:32 2004
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -159,9 +159,9 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
-diff -uNr qt-x11-free-3.3.2/src/kernel/qprocess_unix.cpp
qt-x11-free-3.3.2-new/src/kernel/qprocess_unix.cpp
---- qt-x11-free-3.3.2/src/kernel/qprocess_unix.cpp Mon Apr 19 05:36:04 2004
-+++ qt-x11-free-3.3.2-new/src/kernel/qprocess_unix.cpp Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/kernel/qprocess_unix.cpp
qt-x11-free-3.3.3-patched/src/kernel/qprocess_unix.cpp
+--- qt-x11-free-3.3.3/src/kernel/qprocess_unix.cpp Thu Aug 5 10:42:05 2004
++++ qt-x11-free-3.3.3-patched/src/kernel/qprocess_unix.cpp Sun Aug 15 17:11:32
2004
@@ -761,7 +761,7 @@
#endif
i++;
@@ -216,9 +216,9 @@
if(!QFile::exists(arglist[0])) {
QString command = arglist[0];
const QString mac_bundle_suffix = ".app/Contents/MacOS/";
-diff -uNr qt-x11-free-3.3.2/src/moc/moc.pro qt-x11-free-3.3.2-new/src/moc/moc.pro
---- qt-x11-free-3.3.2/src/moc/moc.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/src/moc/moc.pro Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/moc/moc.pro qt-x11-free-3.3.3-patched/src/moc/moc.pro
+--- qt-x11-free-3.3.3/src/moc/moc.pro Fri Oct 31 09:36:28 2003
++++ qt-x11-free-3.3.3-patched/src/moc/moc.pro Sun Aug 15 17:11:33 2004
@@ -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
@@ -228,9 +228,9 @@
target.path=$$bins.path
INSTALLS += target
-diff -uNr qt-x11-free-3.3.2/src/qtmain.pro qt-x11-free-3.3.2-new/src/qtmain.pro
---- qt-x11-free-3.3.2/src/qtmain.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/src/qtmain.pro Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/qtmain.pro qt-x11-free-3.3.3-patched/src/qtmain.pro
+--- qt-x11-free-3.3.3/src/qtmain.pro Fri Oct 31 09:36:28 2003
++++ qt-x11-free-3.3.3-patched/src/qtmain.pro Sun Aug 15 17:11:33 2004
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -239,9 +239,9 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
-diff -uNr qt-x11-free-3.3.2/src/tools/qdir_unix.cpp
qt-x11-free-3.3.2-new/src/tools/qdir_unix.cpp
---- qt-x11-free-3.3.2/src/tools/qdir_unix.cpp Mon Apr 19 05:35:56 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qdir_unix.cpp Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/tools/qdir_unix.cpp
qt-x11-free-3.3.3-patched/src/tools/qdir_unix.cpp
+--- qt-x11-free-3.3.3/src/tools/qdir_unix.cpp Thu Aug 5 10:41:57 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qdir_unix.cpp Sun Aug 15 17:11:33 2004
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -251,9 +251,9 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
-diff -uNr qt-x11-free-3.3.2/src/tools/qglobal.h
qt-x11-free-3.3.2-new/src/tools/qglobal.h
---- qt-x11-free-3.3.2/src/tools/qglobal.h Mon Apr 19 05:35:55 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qglobal.h Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/tools/qglobal.h
qt-x11-free-3.3.3-patched/src/tools/qglobal.h
+--- qt-x11-free-3.3.3/src/tools/qglobal.h Thu Aug 5 10:41:56 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qglobal.h Sun Aug 15 17:11:33 2004
@@ -79,6 +79,10 @@
UNIX - Any UNIX BSD/SYSV system
*/
@@ -264,7 +264,7 @@
+
#if defined(__DARWIN_X11__)
# define Q_OS_DARWIN
- #elif defined(__APPLE__) && defined(__GNUC__)
+ #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__))
@@ -545,6 +549,8 @@
#if defined(Q_OS_MAC9)
@@ -274,9 +274,9 @@
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
-diff -uNr qt-x11-free-3.3.2/src/tools/qgpluginmanager.cpp
qt-x11-free-3.3.2-new/src/tools/qgpluginmanager.cpp
---- qt-x11-free-3.3.2/src/tools/qgpluginmanager.cpp Mon Apr 19 05:35:56 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qgpluginmanager.cpp Thu Jun 24 11:30:21
2004
+diff -uNr qt-x11-free-3.3.3/src/tools/qgpluginmanager.cpp
qt-x11-free-3.3.3-patched/src/tools/qgpluginmanager.cpp
+--- qt-x11-free-3.3.3/src/tools/qgpluginmanager.cpp Thu Aug 5 10:41:56 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qgpluginmanager.cpp Sun Aug 15 17:11:33
2004
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -286,9 +286,9 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
-diff -uNr qt-x11-free-3.3.2/src/tools/qlibrary.cpp
qt-x11-free-3.3.2-new/src/tools/qlibrary.cpp
---- qt-x11-free-3.3.2/src/tools/qlibrary.cpp Mon Apr 19 05:35:55 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qlibrary.cpp Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/tools/qlibrary.cpp
qt-x11-free-3.3.3-patched/src/tools/qlibrary.cpp
+--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp Thu Aug 5 10:41:55 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qlibrary.cpp Sun Aug 15 17:11:33 2004
@@ -399,7 +399,7 @@
filename += ".dll";
#else
@@ -298,9 +298,9 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
-diff -uNr qt-x11-free-3.3.2/src/tools/qmutex_unix.cpp
qt-x11-free-3.3.2-new/src/tools/qmutex_unix.cpp
---- qt-x11-free-3.3.2/src/tools/qmutex_unix.cpp Mon Apr 19 05:35:55 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qmutex_unix.cpp Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/src/tools/qmutex_unix.cpp
qt-x11-free-3.3.3-patched/src/tools/qmutex_unix.cpp
+--- qt-x11-free-3.3.3/src/tools/qmutex_unix.cpp Thu Aug 5 10:41:56 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qmutex_unix.cpp Sun Aug 15 17:11:33
2004
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -310,10 +310,10 @@
// 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)
-diff -uNr qt-x11-free-3.3.2/src/tools/qstring.cpp
qt-x11-free-3.3.2-new/src/tools/qstring.cpp
---- qt-x11-free-3.3.2/src/tools/qstring.cpp Mon Apr 19 05:35:57 2004
-+++ qt-x11-free-3.3.2-new/src/tools/qstring.cpp Thu Jun 24 11:30:21 2004
-@@ -1359,7 +1359,7 @@
+diff -uNr qt-x11-free-3.3.3/src/tools/qstring.cpp
qt-x11-free-3.3.3-patched/src/tools/qstring.cpp
+--- qt-x11-free-3.3.3/src/tools/qstring.cpp Thu Aug 5 10:41:58 2004
++++ qt-x11-free-3.3.3-patched/src/tools/qstring.cpp Sun Aug 15 17:11:33 2004
+@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
QString::shared_null = new QStringData;
@@ -322,7 +322,7 @@
QString *that = const_cast<QString *>(&QString::null);
that->d = QString::shared_null;
#endif
-@@ -2916,7 +2916,7 @@
+@@ -2922,7 +2922,7 @@
if (!l)
return -1;
@@ -331,7 +331,7 @@
if ( sl == 1 )
return find( *str.unicode(), index, cs );
#endif
-@@ -3015,7 +3015,7 @@
+@@ -3021,7 +3021,7 @@
int QString::findRev( QChar c, int index, bool cs ) const
{
@@ -340,7 +340,7 @@
return findRev( QString( c ), index, cs );
#else
const uint l = length();
-@@ -3071,7 +3071,7 @@
+@@ -3077,7 +3077,7 @@
if ( index > delta )
index = delta;
@@ -349,9 +349,9 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
-diff -uNr qt-x11-free-3.3.2/tools/assistant/assistant.pro
qt-x11-free-3.3.2-new/tools/assistant/assistant.pro
---- qt-x11-free-3.3.2/tools/assistant/assistant.pro Mon Nov 17 07:40:25 2003
-+++ qt-x11-free-3.3.2-new/tools/assistant/assistant.pro Thu Jun 24 11:30:21
2004
+diff -uNr qt-x11-free-3.3.3/tools/assistant/assistant.pro
qt-x11-free-3.3.3-patched/tools/assistant/assistant.pro
+--- qt-x11-free-3.3.3/tools/assistant/assistant.pro Mon Nov 17 07:40:25 2003
++++ qt-x11-free-3.3.3-patched/tools/assistant/assistant.pro Sun Aug 15 17:11:33
2004
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -361,9 +361,9 @@
target.path = $$bins.path
INSTALLS += target
-diff -uNr qt-x11-free-3.3.2/tools/designer/app/app.pro
qt-x11-free-3.3.2-new/tools/designer/app/app.pro
---- qt-x11-free-3.3.2/tools/designer/app/app.pro Fri Jan 16 19:51:08 2004
-+++ qt-x11-free-3.3.2-new/tools/designer/app/app.pro Thu Jun 24 11:30:21 2004
+diff -uNr qt-x11-free-3.3.3/tools/designer/app/app.pro
qt-x11-free-3.3.3-patched/tools/designer/app/app.pro
+--- qt-x11-free-3.3.3/tools/designer/app/app.pro Fri Jan 16 19:51:08 2004
++++ qt-x11-free-3.3.3-patched/tools/designer/app/app.pro Sun Aug 15 17:11:33
2004
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -374,9 +374,9 @@
target.path=$$bins.path
INSTALLS += target
-diff -uNr qt-x11-free-3.3.2/tools/designer/designer/designer.pro
qt-x11-free-3.3.2-new/tools/designer/designer/designer.pro
---- qt-x11-free-3.3.2/tools/designer/designer/designer.pro Wed Mar 31 02:21:33
2004
-+++ qt-x11-free-3.3.2-new/tools/designer/designer/designer.pro Thu Jun 24 11:30:21
2004
+diff -uNr qt-x11-free-3.3.3/tools/designer/designer/designer.pro
qt-x11-free-3.3.3-patched/tools/designer/designer/designer.pro
+--- qt-x11-free-3.3.3/tools/designer/designer/designer.pro Thu Jul 29 09:09:50
2004
++++ qt-x11-free-3.3.3-patched/tools/designer/designer/designer.pro Sun Aug 15
17:11:33 2004
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -385,9 +385,9 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
-diff -uNr qt-x11-free-3.3.2/tools/designer/editor/editor.pro
qt-x11-free-3.3.2-new/tools/designer/editor/editor.pro
---- qt-x11-free-3.3.2/tools/designer/editor/editor.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/tools/designer/editor/editor.pro Thu Jun 24 11:30:22
2004
+diff -uNr qt-x11-free-3.3.3/tools/designer/editor/editor.pro
qt-x11-free-3.3.3-patched/tools/designer/editor/editor.pro
+--- qt-x11-free-3.3.3/tools/designer/editor/editor.pro Fri Oct 31 09:36:28 2003
++++ qt-x11-free-3.3.3-patched/tools/designer/editor/editor.pro Sun Aug 15 17:11:33
2004
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -395,9 +395,9 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
-diff -uNr qt-x11-free-3.3.2/tools/designer/uic/uic.pro
qt-x11-free-3.3.2-new/tools/designer/uic/uic.pro
---- qt-x11-free-3.3.2/tools/designer/uic/uic.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/tools/designer/uic/uic.pro Thu Jun 24 11:30:22 2004
+diff -uNr qt-x11-free-3.3.3/tools/designer/uic/uic.pro
qt-x11-free-3.3.3-patched/tools/designer/uic/uic.pro
+--- qt-x11-free-3.3.3/tools/designer/uic/uic.pro Fri Oct 31 09:36:28 2003
++++ qt-x11-free-3.3.3-patched/tools/designer/uic/uic.pro Sun Aug 15 17:11:33
2004
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -405,9 +405,9 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
-diff -uNr qt-x11-free-3.3.2/tools/linguist/linguist/linguist.pro
qt-x11-free-3.3.2-new/tools/linguist/linguist/linguist.pro
---- qt-x11-free-3.3.2/tools/linguist/linguist/linguist.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.2-new/tools/linguist/linguist/linguist.pro Thu Jun 24 11:30:22
2004
+diff -uNr qt-x11-free-3.3.3/tools/linguist/linguist/linguist.pro
qt-x11-free-3.3.3-patched/tools/linguist/linguist/linguist.pro
+--- qt-x11-free-3.3.3/tools/linguist/linguist/linguist.pro Fri Oct 31 09:36:28
2003
++++ qt-x11-free-3.3.3-patched/tools/linguist/linguist/linguist.pro Sun Aug 15
17:11:33 2004
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -417,9 +417,9 @@
PROJECTNAME = Qt Linguist
-diff -uNr qt-x11-free-3.3.2/tools/linguist/linguist.pro
qt-x11-free-3.3.2-new/tools/linguist/linguist.pro
---- qt-x11-free-3.3.2/tools/linguist/linguist.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/tools/linguist/linguist.pro Thu Jun 24 11:30:22 2004
+diff -uNr qt-x11-free-3.3.3/tools/linguist/linguist.pro
qt-x11-free-3.3.3-patched/tools/linguist/linguist.pro
+--- qt-x11-free-3.3.3/tools/linguist/linguist.pro Tue Jun 8 04:06:56 2004
++++ qt-x11-free-3.3.3-patched/tools/linguist/linguist.pro Sun Aug 15 17:11:33
2004
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -429,9 +429,9 @@
lrelease \
lupdate \
qm2ts
-diff -uNr qt-x11-free-3.3.2/tools/linguist/lrelease/lrelease.pro
qt-x11-free-3.3.2-new/tools/linguist/lrelease/lrelease.pro
---- qt-x11-free-3.3.2/tools/linguist/lrelease/lrelease.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.2-new/tools/linguist/lrelease/lrelease.pro Thu Jun 24 11:30:22
2004
+diff -uNr qt-x11-free-3.3.3/tools/linguist/lrelease/lrelease.pro
qt-x11-free-3.3.3-patched/tools/linguist/lrelease/lrelease.pro
+--- qt-x11-free-3.3.3/tools/linguist/lrelease/lrelease.pro Fri Oct 31 09:36:28
2003
++++ qt-x11-free-3.3.3-patched/tools/linguist/lrelease/lrelease.pro Sun Aug 15
17:11:33 2004
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -439,9 +439,9 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
-diff -uNr qt-x11-free-3.3.2/tools/linguist/lupdate/lupdate.pro
qt-x11-free-3.3.2-new/tools/linguist/lupdate/lupdate.pro
---- qt-x11-free-3.3.2/tools/linguist/lupdate/lupdate.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.2-new/tools/linguist/lupdate/lupdate.pro Thu Jun 24 11:30:22
2004
+diff -uNr qt-x11-free-3.3.3/tools/linguist/lupdate/lupdate.pro
qt-x11-free-3.3.3-patched/tools/linguist/lupdate/lupdate.pro
+--- qt-x11-free-3.3.3/tools/linguist/lupdate/lupdate.pro Fri Oct 31 09:36:28
2003
++++ qt-x11-free-3.3.3-patched/tools/linguist/lupdate/lupdate.pro Sun Aug 15
17:11:33 2004
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -450,9 +450,9 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
-diff -uNr qt-x11-free-3.3.2/tools/linguist/qm2ts/qm2ts.pro
qt-x11-free-3.3.2-new/tools/linguist/qm2ts/qm2ts.pro
---- qt-x11-free-3.3.2/tools/linguist/qm2ts/qm2ts.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/tools/linguist/qm2ts/qm2ts.pro Thu Jun 24 11:30:22
2004
+diff -uNr qt-x11-free-3.3.3/tools/linguist/qm2ts/qm2ts.pro
qt-x11-free-3.3.3-patched/tools/linguist/qm2ts/qm2ts.pro
+--- qt-x11-free-3.3.3/tools/linguist/qm2ts/qm2ts.pro Fri Oct 31 09:36:28 2003
++++ qt-x11-free-3.3.3-patched/tools/linguist/qm2ts/qm2ts.pro Sun Aug 15 17:11:33
2004
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -460,13 +460,14 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
-diff -uNr qt-x11-free-3.3.2/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.2-new/tools/qtconfig/qtconfig.pro
---- qt-x11-free-3.3.2/tools/qtconfig/qtconfig.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.2-new/tools/qtconfig/qtconfig.pro Thu Jun 24 11:30:22 2004
-@@ -15,3 +15,6 @@
+diff -uNr qt-x11-free-3.3.3/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.3-patched/tools/qtconfig/qtconfig.pro
+--- qt-x11-free-3.3.3/tools/qtconfig/qtconfig.pro Tue Jun 8 04:08:54 2004
++++ qt-x11-free-3.3.3-patched/tools/qtconfig/qtconfig.pro Sun Aug 15 17:11:33
2004
+@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
DBFILE = qtconfig.db
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+ REQUIRES=full-config nocrosscompiler
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
