Update of /cvsroot/fink/experimental/rangerrick/x11
In directory usw-pr-cvs1:/tmp/cvs-serv16620
Modified Files:
qt3-3.0.5-1.patch
Log Message:
whoo! builds on jag!
Index: qt3-3.0.5-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/rangerrick/x11/qt3-3.0.5-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt3-3.0.5-1.patch 23 Jul 2002 00:18:04 -0000 1.2
+++ qt3-3.0.5-1.patch 29 Jul 2002 22:00:15 -0000 1.3
@@ -1,6 +1,6 @@
diff -uNbr qt-x11-free-3.0.5/Makefile qt-x11-free-3.0.5-new/Makefile
---- qt-x11-free-3.0.5/Makefile Sun Mar 17 23:58:44 2002
-+++ qt-x11-free-3.0.5-new/Makefile Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/Makefile 2002-03-17 23:58:44.000000000 -0500
++++ qt-x11-free-3.0.5-new/Makefile 2002-07-29 15:34:05.000000000 -0500
@@ -11,11 +11,9 @@
install: FORCE
@$(MAKE) qt.install
@@ -15,8 +15,8 @@
@echo 'Note: be sure to set $$QTDIR to point to here or to wherever'
@echo ' you move these directories.'
diff -uNbr qt-x11-free-3.0.5/configure qt-x11-free-3.0.5-new/configure
---- qt-x11-free-3.0.5/configure Thu Jul 4 02:37:30 2002
-+++ qt-x11-free-3.0.5-new/configure Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/configure 2002-07-04 01:37:30.000000000 -0500
++++ qt-x11-free-3.0.5-new/configure 2002-07-29 15:34:05.000000000 -0500
@@ -961,7 +961,7 @@
case "$UNAME_SYSTEM:$UNAME_RELEASE" in
@@ -54,8 +54,8 @@
# avoid unecessary rebuilds by copying only if qconfig.h has changed
if cmp -s $outpath/include/qconfig.h $outpath/include/qconfig.h.new; then
diff -uNbr qt-x11-free-3.0.5/examples/demo/main.cpp
qt-x11-free-3.0.5-new/examples/demo/main.cpp
---- qt-x11-free-3.0.5/examples/demo/main.cpp Mon Jul 8 06:28:09 2002
-+++ qt-x11-free-3.0.5-new/examples/demo/main.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/examples/demo/main.cpp 2002-07-08 05:28:09.000000000 -0500
++++ qt-x11-free-3.0.5-new/examples/demo/main.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -50,7 +50,7 @@
#include "sql/sqlex.h"
#endif
@@ -75,13 +75,13 @@
#endif
for(int i = 1; i < argc-1; i++) {
diff -uNbr qt-x11-free-3.0.5/include/qconfig.h qt-x11-free-3.0.5-new/include/qconfig.h
---- qt-x11-free-3.0.5/include/qconfig.h Wed Dec 31 19:00:00 1969
-+++ qt-x11-free-3.0.5-new/include/qconfig.h Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/include/qconfig.h 1969-12-31 19:00:00.000000000 -0500
++++ qt-x11-free-3.0.5-new/include/qconfig.h 2002-07-29 15:34:05.000000000 -0500
@@ -0,0 +1 @@
+// All features enabled while configuring
diff -uNbr qt-x11-free-3.0.5/include/qglobal.h qt-x11-free-3.0.5-new/include/qglobal.h
---- qt-x11-free-3.0.5/include/qglobal.h Mon Jul 8 06:26:43 2002
-+++ qt-x11-free-3.0.5-new/include/qglobal.h Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/include/qglobal.h 2002-07-08 05:26:43.000000000 -0500
++++ qt-x11-free-3.0.5-new/include/qglobal.h 2002-07-29 15:34:05.000000000 -0500
@@ -79,7 +79,8 @@
*/
@@ -102,23 +102,24 @@
# endif
# endif
diff -uNbr qt-x11-free-3.0.5/include/qmodules.h
qt-x11-free-3.0.5-new/include/qmodules.h
---- qt-x11-free-3.0.5/include/qmodules.h Wed Dec 31 19:00:00 1969
-+++ qt-x11-free-3.0.5-new/include/qmodules.h Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/include/qmodules.h 1969-12-31 19:00:00.000000000 -0500
++++ qt-x11-free-3.0.5-new/include/qmodules.h 2002-07-29 15:34:05.000000000 -0500
@@ -0,0 +1 @@
+// All modules enabled while configuring
diff -uNbr qt-x11-free-3.0.5/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qmake.conf
---- qt-x11-free-3.0.5/mkspecs/darwin-g++/qmake.conf Mon Jul 8 06:28:02 2002
-+++ qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qmake.conf Sat Jul 20 13:45:13
2002
-@@ -13,7 +13,7 @@
+--- qt-x11-free-3.0.5/mkspecs/darwin-g++/qmake.conf 2002-07-08 05:28:02.000000000
+-0500
++++ qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qmake.conf 2002-07-29
+15:34:19.000000000 -0500
+@@ -13,14 +13,15 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -pipe
-+QMAKE_CFLAGS = -fPIC -fno-common -pipe -Ddlsym=dlsym_auto_underscore -O2
++QMAKE_CFLAGS = -fPIC -fno-common -pipe -Ddlsym=dlsym_auto_underscore
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-@@ -21,6 +21,7 @@
+-QMAKE_CFLAGS_RELEASE = -O3
++QMAKE_CFLAGS_RELEASE = -Os
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_EXTENSION_SHLIB = dylib
@@ -156,8 +157,8 @@
QMAKE_LIBS_QT = -lqt
QMAKE_LIBS_QT_THREAD = -lqt-mt
diff -uNbr qt-x11-free-3.0.5/mkspecs/darwin-g++/qplatformdefs.h
qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qplatformdefs.h
---- qt-x11-free-3.0.5/mkspecs/darwin-g++/qplatformdefs.h Sun Jun 9 02:37:53
2002
-+++ qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qplatformdefs.h Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/mkspecs/darwin-g++/qplatformdefs.h 2002-06-09
+01:37:53.000000000 -0500
++++ qt-x11-free-3.0.5-new/mkspecs/darwin-g++/qplatformdefs.h 2002-07-29
+15:34:05.000000000 -0500
@@ -41,7 +41,7 @@
#include <arpa/nameser.h>
#include <resolv.h>
@@ -168,8 +169,8 @@
#define QT_STATBUF4TSTAT struct stat
#define QT_STAT ::stat
diff -uNbr qt-x11-free-3.0.5/qmake/generators/unix/unixmake.cpp
qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake.cpp
---- qt-x11-free-3.0.5/qmake/generators/unix/unixmake.cpp Mon Jul 8 06:27:37
2002
-+++ qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake.cpp Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/qmake/generators/unix/unixmake.cpp 2002-07-08
+05:27:37.000000000 -0500
++++ qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -65,7 +65,7 @@
if(project->isEmpty("MAKEFILE"))
project->variables()["MAKEFILE"].append("Makefile");
@@ -203,8 +204,8 @@
if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" :
"DEFINES"].append("QT_THREAD_SUPPORT");
diff -uNbr qt-x11-free-3.0.5/qmake/generators/unix/unixmake2.cpp
qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake2.cpp
---- qt-x11-free-3.0.5/qmake/generators/unix/unixmake2.cpp Mon Jul 8 06:27:37
2002
-+++ qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake2.cpp Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/qmake/generators/unix/unixmake2.cpp 2002-07-08
+05:27:37.000000000 -0500
++++ qt-x11-free-3.0.5-new/qmake/generators/unix/unixmake2.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -916,6 +916,30 @@
project->first("VER_PAT"));
}
@@ -237,16 +238,16 @@
project->variables()["TARGET_"].append("lib" + project->first("TARGET") +
"." +
project->first("QMAKE_EXTENSION_SHLIB"));
diff -uNbr qt-x11-free-3.0.5/qt.csh qt-x11-free-3.0.5-new/qt.csh
---- qt-x11-free-3.0.5/qt.csh Wed Dec 31 19:00:00 1969
-+++ qt-x11-free-3.0.5-new/qt.csh Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/qt.csh 1969-12-31 19:00:00.000000000 -0500
++++ qt-x11-free-3.0.5-new/qt.csh 2002-07-29 15:34:05.000000000 -0500
@@ -0,0 +1,4 @@
+# qt.csh
+
+setenv QTDIR @PREFIX@
+setenv QMAKESPEC darwin-g++
diff -uNbr qt-x11-free-3.0.5/qt.sh qt-x11-free-3.0.5-new/qt.sh
---- qt-x11-free-3.0.5/qt.sh Wed Dec 31 19:00:00 1969
-+++ qt-x11-free-3.0.5-new/qt.sh Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/qt.sh 1969-12-31 19:00:00.000000000 -0500
++++ qt-x11-free-3.0.5-new/qt.sh 2002-07-29 15:34:05.000000000 -0500
@@ -0,0 +1,5 @@
+# qt.sh
+
@@ -254,8 +255,8 @@
+QMAKESPEC=darwin-g++
+export QTDIRa QMAKESPEC
diff -uNbr qt-x11-free-3.0.5/src/kernel/qprocess_unix.cpp
qt-x11-free-3.0.5-new/src/kernel/qprocess_unix.cpp
---- qt-x11-free-3.0.5/src/kernel/qprocess_unix.cpp Mon Jul 8 06:26:56 2002
-+++ qt-x11-free-3.0.5-new/src/kernel/qprocess_unix.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/kernel/qprocess_unix.cpp 2002-07-08 05:26:56.000000000
+-0500
++++ qt-x11-free-3.0.5-new/src/kernel/qprocess_unix.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -767,7 +767,7 @@
} else { // start process with environment settins as specified in env
// construct the environment for exec
@@ -266,8 +267,8 @@
#else
QString ld_library_path("LD_LIBRARY_PATH");
diff -uNbr qt-x11-free-3.0.5/src/tools/qdir_unix.cpp
qt-x11-free-3.0.5-new/src/tools/qdir_unix.cpp
---- qt-x11-free-3.0.5/src/tools/qdir_unix.cpp Mon Jul 8 06:26:44 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qdir_unix.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qdir_unix.cpp 2002-07-08 05:26:44.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/tools/qdir_unix.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -82,7 +82,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -278,8 +279,8 @@
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
diff -uNbr qt-x11-free-3.0.5/src/tools/qglobal.h
qt-x11-free-3.0.5-new/src/tools/qglobal.h
---- qt-x11-free-3.0.5/src/tools/qglobal.h Mon Jul 8 06:26:43 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qglobal.h Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qglobal.h 2002-07-08 05:26:43.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/tools/qglobal.h 2002-07-29 15:34:05.000000000 -0500
@@ -79,7 +79,7 @@
*/
@@ -290,8 +291,8 @@
# define Q_OS_MACX
#elif defined(macintosh)
diff -uNbr qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp
qt-x11-free-3.0.5-new/src/tools/qgpluginmanager.cpp
---- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp Mon Jul 8 06:26:43 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qgpluginmanager.cpp Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-07-08 05:26:43.000000000
+-0500
++++ qt-x11-free-3.0.5-new/src/tools/qgpluginmanager.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -330,6 +330,21 @@
// use QFileInfo::filePath() to correct backslashes to slashes
libList.append( QFileInfo( lib ).filePath() );
@@ -315,8 +316,8 @@
const QLibrary* QGPluginManager::library( const QString& feature ) const
diff -uNbr qt-x11-free-3.0.5/src/tools/qiodevice.cpp
qt-x11-free-3.0.5-new/src/tools/qiodevice.cpp
---- qt-x11-free-3.0.5/src/tools/qiodevice.cpp Mon Jul 8 06:26:42 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qiodevice.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qiodevice.cpp 2002-07-08 05:26:42.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/tools/qiodevice.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -591,7 +591,7 @@
return ba;
} else {
@@ -335,8 +336,8 @@
ba.resize( nread );
return ba;
diff -uNbr qt-x11-free-3.0.5/src/tools/qlibrary.cpp
qt-x11-free-3.0.5-new/src/tools/qlibrary.cpp
---- qt-x11-free-3.0.5/src/tools/qlibrary.cpp Mon Jul 8 06:26:42 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qlibrary.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qlibrary.cpp 2002-07-08 05:26:42.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/tools/qlibrary.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -328,10 +328,12 @@
#if defined(Q_WS_WIN)
if ( filename.find( ".dll", 0, FALSE ) == -1 )
@@ -353,8 +354,8 @@
const int x = filename.findRev( "/" );
if ( x != -1 ) {
diff -uNbr qt-x11-free-3.0.5/src/tools/qmutex_unix.cpp
qt-x11-free-3.0.5-new/src/tools/qmutex_unix.cpp
---- qt-x11-free-3.0.5/src/tools/qmutex_unix.cpp Mon Jul 8 06:26:43 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qmutex_unix.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qmutex_unix.cpp 2002-07-08 05:26:43.000000000
+-0500
++++ qt-x11-free-3.0.5-new/src/tools/qmutex_unix.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -76,7 +76,7 @@
// mutex types
@@ -365,8 +366,8 @@
# define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
# if defined(QT_CHECK_RANGE)
diff -uNbr qt-x11-free-3.0.5/src/tools/qregexp.cpp
qt-x11-free-3.0.5-new/src/tools/qregexp.cpp
---- qt-x11-free-3.0.5/src/tools/qregexp.cpp Mon Jul 8 06:26:46 2002
-+++ qt-x11-free-3.0.5-new/src/tools/qregexp.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/tools/qregexp.cpp 2002-07-08 05:26:46.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/tools/qregexp.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -2113,11 +2113,7 @@
mmInNextStack[mmNextStack[j]] = -1;
@@ -381,8 +382,8 @@
qSwap( mmCurStack, mmNextStack );
diff -uNbr qt-x11-free-3.0.5/src/widgets/qtoolbar.cpp
qt-x11-free-3.0.5-new/src/widgets/qtoolbar.cpp
---- qt-x11-free-3.0.5/src/widgets/qtoolbar.cpp Mon Jul 8 06:27:25 2002
-+++ qt-x11-free-3.0.5-new/src/widgets/qtoolbar.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/src/widgets/qtoolbar.cpp 2002-07-08 05:27:25.000000000 -0500
++++ qt-x11-free-3.0.5-new/src/widgets/qtoolbar.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -617,10 +617,14 @@
hide = FALSE;
QPoint p = w->parentWidget()->mapTo( this, w->geometry().bottomRight() );
@@ -401,8 +402,8 @@
}
if ( hide && !w->isHidden() ) {
diff -uNbr qt-x11-free-3.0.5/tools/assistant/main.cpp
qt-x11-free-3.0.5-new/tools/assistant/main.cpp
---- qt-x11-free-3.0.5/tools/assistant/main.cpp Wed Jun 26 06:51:21 2002
-+++ qt-x11-free-3.0.5-new/tools/assistant/main.cpp Sat Jul 20 13:42:28 2002
+--- qt-x11-free-3.0.5/tools/assistant/main.cpp 2002-06-26 05:51:21.000000000 -0500
++++ qt-x11-free-3.0.5-new/tools/assistant/main.cpp 2002-07-29 15:34:05.000000000
+-0500
@@ -203,7 +203,7 @@
mw->raise();
}
@@ -422,8 +423,8 @@
".." + QDir::separator());
setenv("QTDIR", qdir.latin1(), 0);
diff -uNbr qt-x11-free-3.0.5/tools/designer/designer/designerapp.h
qt-x11-free-3.0.5-new/tools/designer/designer/designerapp.h
---- qt-x11-free-3.0.5/tools/designer/designer/designerapp.h Mon Feb 4 02:25:47
2002
-+++ qt-x11-free-3.0.5-new/tools/designer/designer/designerapp.h Sat Jul 20
13:42:28 2002
+--- qt-x11-free-3.0.5/tools/designer/designer/designerapp.h 2002-02-04
+02:25:47.000000000 -0500
++++ qt-x11-free-3.0.5-new/tools/designer/designer/designerapp.h 2002-07-29
+15:34:05.000000000 -0500
@@ -26,10 +26,9 @@
class QLabel;
@@ -437,8 +438,8 @@
#endif
{
diff -uNbr qt-x11-free-3.0.5/tools/designer/designer/main.cpp
qt-x11-free-3.0.5-new/tools/designer/designer/main.cpp
---- qt-x11-free-3.0.5/tools/designer/designer/main.cpp Fri Oct 12 06:18:27 2001
-+++ qt-x11-free-3.0.5-new/tools/designer/designer/main.cpp Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/tools/designer/designer/main.cpp 2001-10-12 05:18:27.000000000
+-0500
++++ qt-x11-free-3.0.5-new/tools/designer/designer/main.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -128,7 +128,7 @@
}
#endif
@@ -458,8 +459,8 @@
setenv("QTDIR", qdir, 0);
setenv("PATH", qdir + QDir::separator() + "bin" + ":" + getenv("PATH"), 0);
diff -uNbr qt-x11-free-3.0.5/tools/designer/designer/mainwindow.cpp
qt-x11-free-3.0.5-new/tools/designer/designer/mainwindow.cpp
---- qt-x11-free-3.0.5/tools/designer/designer/mainwindow.cpp Mon Jun 10 12:25:24
2002
-+++ qt-x11-free-3.0.5-new/tools/designer/designer/mainwindow.cpp Sat Jul 20
13:42:28 2002
+--- qt-x11-free-3.0.5/tools/designer/designer/mainwindow.cpp 2002-06-10
+11:25:24.000000000 -0500
++++ qt-x11-free-3.0.5-new/tools/designer/designer/mainwindow.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -100,7 +100,7 @@
QString assistantPath()
@@ -470,8 +471,8 @@
"bin" + QDir::separator() +
"assistant.app/Contents/MacOS/assistant");
diff -uNbr qt-x11-free-3.0.5/tools/linguist/linguist/main.cpp
qt-x11-free-3.0.5-new/tools/linguist/linguist/main.cpp
---- qt-x11-free-3.0.5/tools/linguist/linguist/main.cpp Fri Nov 16 08:43:38 2001
-+++ qt-x11-free-3.0.5-new/tools/linguist/linguist/main.cpp Sat Jul 20 13:42:28
2002
+--- qt-x11-free-3.0.5/tools/linguist/linguist/main.cpp 2001-11-16 08:43:38.000000000
+-0500
++++ qt-x11-free-3.0.5-new/tools/linguist/linguist/main.cpp 2002-07-29
+15:34:05.000000000 -0500
@@ -28,7 +28,7 @@
extern void qt_wait_for_window_manager( QWidget * );
#endif
-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
