Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/x11
In directory sc8-pr-cvs1:/tmp/cvs-serv32560/main/finkinfo/x11
Added Files:
qt3-3.1.2-3.info qt3-3.1.2-3.patch
Removed Files:
qt3-3.1.2-1.info qt3-3.1.2-1.patch
Log Message:
build fixes
--- NEW FILE: qt3-3.1.2-3.info ---
Package: qt3
Version: 3.1.2
Revision: 3
GCC: 3.1
Source: mirror:sourceforge:fink/qt-x11-free-%v.tar.bz2
Source-MD5: 156591717687799c69cf3f8b64a898f2
SourceDirectory: qt-x11-free-%v
Description: Cross-Platform GUI application framework
Depends: %N-shlibs, %N-designer, %N-linguist, %N-doc
Suggests: libpng3, libjpeg, freetype2
BuildDepends: dlcompat-dev (>= 20020929), libgl, freetype2, libpng3 (>= 1.2.5),
libjpeg (>= 6b), cups-dev (>= 1.1.15), x11, cctools (>= 446)
Replaces: qt, qt2, %N-doc, %N-bin, %N-dev
Conflicts: qt, qt2
Provides: %N-bin
BuildDependsOnly: true
PatchScript: <<
#!/bin/sh
if [ -x /usr/bin/sw_vers ]; then
export QT_PLATFORM=Q_OS_MACX11
else
export QT_PLATFORM=Q_OS_DARWIN
fi
sed -e 's|@PREFIX@|%p|g' -e "s|@QT_PLATFORM@|$QT_PLATFORM|g" <%a/%n.patch |
patch -p1
<<
NoSetLDFLAGS: true
CompileScript: <<
#!/bin/sh
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:/usr/X11R6/lib:%p/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
export INSTALL_ROOT=""
export INSTALLPREFIX="%p"
# we have to force header/lib ordering or things get really wiggy
# looks ugly, but it's better than patching the source
echo "yes" | ./configure -DQ_OS_DARWIN -DQ_OS_FREEBSD \
'-I$(QTDIR)/include' '-I/usr/X11R6/include/freetype2' \
'-I/usr/X11R6/include' '-I%p/include' \
'-L/usr/X11R6/lib' '-L$(QTDIR)/lib' \
-buildkey qt3-jaguar -platform darwin-g++ -xplatform darwin-g++ \
-prefix %p -bindir %p/bin -libdir %p/lib -docdir %p/share/doc/%n \
-datadir %p/share/qt3 -headerdir %p/include/qt -plugindir %p/lib/qt3-plugins \
-release -shared -fast -no-exceptions -thread -cups -stl \
-qt-gif -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng \
-system-libpng -system-libjpeg -system-zlib -largefile \
-sm -xinerama -xrender -xft -xkb `cat /tmp/qt-build-options`
make -j2 INSTALLPREFIX="%p" symlinks src-qmake src-moc sub-src sub-tools
<<
InstallScript: <<
#!/bin/sh
mkdir -p %i/share/qt3
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:/usr/X11R6/lib:%p/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
# it appears that make install is a tad broken
install -d -m 0755 %i/bin
install -c -m 0755 bin/* %i/bin/
install -d -m 0755 %i/lib
install -c -m 0755 lib/* %i/lib/
install -d -m 0755 %i/lib/qt3-plugins
cp -R plugins/* %i/lib/qt3-plugins/
ln -sf libdesigner.1.0.0.dylib %i/lib/libdesigner.1.0.dylib
ln -sf libdesigner.1.0.0.dylib %i/lib/libdesigner.1.dylib
ln -sf libdesigner.1.0.0.dylib %i/lib/libdesigner.dylib
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.0.dylib
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.dylib
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.1.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.0.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.dylib
install -d -m 0755 %i/share/man/man1
install -d -m 0755 %i/share/man/man3
install -c -m 644 doc/man/man1/* %i/share/man/man1/
install -c -m 644 doc/man/man3/* %i/share/man/man3/
# clean up the makefiles
make -C tutorial clean
make -C examples clean
perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
for a in */*/Makefile ; do
perl -pi -e 's,^SYSCONF_MOC.*,SYSCONF_MOC = %p/bin/moc,' $a
done
# install the includes
for i in include/* include/*/*; do [ -e $i ] || rm -f $i; done
install -d -m 0755 %i/include/qt
cp -fRL include/* %i/include/qt/
# and now the docs
install -d -m 0755 %i/share/doc/%N/html
install -d -m 0755 %i/share/doc/%N/tutorial
install -d -m 0755 %i/share/doc/%N/examples
cp -fRL doc/html/* %i/share/doc/%N/html/
cp -fRL tutorial/* %i/share/doc/%N/tutorial/
cp -fRL examples/* %i/share/doc/%N/examples/
# the mkspecs
install -d -m 0755 %i/share/%N/mkspecs
cp -fRL mkspecs/* %i/share/%N/mkspecs/
# qt designer and linguist templates and phrasebooks
install -d -m 0755 %i/share/%N/templates
install -d -m 0755 %i/share/%N/phrasebooks
cp -fRL tools/designer/templates/* %i/share/%N/templates/
cp -fRL tools/linguist/phrasebooks/* %i/share/%N/phrasebooks/
# kde icon for qt designer
mkdir -p %i/share/applnk/Development
cat >%i/share/applnk/Development/designer.desktop <<EOF
[Desktop Entry]
BinaryPattern=designer;
Name=Qt Designer
GenericName=Interface Designer
Exec=designer
Icon=designer
InitialPreference=5
MapNotify=true
MimeType=application/x-designer
Terminal=false
Encoding=UTF-8
Type=Application
EOF
cat >%i/share/applnk/Development/linguist.desktop <<EOF
[Desktop Entry]
BinaryPattern=linguist;
Name=Qt Linguist
GenericName=Translation Editor
Exec=linguist
Icon=linguist
InitialPreference=5
MapNotify=true
Terminal=false
Encoding=UTF-8
Type=Application
EOF
# remove extra junk
rm -rf \
%i/lib/README \
%i/lib/qt3-plugins/src \
%i/lib/libqmotif.prl \
%i/lib/qt3-plugins/accessibleqtwidgets.prl
find %i/share/doc/%n -name .moc -exec rm -rf {} \; >/dev/null 2>&1
find %i/share/doc/%n -name .obj -exec rm -rf {} \; >/dev/null 2>&1
find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile -exec rm -rf {}
\; >/dev/null 2>&1
find %i/share/doc/%n -name \*.pro -exec perl -pi -e 's,^(CONFIG\s*.*)$,$1 thread,' {}
\; >/dev/null 2>&1
mkdir -p %i/share/doc/kde-installed-packages
touch %i/share/doc/kde-installed-packages/qt3
touch %i/share/doc/kde-installed-packages/qt3-dev
<<
SplitOff: <<
Package: %N-shlibs
RuntimeVars: <<
QTDIR: %p
QMAKESPEC: %p/share/qt3/mkspecs/darwin-g++
<<
Suggests: %N-designer, %N-linguist, %N-doc
Replaces: qt-shlibs, qt
Conflicts: qt-shlibs, qt
Depends: dlcompat (>= 20020929), libgl, freetype2-shlibs, libpng3-shlibs (>= 1.2.5),
libjpeg-shlibs (>= 6b)
Shlibs: <<
%p/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.0.0-1)
%p/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.0.0-1)
%p/lib/libqui.1*.dylib 1.0.0 %n (>= 3.0.0-1)
<<
Files: <<
lib/libqt-mt.*.dylib
lib/libeditor.*.dylib
lib/libqui.*.dylib
lib/qt3-plugins/imageformats
<<
<<
SplitOff2: <<
Package: %N-designer
Depends: %N-shlibs (>= %v-%r), dlcompat (>= 20020929), freetype2-shlibs,
libjpeg-shlibs (>= 6b), libpng3-shlibs (>= 1.2.5), x11
Replaces: %N-bin, qt2
Conflicts: qt2
Files: <<
bin/designer
lib/libdesigner*
lib/qt3-plugins/designer
share/applnk/Development/designer.desktop
<<
<<
SplitOff3: <<
Package: %N-linguist
Depends: %N-shlibs (>= %v-%r), dlcompat (>= 20020929), freetype2-shlibs,
libjpeg-shlibs (>= 6b), libpng3-shlibs (>= 1.2.5), x11
Replaces: %N-bin, qt2
Conflicts: qt2
Files: <<
bin/l*
bin/qm2ts
share/qt3/phrasebooks
share/man/man1/lrelease.1
share/man/man1/lupdate.1
share/applnk/Development/linguist.desktop
<<
<<
SplitOff4: <<
Package: %N-dev
Depends: %N (>= %v-%r), %N-shlibs (>= %v-%r), dlcompat (>= 20020929),
freetype2-shlibs, libjpeg-shlibs (>= 6b), libpng3-shlibs (>= 1.2.5), x11
Files: share/doc/kde-installed-packages/qt3-dev
<<
SplitOff5: <<
Package: %N-doc
Replaces: qt-doc, qt2, qt, qt3
Conflicts: qt-doc, qt2, qt
Files: share/doc/%N/
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README
DescPort: <<
Had to rework some of the code's assumptions that because we're
on mac, we're building Qt/Mac.
<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
--- NEW FILE: qt3-3.1.2-3.patch ---
diff -uNr qt-x11-free-3.1.2/include/qglobal.h qt-x11-free-3.1.2-new/include/qglobal.h
--- qt-x11-free-3.1.2/include/qglobal.h Mon Feb 24 03:29:52 2003
+++ qt-x11-free-3.1.2-new/include/qglobal.h Fri May 23 19:27:06 2003
@@ -49,6 +49,8 @@
MACX - Mac OS X
MAC9 - Mac OS 9
+ DARWIN - Any Darwin Variant
+ MACX11 - Mac OS X (X11)
MSDOS - MS-DOS and Windows
OS2 - OS/2
OS2EMX - XFree86 on OS/2 (not PM)
@@ -78,7 +80,13 @@
UNIX - Any UNIX BSD/SYSV system
*/
-#if defined(__APPLE__) && defined(__GNUC__)
+#define QT_PLATFORM @QT_PLATFORM@
+
+#if defined(QT_PLATFORM)
+# if !defined(@QT_PLATFORM@)
+# define @QT_PLATFORM@
+# endif
+#elif defined(__APPLE__) && defined(__GNUC__)
# define Q_OS_MACX
#elif defined(__MACOSX__)
# define Q_OS_MACX
@@ -153,10 +161,22 @@
# error "Qt has not been ported to this OS - talk to [EMAIL PROTECTED]"
#endif
+#if defined(Q_OS_MACX) && !defined(Q_OS_DARWIN)
+# define Q_OS_DARWIN
+#endif
+
+#if defined(Q_OS_MACX11) && !defined(Q_OS_DARWIN)
+# define Q_OS_DARWIN
+#endif
+
#if defined(Q_OS_MAC9) || defined(Q_OS_MACX)
# define Q_OS_MAC
#endif
+#if defined(Q_OS_DARWIN) && !defined(Q_OS_FREEBSD)
+# define Q_OS_FREEBSD
+#endif
+
#if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) ||
defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
# undef Q_OS_UNIX
#elif !defined(Q_OS_UNIX)
@@ -513,6 +533,8 @@
#if defined(Q_OS_MAC9)
# define Q_WS_MAC9
+#elif defined(Q_OS_DARWIN) || defined(Q_OS_MACX11)
+# define Q_WS_X11
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
@@ -673,7 +695,7 @@
#define Q_UINT64 Q_ULONG
#endif
-#if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT)
+#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
#if defined(QT_LARGEFILE_SUPPORT)
@@ -894,7 +916,7 @@
# define QT_DEBUG // display debug messages
# if !defined(QT_NO_COMPAT) // compatibility with Qt 2
# if !defined(NO_DEBUG) && !defined(DEBUG)
-# if !defined(Q_OS_MACX) // clash with MacOS X headers
+# if !defined(Q_OS_DARWIN) // clash with MacOS X headers
# define DEBUG
# endif
# endif
diff -uNr qt-x11-free-3.1.2/include/qt.h qt-x11-free-3.1.2-new/include/qt.h
--- qt-x11-free-3.1.2/include/qt.h Thu Nov 7 10:55:31 2002
+++ qt-x11-free-3.1.2-new/include/qt.h Fri May 23 19:26:50 2003
@@ -323,7 +323,7 @@
#include <qfontfactoryttf_qws.h>
#include <qgfx_qws.h>
#include <qgfxvnc_qws.h>
-#if !defined( QT_NO_SOUND ) && !defined( Q_OS_MACX )
+#if !defined( QT_NO_SOUND ) && !defined( Q_OS_DARWIN )
# include <qsoundqss_qws.h>
#endif
#include "qwsdisplay_qws.h"
diff -uNr qt-x11-free-3.1.2/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.1.2-new/mkspecs/darwin-g++/qmake.conf
--- qt-x11-free-3.1.2/mkspecs/darwin-g++/qmake.conf Mon Feb 24 03:31:40 2003
+++ qt-x11-free-3.1.2-new/mkspecs/darwin-g++/qmake.conf Fri May 23 19:26:50 2003
@@ -8,18 +8,18 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
-CONFIG += qt warn_on release resource_fork
+CONFIG += qt warn_on release lib_version_first
QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -pipe
+QMAKE_CFLAGS = -fPIC -fno-common -pipe
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O2
+QMAKE_CFLAGS_RELEASE = -Os
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_EXTENSION_SHLIB = dylib
@@ -37,8 +37,8 @@
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD =
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR =
+QMAKE_INCDIR = @PREFIX@/include
+QMAKE_LIBDIR = @PREFIX@/lib
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
QMAKE_INCDIR_QT = $(QTDIR)/include
@@ -48,22 +48,22 @@
QMAKE_LINK = c++
QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
+QMAKE_LFLAGS = -framework CoreFoundation
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -dynamiclib
+QMAKE_LFLAGS_SHLIB = -dynamiclib -single_module -install_name
$$QMAKE_LIBDIR/$(TARGET1)
QMAKE_LFLAGS_PLUGIN = -bundle
QMAKE_LFLAGS_THREAD =
QMAKE_RPATH =
-QMAKE_LIBS_DYNLOAD =
+QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_QT = -lqt
QMAKE_LIBS_QT_THREAD = -lqt-mt
QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
-QMAKE_LIBS_THREAD =
+QMAKE_LIBS_THREAD = -lXt
QMAKE_MOC = $(QTDIR)/bin/moc
QMAKE_UIC = $(QTDIR)/bin/uic
diff -uNr qt-x11-free-3.1.2/qmake/GNUmakefile.in
qt-x11-free-3.1.2-new/qmake/GNUmakefile.in
--- qt-x11-free-3.1.2/qmake/GNUmakefile.in Sat Dec 14 09:00:34 2002
+++ qt-x11-free-3.1.2-new/qmake/GNUmakefile.in Fri May 23 19:26:50 2003
@@ -19,7 +19,7 @@
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-DQT_NO_COMPRESS [EMAIL PROTECTED]@
CXXFLAGS= $(CFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -mdynamic-no-pic
#if cc isn't gcc I need to use the bad makefile
ifeq ($(CC),gcc)
diff -uNr qt-x11-free-3.1.2/qmake/Makefile.unix
qt-x11-free-3.1.2-new/qmake/Makefile.unix
--- qt-x11-free-3.1.2/qmake/Makefile.unix Tue Feb 11 01:11:09 2003
+++ qt-x11-free-3.1.2-new/qmake/Makefile.unix Fri May 23 19:26:50 2003
@@ -17,7 +17,7 @@
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-DQT_NO_COMPRESS [EMAIL PROTECTED]@
CXXFLAGS= $(CFLAGS)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -mdynamic-no-pic
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
diff -uNr qt-x11-free-3.1.2/qmake/generators/mac/metrowerks_xml.cpp
qt-x11-free-3.1.2-new/qmake/generators/mac/metrowerks_xml.cpp
--- qt-x11-free-3.1.2/qmake/generators/mac/metrowerks_xml.cpp Mon Feb 24 03:30:50
2003
+++ qt-x11-free-3.1.2-new/qmake/generators/mac/metrowerks_xml.cpp Fri May 23
19:26:50 2003
@@ -42,7 +42,7 @@
#include <qregexp.h>
#include <stdlib.h>
#include <time.h>
-#if !defined(QWS) && defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_OS_MACX) || defined(Q_OS_MAC9))
#include <Carbon/Carbon.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -621,7 +621,7 @@
bool
MetrowerksMakefileGenerator::createFork(const QString &f)
{
-#if !defined(QWS) && defined(Q_OS_MACX)
+#if !defined(QWS) && (defined(Q_OS_MACX) && defined(Q_OS_MAC9))
FSRef fref;
FSSpec fileSpec;
if(QFile::exists(f)) {
@@ -664,7 +664,7 @@
static QString st_volume;
if(st_volume.isEmpty()) {
st_volume = var("QMAKE_VOLUMENAME");
-#if !defined(QWS) && defined(Q_OS_MACX)
+#if !defined(QWS) && (defined(Q_OS_MACX) && defined(Q_OS_MAC9))
if(st_volume.isEmpty()) {
uchar foo[512];
HVolumeParam pb;
diff -uNr qt-x11-free-3.1.2/qmake/generators/unix/unixmake2.cpp
qt-x11-free-3.1.2-new/qmake/generators/unix/unixmake2.cpp
--- qt-x11-free-3.1.2/qmake/generators/unix/unixmake2.cpp Mon Feb 24 03:30:51
2003
+++ qt-x11-free-3.1.2-new/qmake/generators/unix/unixmake2.cpp Fri May 23 19:48:22
2003
@@ -124,7 +124,12 @@
else
t << var("QMAKE_LINK") << endl;
- t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
+ if(project->first("TEMPLATE") == "app" &&
!project->isActiveConfig("turn_off_nopic_hack")) {
+ t << "LFLAGS = " << var("QMAKE_LFLAGS") << " -mdynamic-no-pic" << endl;
+ } else {
+ t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
+ }
+
t << "LIBS = " << "$(SUBLIBS) " << var("QMAKE_LIBDIR_FLAGS") << " " <<
var("QMAKE_LIBS") << endl;
}
@@ -1028,6 +1033,18 @@
project->variables()["TARGET_"].append("lib" + project->first("TARGET") +
"." +
project->first("QMAKE_EXTENSION_SHLIB"));
if(project->isActiveConfig("lib_version_first")) {
+ if(!project->variables()["COMPATIBILITY_VERSION"].isEmpty()) {
+
project->variables()["QMAKE_LFLAGS_SHLIB"].prepend("-compatibility_version " +
+
project->first("COMPATIBILITY_VERSION") + " ");
+ } else {
+
project->variables()["QMAKE_LFLAGS_SHLIB"].prepend("-compatibility_version " +
+ project->first("VER_MAJ") +
"." +
+ project->first("VER_MIN") + "
");
+ }
+ project->variables()["QMAKE_LFLAGS_SHLIB"].prepend(" -current_version
" +
+ project->first("VER_MAJ") +
"." +
+ project->first("VER_MIN") +
"." +
+ project->first("VER_PAT") + "
");
project->variables()["TARGET_x"].append("lib" +
project->first("TARGET") + "." +
project->first("VER_MAJ") +
"." +
project->first("QMAKE_EXTENSION_SHLIB"));
diff -uNr qt-x11-free-3.1.2/src/kernel/qprocess_unix.cpp
qt-x11-free-3.1.2-new/src/kernel/qprocess_unix.cpp
--- qt-x11-free-3.1.2/src/kernel/qprocess_unix.cpp Mon Feb 24 03:30:09 2003
+++ qt-x11-free-3.1.2-new/src/kernel/qprocess_unix.cpp Fri May 23 19:26:50 2003
@@ -792,7 +792,7 @@
if ( env == 0 ) { // inherit environment and start process
QString command = _arguments[0];
-#if defined(Q_OS_MACX) //look in a bundle
+#if defined(Q_OS_DARWIN) //look in a bundle
const QString mac_bundle_suffix = ".app/Contents/MacOS/";
if(!QFile::exists(command) && QFile::exists(command + mac_bundle_suffix)) {
QString exec = command;
@@ -812,7 +812,7 @@
} else { // start process with environment settins as specified in env
// construct the environment for exec
int numEntries = env->count();
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
QString ld_library_path("DYLD_LIBRARY_PATH");
#else
QString ld_library_path("LD_LIBRARY_PATH");
@@ -844,7 +844,7 @@
QStringList pathList = QStringList::split( ':', getenv( "PATH" ) );
for (QStringList::Iterator it = pathList.begin(); it !=
pathList.end(); ++it ) {
QString dir = *it;
-#if defined(Q_OS_MACX) //look in a bundle
+#if defined(Q_OS_DARWIN) //look in a bundle
if(!QFile::exists(dir + "/" + command) && QFile::exists(dir +
"/" + command + ".app"))
dir += "/" + command + ".app/Contents/MacOS";
#endif
@@ -854,7 +854,7 @@
QFileInfo fileInfo( dir + "/" + command );
#endif
if ( fileInfo.isExecutable() ) {
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
@@ -865,7 +865,7 @@
}
}
}
-#if defined(Q_OS_MACX)
+#if defined(Q_OS_DARWIN)
if(!QFile::exists(arglist[0])) {
QString command = arglist[0];
const QString mac_bundle_suffix = ".app/Contents/MacOS/";
diff -uNr qt-x11-free-3.1.2/src/kernel/qt.h qt-x11-free-3.1.2-new/src/kernel/qt.h
--- qt-x11-free-3.1.2/src/kernel/qt.h Thu Nov 7 10:55:31 2002
+++ qt-x11-free-3.1.2-new/src/kernel/qt.h Fri May 23 19:26:50 2003
@@ -323,7 +323,7 @@
#include <qfontfactoryttf_qws.h>
#include <qgfx_qws.h>
#include <qgfxvnc_qws.h>
-#if !defined( QT_NO_SOUND ) && !defined( Q_OS_MACX )
+#if !defined( QT_NO_SOUND ) && !defined( Q_OS_DARWIN )
# include <qsoundqss_qws.h>
#endif
#include "qwsdisplay_qws.h"
diff -uNr qt-x11-free-3.1.2/src/qt.pro qt-x11-free-3.1.2-new/src/qt.pro
--- qt-x11-free-3.1.2/src/qt.pro Mon Feb 17 02:55:40 2003
+++ qt-x11-free-3.1.2-new/src/qt.pro Fri May 23 19:26:50 2003
@@ -3,6 +3,7 @@
TARGET = qt
embedded:TARGET = qte
VERSION = 3.1.2
+COMPATIBILITY_VERSION = 3.0.0
DESTDIR = $$QMAKE_LIBDIR_QT
DLLDESTDIR = ../bin
diff -uNr qt-x11-free-3.1.2/src/qtmain.pro qt-x11-free-3.1.2-new/src/qtmain.pro
--- qt-x11-free-3.1.2/src/qtmain.pro Thu Nov 7 10:55:32 2002
+++ qt-x11-free-3.1.2-new/src/qtmain.pro Fri May 23 19:26:50 2003
@@ -3,6 +3,7 @@
TEMPLATE = lib
TARGET = qtmain
VERSION = 3.1.0
+COMPATIBILITY_VERSION = 3.0.0
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
diff -uNr qt-x11-free-3.1.2/src/tools/qdir_unix.cpp
qt-x11-free-3.1.2-new/src/tools/qdir_unix.cpp
--- qt-x11-free-3.1.2/src/tools/qdir_unix.cpp Mon Feb 24 03:29:53 2003
+++ qt-x11-free-3.1.2-new/src/tools/qdir_unix.cpp Fri May 23 19:26:50 2003
@@ -86,7 +86,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
{
-#if defined(Q_OS_MACX) // Mac X doesn't support trailing /'s
+#if defined(Q_OS_DARWIN) // Mac X doesn't support trailing /'s
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
diff -uNr qt-x11-free-3.1.2/src/tools/qglobal.cpp
qt-x11-free-3.1.2-new/src/tools/qglobal.cpp
--- qt-x11-free-3.1.2/src/tools/qglobal.cpp Mon Feb 24 03:29:56 2003
+++ qt-x11-free-3.1.2-new/src/tools/qglobal.cpp Fri May 23 19:26:50 2003
@@ -44,6 +44,9 @@
#include <stdarg.h>
#include <stdlib.h>
+#if defined(Q_OS_MAC) || defined(Q_OS_MACX11)
+#include <Carbon/Carbon.h>
+#endif
/*!
\relates QApplication
@@ -341,7 +344,7 @@
static const int QT_BUFFER_LENGTH = 8196; // internal buffer length
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
QString cfstring2qstring(CFStringRef str)
{
CFIndex length = CFStringGetLength(str);
diff -uNr qt-x11-free-3.1.2/src/tools/qglobal.h
qt-x11-free-3.1.2-new/src/tools/qglobal.h
--- qt-x11-free-3.1.2/src/tools/qglobal.h Mon Feb 24 03:29:52 2003
+++ qt-x11-free-3.1.2-new/src/tools/qglobal.h Fri May 23 19:26:50 2003
@@ -49,6 +49,8 @@
MACX - Mac OS X
MAC9 - Mac OS 9
+ DARWIN - Any Darwin Variant
+ MACX11 - Mac OS X (X11)
MSDOS - MS-DOS and Windows
OS2 - OS/2
OS2EMX - XFree86 on OS/2 (not PM)
@@ -78,7 +80,13 @@
UNIX - Any UNIX BSD/SYSV system
*/
-#if defined(__APPLE__) && defined(__GNUC__)
+#define QT_PLATFORM @QT_PLATFORM@
+
+#if defined(QT_PLATFORM)
+# if !defined(@QT_PLATFORM@)
+# define @QT_PLATFORM@
+# endif
+#elif defined(__APPLE__) && defined(__GNUC__)
# define Q_OS_MACX
#elif defined(__MACOSX__)
# define Q_OS_MACX
@@ -153,10 +161,22 @@
# error "Qt has not been ported to this OS - talk to [EMAIL PROTECTED]"
#endif
+#if defined(Q_OS_MACX) && !defined(Q_OS_DARWIN)
+# define Q_OS_DARWIN
+#endif
+
+#if defined(Q_OS_MACX11) && !defined(Q_OS_DARWIN)
+# define Q_OS_DARWIN
+#endif
+
#if defined(Q_OS_MAC9) || defined(Q_OS_MACX)
# define Q_OS_MAC
#endif
+#if defined(Q_OS_DARWIN) && !defined(Q_OS_FREEBSD)
+# define Q_OS_FREEBSD
+#endif
+
#if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) ||
defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
# undef Q_OS_UNIX
#elif !defined(Q_OS_UNIX)
@@ -513,6 +533,8 @@
#if defined(Q_OS_MAC9)
# define Q_WS_MAC9
+#elif defined(Q_OS_DARWIN) || defined(Q_OS_MACX11)
+# define Q_WS_X11
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
@@ -673,7 +695,7 @@
#define Q_UINT64 Q_ULONG
#endif
-#if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT)
+#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
#if defined(QT_LARGEFILE_SUPPORT)
diff -uNr qt-x11-free-3.1.2/src/tools/qgpluginmanager.cpp
qt-x11-free-3.1.2-new/src/tools/qgpluginmanager.cpp
--- qt-x11-free-3.1.2/src/tools/qgpluginmanager.cpp Mon Feb 24 03:29:52 2003
+++ qt-x11-free-3.1.2-new/src/tools/qgpluginmanager.cpp Fri May 23 19:26:50 2003
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
QString filter = "dll";
-#elif defined(Q_OS_MACX)
+#elif defined(Q_OS_DARWIN)
QString filter = "dylib";
#elif defined(Q_OS_UNIX)
QString filter = "so";
@@ -329,6 +329,18 @@
continue;
libList.append( lib );
}
+
+#if defined(Q_OS_DARWIN)
+ /* do it again on darwin, since .dylib and .so can both exist :P */
+ plugins = QDir(path).entryList( "*.so" );
+ for ( QStringList::Iterator p = plugins.begin(); p != plugins.end(); ++p ) {
+ QString lib = QDir::cleanDirPath( path + "/" + *p );
+ if ( libList.contains( lib ) )
+ continue;
+ libList.append( lib );
+ }
+#endif
+
}
const QLibrary* QGPluginManager::library( const QString& feature ) const
diff -uNr qt-x11-free-3.1.2/src/tools/qlibrary.cpp
qt-x11-free-3.1.2-new/src/tools/qlibrary.cpp
--- qt-x11-free-3.1.2/src/tools/qlibrary.cpp Mon Feb 24 03:29:51 2003
+++ qt-x11-free-3.1.2-new/src/tools/qlibrary.cpp Fri May 23 19:26:50 2003
@@ -322,8 +322,8 @@
#if defined(Q_WS_WIN)
if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
filename += ".dll";
-#elif defined(Q_OS_MACX)
- if ( filename.find( ".dylib" ) == -1 )
+#elif defined(Q_OS_DARWIN)
+ if ( filename.find( ".dylib" ) == -1 && filename.find( ".so" ) == -1 )
filename += ".dylib";
#else
QString filter = ".so";
diff -uNr qt-x11-free-3.1.2/tools/designer/app/main.cpp
qt-x11-free-3.1.2-new/tools/designer/app/main.cpp
--- qt-x11-free-3.1.2/tools/designer/app/main.cpp Tue Jan 7 19:39:23 2003
+++ qt-x11-free-3.1.2-new/tools/designer/app/main.cpp Fri May 23 19:26:50 2003
@@ -180,7 +180,7 @@
#ifdef Q_WS_WIN
extern void qInitImages_designerlib();
qInitImages_designerlib();
-#else
+#elif !defined(Q_OS_DARWIN)
extern void qInitImages_designer();
qInitImages_designer();
#endif
diff -uNr qt-x11-free-3.1.2/tools/designer/designer/designer.pro
qt-x11-free-3.1.2-new/tools/designer/designer/designer.pro
--- qt-x11-free-3.1.2/tools/designer/designer/designer.pro Tue Jan 14 12:45:38
2003
+++ qt-x11-free-3.1.2-new/tools/designer/designer/designer.pro Fri May 23 19:26:50
2003
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib qmake_cache
+CONFIG += qt warn_on qmake_cache
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
diff -uNr qt-x11-free-3.1.2/tools/designer/designer/mainwindow.cpp
qt-x11-free-3.1.2-new/tools/designer/designer/mainwindow.cpp
--- qt-x11-free-3.1.2/tools/designer/designer/mainwindow.cpp Thu Feb 13 07:46:25
2003
+++ qt-x11-free-3.1.2-new/tools/designer/designer/mainwindow.cpp Fri May 23
19:26:50 2003
@@ -120,7 +120,7 @@
#ifdef Q_WS_WIN
extern void qInitImages_designerlib();
qInitImages_designerlib();
-#else
+#elif !defined(Q_OS_DARWIN)
extern void qInitImages_designer();
qInitImages_designer();
#endif
diff -uNr qt-x11-free-3.1.2/tools/designer/editor/editor.pro
qt-x11-free-3.1.2-new/tools/designer/editor/editor.pro
--- qt-x11-free-3.1.2/tools/designer/editor/editor.pro Tue Nov 19 17:07:43 2002
+++ qt-x11-free-3.1.2-new/tools/designer/editor/editor.pro Fri May 23 19:26:50
2003
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
+CONFIG += qt warn_on
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
diff -uNr qt-x11-free-3.1.2/tools/designer/plugins/cppeditor/cppeditor.pro
qt-x11-free-3.1.2-new/tools/designer/plugins/cppeditor/cppeditor.pro
--- qt-x11-free-3.1.2/tools/designer/plugins/cppeditor/cppeditor.pro Tue Jan 14
12:56:20 2003
+++ qt-x11-free-3.1.2-new/tools/designer/plugins/cppeditor/cppeditor.pro Fri
May 23 19:26:50 2003
@@ -13,7 +13,7 @@
win32{
LIBS += $$QT_BUILD_TREE/lib/editor.lib
} else {
- LIBS += -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.a
+ LIBS += -L$$QT_BUILD_TREE/lib -leditor
}
target.path += $$plugins.path/designer
--- qt3-3.1.2-1.info DELETED ---
--- qt3-3.1.2-1.patch DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
