Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8955/10.4/unstable/main/finkinfo/x11
Modified Files:
qt4-x11.info qt4-x11.patch
Log Message:
some more qmake/etc. fixes
Index: qt4-x11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qt4-x11.patch 11 Dec 2006 20:53:06 -0000 1.1
+++ qt4-x11.patch 16 Jan 2007 04:51:12 -0000 1.2
@@ -1,6 +1,34 @@
+--- qt-x11-opensource-src-4.2.2/configure 2006-11-27 12:26:42.000000000
-0500
++++ qt-x11-opensource-src-4.2.2-new/configure 2007-01-03 10:47:46.000000000
-0500
+@@ -3275,7 +3275,6 @@
+ done
+ fi
+ if [ "$PLATFORM_MAC" = "yes" ]; then
+- echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>"$mkfile"
+ echo "CARBON_LFLAGS =-framework CoreServices -framework
CoreFoundation" >>"$mkfile"
+ EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
+@@ -4428,7 +4427,7 @@
+ COMPILER_VERSION="3.*"
+ ;;
+ *4.*)
+- COMPILER_VERSION="4"
++ COMPILER_VERSION="4.*"
+ ;;
+ *)
+ ;;
+@@ -5103,7 +5102,7 @@
+ echo "Finding project files. Please wait..."
+ "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
+ if [ -z "$QMAKE_PROJECTS" ]; then
+- QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
++ QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | grep -v
/examples/ | grep -v /demos/ | sed 's-/\./-/-'`
+ else
+ QT_PROJECTS=
+ for a in `echo $QMAKE_PROJECTS`; do
--- qt-x11-opensource-src-4.2.2/examples/tools/plugandpaint/mainwindow.cpp
2006-11-27 12:26:23.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/examples/tools/plugandpaint/mainwindow.cpp
2006-12-11 14:42:36.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/examples/tools/plugandpaint/mainwindow.cpp
2007-01-03 10:47:43.000000000 -0500
@@ -204,7 +204,7 @@
#if defined(Q_OS_WIN)
if (pluginsDir.dirName().toLower() == "debug" ||
pluginsDir.dirName().toLower() == "release")
@@ -11,24 +39,22 @@
pluginsDir.cdUp();
pluginsDir.cdUp();
--- qt-x11-opensource-src-4.2.2/mkspecs/darwin-g++/qmake.conf 2006-11-27
12:26:01.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/mkspecs/darwin-g++/qmake.conf
2006-12-11 14:42:36.000000000 -0500
-@@ -6,20 +6,20 @@
++++ qt-x11-opensource-src-4.2.2-new/mkspecs/darwin-g++/qmake.conf
2007-01-03 10:48:56.000000000 -0500
+@@ -6,11 +6,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
-CONFIG += qt warn_on release link_prl
native_precompiled_headers
+CONFIG += qt warn_on release lib_version_first
link_prl native_precompiled_headers
QT += core gui
- DEFINES += __USE_WS_X11__
+-DEFINES += __USE_WS_X11__
-QMAKE_CC = cc
+QMAKE_CC = gcc-4.0
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
- QMAKE_YACCFLAGS = -d
--QMAKE_CFLAGS = -pipe
-+QMAKE_CFLAGS = -pipe -D__USE_WS_X11__
+@@ -19,7 +18,7 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
@@ -37,7 +63,7 @@
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-@@ -28,7 +28,7 @@
+@@ -28,7 +27,7 @@
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD =
@@ -46,7 +72,7 @@
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-@@ -40,7 +40,7 @@
+@@ -40,7 +39,7 @@
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD =
@@ -55,7 +81,7 @@
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-@@ -49,13 +49,13 @@
+@@ -49,13 +48,13 @@
QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
@@ -73,7 +99,7 @@
QMAKE_LFLAGS_PLUGIN = -bundle
QMAKE_LFLAGS_THREAD =
-@@ -74,19 +74,19 @@
+@@ -74,19 +73,19 @@
QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
@@ -102,7 +128,7 @@
include(../common/unix.conf)
load(qt_config)
--- qt-x11-opensource-src-4.2.2/mkspecs/darwin-g++/qplatformdefs.h
2006-11-27 12:26:01.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/mkspecs/darwin-g++/qplatformdefs.h
2006-12-11 14:42:36.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/mkspecs/darwin-g++/qplatformdefs.h
2007-01-03 10:47:43.000000000 -0500
@@ -99,12 +99,11 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -118,7 +144,7 @@
#endif // QPLATFORMDEFS_H
--- qt-x11-opensource-src-4.2.2/projects.pro 2006-11-27 12:26:09.000000000
-0500
-+++ qt-x11-opensource-src-4.2.2-new/projects.pro 2006-12-11
14:42:37.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/projects.pro 2007-01-03
10:47:43.000000000 -0500
@@ -10,7 +10,6 @@
SUBDIRS += src
!cross_compile:SUBDIRS += tools
@@ -143,7 +169,7 @@
\ No newline at end of file
+}
--- qt-x11-opensource-src-4.2.2/qmake/option.cpp 2006-11-27
12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/qmake/option.cpp 2006-12-11
14:42:37.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/qmake/option.cpp 2007-01-03
10:47:43.000000000 -0500
@@ -75,7 +75,7 @@
QString Option::user_template_prefix;
#if defined(Q_OS_WIN32)
@@ -154,7 +180,7 @@
#elif defined(Q_OS_QNX6)
Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE;
--- qt-x11-opensource-src-4.2.2/qmake/qmake.pri 2006-11-27
12:26:04.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/qmake/qmake.pri 2006-12-11
14:42:37.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/qmake/qmake.pri 2007-01-03
10:47:43.000000000 -0500
@@ -100,7 +100,6 @@
SOURCES += qfsfileengine_unix.cpp
mac {
@@ -164,7 +190,7 @@
}
} else:win32 {
--- qt-x11-opensource-src-4.2.2/src/corelib/global/qglobal.cpp 2006-11-27
12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qglobal.cpp
2006-12-11 14:42:38.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qglobal.cpp
2007-01-03 10:47:43.000000000 -0500
@@ -1476,7 +1476,7 @@
const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ?
BigEndian : LittleEndian);
#endif
@@ -175,8 +201,17 @@
#include "private/qcore_mac_p.h"
#include "qnamespace.h"
--- qt-x11-opensource-src-4.2.2/src/corelib/global/qglobal.h 2006-11-27
12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qglobal.h
2006-12-11 14:42:38.000000000 -0500
-@@ -543,6 +543,7 @@
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qglobal.h
2007-01-03 10:48:41.000000000 -0500
+@@ -34,6 +34,8 @@
+
+ #define QT_PACKAGEDATE_STR "2006-11-27"
+
++#define __USE_WS_X11__ 1
++
+ #if !defined(QT_BUILD_MOC)
+ #include <QtCore/qconfig.h>
+ #endif
+@@ -543,6 +545,7 @@
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
# if defined(Q_OS_DARWIN) && !defined(__USE_WS_X11__)
@@ -184,7 +219,7 @@
# define Q_WS_MAC
# define Q_WS_MACX
# elif !defined(Q_WS_QWS)
-@@ -1124,7 +1125,7 @@
+@@ -1124,7 +1127,7 @@
Q_CORE_EXPORT const char *qVersion();
Q_CORE_EXPORT bool qSharedBuild();
@@ -194,7 +229,7 @@
#endif
--- qt-x11-opensource-src-4.2.2/src/corelib/global/qlibraryinfo.cpp
2006-11-27 12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qlibraryinfo.cpp
2006-12-11 14:42:38.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qlibraryinfo.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -32,7 +32,7 @@
#else
# include "qcoreapplication.h"
@@ -223,7 +258,7 @@
if (bundleRef) {
QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
--- qt-x11-opensource-src-4.2.2/src/corelib/global/qnamespace.h
2006-11-27 12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qnamespace.h
2006-12-11 14:42:38.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/global/qnamespace.h
2007-01-03 10:47:44.000000000 -0500
@@ -919,7 +919,7 @@
};
@@ -234,7 +269,7 @@
typedef int MacintoshVersion;
--- qt-x11-opensource-src-4.2.2/src/corelib/io/io.pri 2006-11-27
12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/io.pri 2006-12-11
14:42:45.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/io.pri 2007-01-03
10:47:44.000000000 -0500
@@ -60,7 +60,7 @@
HEADERS += io/qfilesystemwatcher_inotify_p.h
}
@@ -245,7 +280,7 @@
HEADERS += io/qfilesystemwatcher_kqueue_p.h
}
--- qt-x11-opensource-src-4.2.2/src/corelib/io/qdir.cpp 2006-11-27
12:26:05.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qdir.cpp 2006-12-11
14:42:39.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qdir.cpp 2007-01-03
10:47:44.000000000 -0500
@@ -1761,7 +1761,7 @@
return QLatin1Char('/');
#elif defined (Q_FS_FAT) || defined(Q_WS_WIN)
@@ -256,7 +291,7 @@
#else
return QLatin1Char('/');
--- qt-x11-opensource-src-4.2.2/src/corelib/io/qfsfileengine_unix.cpp
2006-11-27 12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qfsfileengine_unix.cpp
2006-12-11 14:42:39.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qfsfileengine_unix.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <limits.h>
@@ -285,7 +320,7 @@
FSRef fref;
if(FSPathMakeRef((const UInt8
*)QFile::encodeName(QDir::cleanPath(d->file)).data(), &fref, 0) == noErr) {
--- qt-x11-opensource-src-4.2.2/src/corelib/io/qprocess_unix.cpp
2006-11-27 12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qprocess_unix.cpp
2006-12-11 14:42:39.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qprocess_unix.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -65,7 +65,7 @@
#include "qprocess.h"
#include "qprocess_p.h"
@@ -305,7 +340,7 @@
if (encodedProgramName.endsWith(".app") && fileInfo.isDir()) {
QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(0,
--- qt-x11-opensource-src-4.2.2/src/corelib/io/qsettings.cpp 2006-11-27
12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qsettings.cpp
2006-12-11 14:42:39.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qsettings.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -275,7 +275,7 @@
// see also qsettings_win.cpp and qsettings_mac.cpp
@@ -379,7 +414,7 @@
#endif
}
--- qt-x11-opensource-src-4.2.2/src/corelib/io/qsettings_p.h 2006-11-27
12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qsettings_p.h
2006-12-11 14:42:39.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/io/qsettings_p.h
2007-01-03 10:47:44.000000000 -0500
@@ -260,7 +260,7 @@
void initAccess();
void syncConfFile(int confFileNo);
@@ -390,7 +425,7 @@
bool writePlistFile(const QString &fileName, const ParsedSettingsMap
&map) const;
#endif
--- qt-x11-opensource-src-4.2.2/src/corelib/plugin/qlibrary.cpp
2006-11-27 12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/plugin/qlibrary.cpp
2006-12-11 14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/plugin/qlibrary.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -34,7 +34,7 @@
#include <qmap.h>
#include <qsettings.h>
@@ -401,7 +436,7 @@
#endif
#ifndef NO_ERRNO_H
--- qt-x11-opensource-src-4.2.2/src/corelib/plugin/qlibrary_unix.cpp
2006-11-27 12:26:06.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/plugin/qlibrary_unix.cpp
2006-12-11 14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/plugin/qlibrary_unix.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -30,7 +30,7 @@
#ifndef QT_NO_LIBRARY
@@ -430,7 +465,7 @@
{
return dlsym(handle, symbol);
--- qt-x11-opensource-src-4.2.2/src/corelib/tools/qlocale.cpp 2006-11-27
12:26:07.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qlocale.cpp
2006-12-11 14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qlocale.cpp
2007-01-03 10:47:44.000000000 -0500
@@ -35,7 +35,7 @@
# include "qt_windows.h"
# include <time.h>
@@ -450,7 +485,7 @@
** Wrappers for Mac locale system functions
*/
--- qt-x11-opensource-src-4.2.2/src/corelib/tools/qpoint.h 2006-11-27
12:26:07.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qpoint.h 2006-12-11
14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qpoint.h 2007-01-03
10:47:45.000000000 -0500
@@ -64,7 +64,7 @@
private:
@@ -461,7 +496,7 @@
int xp;
#else
--- qt-x11-opensource-src-4.2.2/src/corelib/tools/qrect.h 2006-11-27
12:26:07.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qrect.h 2006-12-11
14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/corelib/tools/qrect.h 2007-01-03
10:47:45.000000000 -0500
@@ -152,7 +152,7 @@
#if defined(Q_WS_X11) || defined(Q_OS_TEMP)
friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2);
@@ -472,7 +507,7 @@
int x1;
int y2;
--- qt-x11-opensource-src-4.2.2/src/gui/dialogs/qprintdialog.h 2006-11-27
12:26:11.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/dialogs/qprintdialog.h
2006-12-11 14:42:40.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/dialogs/qprintdialog.h
2007-01-03 10:47:45.000000000 -0500
@@ -46,7 +46,7 @@
int exec();
@@ -483,7 +518,7 @@
QPrinter *printer() const;
void addButton(QPushButton *button);
--- qt-x11-opensource-src-4.2.2/src/gui/kernel/qapplication.cpp
2006-11-27 12:26:14.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication.cpp
2006-12-11 14:42:41.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -1118,7 +1118,7 @@
#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
style = QLatin1String("SGI"); // default
style for X11 on IRIX
@@ -494,7 +529,7 @@
style = QLatin1String("Macintosh"); // default
style for all Mac's
#elif defined(Q_WS_QWS)
--- qt-x11-opensource-src-4.2.2/src/gui/kernel/qapplication.h 2006-11-27
12:26:15.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication.h
2006-12-11 14:42:41.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication.h
2007-01-03 10:47:45.000000000 -0500
@@ -273,7 +273,7 @@
#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
static QT3_SUPPORT Qt::WindowsVersion winVersion() { return
(Qt::WindowsVersion)QSysInfo::WindowsVersion; }
@@ -505,7 +540,7 @@
#endif
inline static QT3_SUPPORT void setOverrideCursor(const QCursor &cursor,
bool replace)
--- qt-x11-opensource-src-4.2.2/src/gui/kernel/qapplication_p.h
2006-11-27 12:26:12.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication_p.h
2006-12-11 14:42:42.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/kernel/qapplication_p.h
2007-01-03 10:47:45.000000000 -0500
@@ -68,7 +68,7 @@
# ifdef Q_OS_TEMP
extern DWORD qt_cever;
@@ -516,7 +551,7 @@
#endif
#if defined(Q_WS_QWS)
--- qt-x11-opensource-src-4.2.2/src/gui/text/qfont.cpp 2006-11-27
12:26:09.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/text/qfont.cpp 2006-12-11
14:42:42.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/text/qfont.cpp 2007-01-03
10:47:45.000000000 -0500
@@ -2025,7 +2025,7 @@
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
@@ -527,7 +562,7 @@
QChar ch[2] = { QChar('i'), QChar('m') };
QGlyphLayout g[2];
--- qt-x11-opensource-src-4.2.2/src/gui/text/qfontdatabase.cpp 2006-11-27
12:26:09.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/gui/text/qfontdatabase.cpp
2006-12-11 14:42:43.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/gui/text/qfontdatabase.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -338,7 +338,7 @@
writingSystemCheck(false),
loaded(false),
@@ -574,7 +609,7 @@
#endif
return (f && f->fixedPitch);
--- qt-x11-opensource-src-4.2.2/src/opengl/qpaintengine_opengl.cpp
2006-11-27 12:26:12.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/opengl/qpaintengine_opengl.cpp
2006-12-11 14:42:45.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/opengl/qpaintengine_opengl.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -50,7 +50,7 @@
#include "qttessellator_p.h"
#else
@@ -594,7 +629,7 @@
gluTessCallback(qgl_tess, GLU_TESS_VERTEX,
reinterpret_cast<GLvoid (CALLBACK *)(...)>(&glVertex3dv));
--- qt-x11-opensource-src-4.2.2/src/qbase.pri 2006-11-27 12:26:03.000000000
-0500
-+++ qt-x11-opensource-src-4.2.2-new/src/qbase.pri 2006-12-11
14:42:43.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/qbase.pri 2007-01-03
10:47:45.000000000 -0500
@@ -65,7 +65,6 @@
mac {
@@ -604,7 +639,7 @@
QMAKE_CFLAGS += -fconstant-cfstrings
QMAKE_CXXFLAGS += -fconstant-cfstrings
--- qt-x11-opensource-src-4.2.2/src/qt3support/other/q3accel.cpp
2006-11-27 12:26:16.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3accel.cpp
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3accel.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -215,7 +215,7 @@
Returns true if the accel is in the current subwindow, else false.
*/
@@ -615,7 +650,7 @@
#else
if (!d->watch || (!d->watch->isVisible() &&
!d->watch->inherits("QMenuBar")) || !d->watch->isEnabled())
--- qt-x11-opensource-src-4.2.2/src/qt3support/other/q3polygonscanner.cpp
2006-11-27 12:26:16.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3polygonscanner.cpp
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3polygonscanner.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -474,7 +474,7 @@
*/
@@ -626,7 +661,7 @@
#else
int x, y;
--- qt-x11-opensource-src-4.2.2/src/qt3support/other/q3process_unix.cpp
2006-11-27 12:26:16.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3process_unix.cpp
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/qt3support/other/q3process_unix.cpp
2007-01-03 10:47:45.000000000 -0500
@@ -748,7 +748,7 @@
#endif
i++;
@@ -655,7 +690,7 @@
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
--- qt-x11-opensource-src-4.2.2/src/qt3support/text/q3textedit.cpp
2006-11-27 12:26:16.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/qt3support/text/q3textedit.cpp
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/qt3support/text/q3textedit.cpp
2007-01-03 10:47:46.000000000 -0500
@@ -1357,7 +1357,7 @@
unsigned char ascii = e->text().length() ?
e->text().unicode()->latin1() : 0;
if (e->text().length() &&
@@ -675,7 +710,7 @@
if (cursor->isValid()) {
if (para->at(cursor->index())->c.isLetterOrNumber()) {
--- qt-x11-opensource-src-4.2.2/src/sql/drivers/odbc/qsql_odbc.h
2006-11-27 12:26:28.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/sql/drivers/odbc/qsql_odbc.h
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/sql/drivers/odbc/qsql_odbc.h
2007-01-03 10:47:46.000000000 -0500
@@ -31,7 +31,7 @@
#include <QtCore/qt_windows.h>
#endif
@@ -686,7 +721,7 @@
// comment next line out if you use a
// unicode compatible manager
--- qt-x11-opensource-src-4.2.2/src/tools/moc/moc.pro 2006-11-27
12:26:02.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/tools/moc/moc.pro 2006-12-11
14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/tools/moc/moc.pro 2007-01-03
10:47:46.000000000 -0500
@@ -63,11 +63,8 @@
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp
@@ -700,7 +735,7 @@
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
--- qt-x11-opensource-src-4.2.2/src/tools/rcc/rcc.pro 2006-11-27
12:26:02.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/tools/rcc/rcc.pro 2006-12-11
14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/tools/rcc/rcc.pro 2007-01-03
10:47:46.000000000 -0500
@@ -59,11 +59,8 @@
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp
@@ -714,7 +749,7 @@
contains(QT_CONFIG, zlib) {
INCLUDEPATH += ../../3rdparty/zlib
--- qt-x11-opensource-src-4.2.2/src/tools/uic/uic.pro 2006-11-27
12:26:02.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/src/tools/uic/uic.pro 2006-12-11
14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/src/tools/uic/uic.pro 2007-01-03
10:47:46.000000000 -0500
@@ -67,11 +67,8 @@
win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp
@@ -728,7 +763,7 @@
contains(QT_CONFIG, zlib) {
INCLUDEPATH += ../../3rdparty/zlib
--- qt-x11-opensource-src-4.2.2/tools/assistant/lib/qassistantclient.cpp
2006-11-27 12:26:17.000000000 -0500
-+++ qt-x11-opensource-src-4.2.2-new/tools/assistant/lib/qassistantclient.cpp
2006-12-11 14:42:44.000000000 -0500
++++ qt-x11-opensource-src-4.2.2-new/tools/assistant/lib/qassistantclient.cpp
2007-01-03 10:47:46.000000000 -0500
@@ -181,7 +181,7 @@
assistantCommand = path;
}
@@ -738,31 +773,3 @@
assistantCommand += ".app/Contents/MacOS/assistant";
#endif
---- qt-x11-opensource-src-4.2.2/configure 2006-11-27 12:26:42.000000000
-0500
-+++ qt-x11-opensource-src-4.2.2-new/configure 2006-12-11 15:33:35.000000000
-0500
-@@ -3275,7 +3275,6 @@
- done
- fi
- if [ "$PLATFORM_MAC" = "yes" ]; then
-- echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>"$mkfile"
- echo "CARBON_LFLAGS =-framework CoreServices -framework
CoreFoundation" >>"$mkfile"
- EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
- EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"
-@@ -4428,7 +4427,7 @@
- COMPILER_VERSION="3.*"
- ;;
- *4.*)
-- COMPILER_VERSION="4"
-+ COMPILER_VERSION="4.*"
- ;;
- *)
- ;;
-@@ -5103,7 +5102,7 @@
- echo "Finding project files. Please wait..."
- "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
- if [ -z "$QMAKE_PROJECTS" ]; then
-- QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | sed 's-/\./-/-'`
-+ QMAKE_PROJECTS=`find "$relpath/." -name '*.pro' -print | grep -v
/examples/ | grep -v /demos/ | sed 's-/\./-/-'`
- else
- QT_PROJECTS=
- for a in `echo $QMAKE_PROJECTS`; do
Index: qt4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt4-x11.info 2 Jan 2007 17:13:33 -0000 1.3
+++ qt4-x11.info 16 Jan 2007 04:51:12 -0000 1.4
@@ -1,12 +1,35 @@
Package: qt4-x11
Version: 4.2.2
-Revision: 1023
+Revision: 1025
Description: Cross-Platform framework (X11 version)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: %N-core-shlibs (>= %v-%r), %N-gui-shlibs (>= %v-%r), %N-designer (>=
%v-%r), %N-linguist (>= %v-%r), %N-doc (>= %v-%r), pkgconfig (>= 0.21-1),
macosx (>= 10.4.3-1)
-BuildDepends: cctools (>= 446-0), cups-dev, dbus-dev (>= 1.0-1), expat1, fink
(>= 0.24-1), freetype219, glib2-dev (>= 2.12.0-1), libgettext3-dev,
libiconv-dev, libpng3 (>= 1.2.5-4), libjpeg, macosx (>= 10.4.3-1), pkgconfig
(>= 0.21-1), x11-dev
+Depends: <<
+ %N-core-shlibs (= %v-%r),
+ %N-gui-shlibs (= %v-%r),
+ %N-designer (= %v-%r),
+ %N-linguist (= %v-%r),
+ %N-doc (= %v-%r),
+ pkgconfig (>= 0.21-1),
+ macosx (>= 10.4.3-1)
+<<
+BuildDepends: <<
+ cctools (>= 446-0),
+ cups-dev,
+ dbus-dev (>= 1.0-1),
+ expat1,
+ fink (>= 0.24-1),
+ freetype219,
+ glib2-dev (>= 2.12.0-1),
+ libgettext3-dev,
+ libiconv-dev,
+ libpng3 (>= 1.2.5-4),
+ libjpeg,
+ macosx (>= 10.4.3-1),
+ pkgconfig (>= 0.21-1),
+ x11-dev
+<<
BuildConflicts: autogen-dev
BuildDependsOnly: true
GCC: 4.0
@@ -90,8 +113,8 @@
#### HEADERS FROM Qt/Mac ####
- install -c -m 644 include/Qt/qatomic_macosx.h %i/lib/%N/include/Qt/
- install -c -m 644 include/QtCore/qatomic_macosx.h
%i/lib/%N/include/QtCore/
+ install -c -m 644 src/corelib/arch/qatomic_macosx.h
%i/lib/%N/include/Qt/
+ install -c -m 644 src/corelib/arch/qatomic_macosx.h
%i/lib/%N/include/QtCore/
#### FIX AND INSTALL LA, PRL and PC FILES ####
@@ -147,8 +170,18 @@
DocFiles: INSTALL LICENSE.* OPENSOURCE-NOTICE.TXT README
SplitOff: <<
Package: %N-gui-shlibs
- Depends: %N-core-shlibs (>= %v-%r), freetype219-shlibs, libpng3-shlibs
(>= 1.2.5-4), libjpeg-shlibs, x11-shlibs
- Suggests: %N-designer, %N-linguist, %N-doc
+ Depends: <<
+ %N-core-shlibs (= %v-%r),
+ freetype219-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ libjpeg-shlibs,
+ x11-shlibs
+ <<
+ Suggests: <<
+ %N-designer,
+ %N-linguist,
+ %N-doc
+ <<
Files: <<
lib/%N/lib/libQt3Support.*.dylib
lib/%N/lib/libQtAssistantClient.*.dylib
@@ -169,7 +202,10 @@
<<
SplitOff2: <<
Package: %N-core-shlibs
- Depends: dbus-shlibs (>= 0.60-1003), fink (>= 0.24-1)
+ Depends: <<
+ dbus-shlibs (>= 1.0-1),
+ fink (>= 0.24-1)
+ <<
Files: <<
lib/%N/lib/libQtCore.*.dylib
lib/%N/lib/libQtDBus.*.dylib
@@ -191,7 +227,10 @@
<<
SplitOff3: <<
Package: %N-designer
- Depends: %N-designer-shlibs (>= %v-%r), x11
+ Depends: <<
+ %N-designer-shlibs (= %v-%r),
+ x11
+ <<
Files: <<
bin/designer*
share/applnk/Development/designer4.desktop
@@ -200,7 +239,10 @@
<<
SplitOff4: <<
Package: %N-designer-shlibs
- Depends: %N-gui-shlibs (>= %v-%r), x11-shlibs
+ Depends: <<
+ %N-gui-shlibs (= %v-%r),
+ x11-shlibs
+ <<
Files: <<
lib/%N/lib/libQtDesigner.*.dylib
lib/%N/lib/libQtDesignerComponents.*.dylib
@@ -213,7 +255,10 @@
<<
SplitOff5: <<
Package: %N-linguist
- Depends: %N-gui-shlibs (>= %v-%r), x11
+ Depends: <<
+ %N-gui-shlibs (= %v-%r),
+ x11
+ <<
Files: <<
bin/l*
share/applnk/Development/linguist4.desktop
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
