Update of /cvsroot/fink/experimental/rangerrick/finkinfo/x11
In directory usw-pr-cvs1:/tmp/cvs-serv32041/finkinfo/x11
Added Files:
qt2-2.3.2-3.info qt2-2.3.2-3.patch qt3-3.0.5-4.info
qt3-3.0.5-4.patch
Log Message:
just doing some rearranging -- there, you happy, Clef? =)
--- NEW FILE: qt2-2.3.2-3.info ---
Package: qt2
Version: 2.3.2
Revision: 3
Source: ftp://ftp.trolltech.com/qt/source/qt-x11-%v.tar.gz
SourceDirectory: qt-%v
Conflicts: qt3, qt3-bin, qt3-doc, qt-bin, qt-doc, qt-shlibs
Replaces: qt3, qt3-bin, qt3-doc, qt-bin, qt-doc, qt-shlibs
Depends: x11, zlib, libpng-shlibs, libjpeg-shlibs, %N-shlibs (= %v-%r)
BuildDepends: libjpeg, libpng, fink (>= 0.10.0)
BuildDependsOnly: true
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
CompileScript: <<
#!/bin/sh
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
if [ -f /usr/X11R6/lib/libfontconfig.dylib ]; then
FONTCONFIG="-lfontconfig"
else
FONTCONFIG=
fi
echo yes | ./configure -platform darwin-c++ -shared -system-zlib -system-libpng
-system-jpeg -gif -xft -sm -I/usr/X11R6/include/freetype2 -I%p/include -L%p/lib
$FONTCONFIG
make PREFIX=%p
<<
InstallScript: <<
( export QTDIR=`pwd`; export
DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH"; export
PATH="$QTDIR/bin:$PATH"; make install INSTALLPREFIX=%d PREFIX=%p )
mkdir -p %i/share/doc/%n-%v
cp -R doc/html %i/share/doc/%n-%v/html
cp -R examples tutorial extensions tools %i/share/doc/%n-%v/
cp ANNOUNCE FAQ INSTALL LICENSE* MANIFEST PLATFORMS PORTING README* changes*
%i/share/doc/%n-%v/
mkdir -p %i/etc/profile.d
install -m 755 qt.sh %i/etc/profile.d/
install -m 755 qt.csh %i/etc/profile.d/
<<
SplitOff: <<
Package: %N-shlibs
Conflicts: qt-shlibs, qt
Replaces: qt-shlibs, qt
Description: Shared libraries for the QT application framework
Files: lib/libqt.%v.dylib lib/libqt.2.dylib lib/libqutil.1.0.0.dylib
lib/libqutil.1.dylib
PreInstScript: <<
if [ "$1" = "install" ]; then
while true; do
echo
echo "This is the Qt Free Edition."
echo
echo "You are licensed to use this software under the terms of either"
echo "the Q Public License (QPL) or the GNU General Public License
(GPL)."
echo
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."
echo
echo "Do you accept the terms of either license?"
read acceptance
if [ "$acceptance" = "yes" -o "$acceptance" = "YES" ]; then
break
elif [ "$acceptance" = "no" -o "$acceptance" = "NO" ]; then
echo
echo "You are not licensed to use this software."
echo
exit 1
fi
done
fi
<<
<<
Description: Cross-Platform GUI application framework
DescPort: <<
Uses a custom configure script. The patch adds config files to build
static or shared libraries on Darwin. This package builds and uses
shared libraries.
No thread support.
OpenGL support is built when libGL is installed. That is the
case with Xtools and post-4.1 CVS versions of XFree86. It will not
build OpenGL support with XFree86 4.1.0.
The man pages are not usable when the package is built on a HFS+
filesystem (or any other not case-sensitive filesystem).
<<
DescPackaging: <<
Installs the files in <prefix>/lib, which you can set as your
$QTDIR. Binaries, headers, libraries and manpages are also linked
from the standard directories, so they are found without additional
measures.
This package is based on Christoph Pfisterer's qt 2.3.1 package, but
has been updated for newer fink guidelines.
<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
--- NEW FILE: qt2-2.3.2-3.patch ---
diff -uNbr qt-2.3.2/Makefile qt-patched/Makefile
--- qt-2.3.2/Makefile Mon Oct 29 09:24:08 2001
+++ qt-patched/Makefile Sat May 11 00:50:15 2002
@@ -4,11 +4,32 @@
# Read PORTING for instructions how to port Qt to a new platform.
SHELL=/bin/sh
+PREFIX=@PREFIX@
+INSTALLPREFIX=
+INSTALL=install
+FINAL_LIB_DIR=@PREFIX@/lib
init: FORCE
@$(MAKE) QTDIR=`pwd` all
-all: symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples
+install: all
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/bin
+ $(INSTALL) -m 755 bin/* $(INSTALLPREFIX)/$(PREFIX)/bin/
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/include
+ $(INSTALL) -m 644 include/* $(INSTALLPREFIX)/$(PREFIX)/include/
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(FINAL_LIB_DIR)
+ $(INSTALL) -m 755 lib/libqt.2.3.2.dylib $(INSTALLPREFIX)/$(FINAL_LIB_DIR)/
+ $(INSTALL) -m 755 lib/libqutil.1.0.0.dylib $(INSTALLPREFIX)/$(FINAL_LIB_DIR)/
+ pushd $(INSTALLPREFIX)/$(PREFIX)/lib; \
+ ln -s libqt.2.3.2.dylib libqt.2.dylib; \
+ ln -s libqt.2.3.2.dylib libqt.dylib; \
+ ln -s libqutil.1.0.0.dylib libqutil.1.dylib; \
+ ln -s libqutil.1.0.0.dylib libqutil.dylib; \
+ popd
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/share/man/man3
+ $(INSTALL) -m 644 doc/man/man3/* $(INSTALLPREFIX)/$(PREFIX)/share/man/man3/
+
+all: symlinks src-moc src-mt sub-src sub-tools
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
diff -uNbr qt-2.3.2/configs/darwin-c++-shared qt-patched/configs/darwin-c++-shared
--- qt-2.3.2/configs/darwin-c++-shared Wed Dec 31 19:00:00 1969
+++ qt-patched/configs/darwin-c++-shared Sat May 11 00:13:57 2002
@@ -0,0 +1,97 @@
+# Compiling
+INTERFACE_DECL_PATH = .
+SYSCONF_CXX = c++
+SYSCONF_CC = cc
+DASHCROSS =
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11 =
+SYSCONF_RPATH_QT =
+SYSCONF_RPATH_OPENGL =
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LIBS_X11 = -lXext -lX11
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL =
+# OpenGL
+SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
+# Yacc
+SYSCONF_LIBS_YACC =
+
+# Linking applications
+SYSCONF_LINK = c++
+SYSCONF_LFLAGS =
+SYSCONF_LIBS =
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ =
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_LFLAGS_THREAD = -pthread
+SYSCONF_LIBS_THREAD =
+
+# Meta-object compiler
+SYSCONF_MOC = $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC = $(QTDIR)/bin/uic
+
+# Linking shared libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+# - Place target in $(DESTDIR) - which has a trailing /
+# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB = c++
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).$(VER_MAJ).$(VER_MIN).$(VER_PATCH).dylib
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -dynamiclib
+-compatibility_version $(VER_MAJ).$(VER_MIN) \
+ -current_version
+$(VER_MAJ).$(VER_MIN).$(VER_PATCH) \
+ -install_name
+$(PREFIX)/lib/lib$(TARGET).$(VER_MAJ).dylib \
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS) && \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR) && \
+ rm -f lib$(TARGET).dylib
+lib$(TARGET).$(VER_MAJ).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
+lib$(TARGET).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
+lib$(TARGET).$(VER_MAJ).dylib
+
+# Linking static libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).a
+# - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR = ar cq
+SYSCONF_RANLIB = ranlib
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
+$(OBJECTS) $(OBJMOC) ; \
+ $(SYSCONF_RANLIB)
+$(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) \
+# Compiling application source
+SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
+# Default link type (static linking is still be used where required)
+SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
+SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB = -fno-common
+SYSCONF_CFLAGS_LIB = -fno-common
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ = -dynamic
+SYSCONF_CFLAGS_SHOBJ = -dynamic
+# Linking Qt
+SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT)
+$(QT_LIBS_OPT) $(SYSCONF_LIBS_X11)
diff -uNbr qt-2.3.2/configs/darwin-c++-static qt-patched/configs/darwin-c++-static
--- qt-2.3.2/configs/darwin-c++-static Wed Dec 31 19:00:00 1969
+++ qt-patched/configs/darwin-c++-static Fri May 10 20:57:46 2002
@@ -0,0 +1,95 @@
+# Compiling
+INTERFACE_DECL_PATH = .
+SYSCONF_CXX = c++
+SYSCONF_CC = cc
+DASHCROSS =
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11 =
+SYSCONF_RPATH_QT =
+SYSCONF_RPATH_OPENGL =
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LIBS_X11 = -lXext -lX11
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL =
+# OpenGL
+SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
+# Yacc
+SYSCONF_LIBS_YACC =
+
+# Linking applications
+SYSCONF_LINK = c++
+SYSCONF_LFLAGS =
+SYSCONF_LIBS =
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ = -shared
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_LFLAGS_THREAD = -pthread
+SYSCONF_LIBS_THREAD =
+
+# Meta-object compiler
+SYSCONF_MOC = $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC = $(QTDIR)/bin/uic
+
+# Linking shared libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+# - Place target in $(DESTDIR) - which has a trailing /
+# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB = c++
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS) && \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR) && \
+ rm -f lib$(TARGET).dylib
+lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
+lib$(TARGET).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
+lib$(TARGET).dylib.$(VER_MAJ); \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
+lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN)
+
+# Linking static libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).a
+# - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR = ar cq
+SYSCONF_RANLIB = ranlib
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
+$(OBJECTS) $(OBJMOC) ; \
+ $(SYSCONF_RANLIB)
+$(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) \
+# Compiling application source
+SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
+SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB =
+SYSCONF_CFLAGS_LIB =
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ = -fPIC
+SYSCONF_CFLAGS_SHOBJ = -fPIC
+# Linking Qt
+SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT)
+$(QT_LIBS_OPT) $(SYSCONF_LIBS_X11)
diff -uNbr qt-2.3.2/configure qt-patched/configure
--- qt-2.3.2/configure Mon Oct 29 09:24:18 2001
+++ qt-patched/configure Fri May 10 20:57:46 2002
@@ -6,7 +6,7 @@
#
# To remove the need for the first test, do this:
-# QTDIR=`pwd` export QTDIR
+QTDIR=`pwd` export QTDIR
relpath=`dirname $0`
relpath=`(cd $relpath; pwd)`
@@ -1317,7 +1317,7 @@
fi
[ "x$SM" = "xyes" ] && QT_LIBS="${QT_LIBS} -lSM -lICE"
-[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft"
+[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft -lXrender"
if [ -z "$EMB" -o "$SHARED" = no ]
then
[ "x$LIBPNG" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(PNG_OBJECTS)'
diff -uNbr qt-2.3.2/include/qglobal.h qt-patched/include/qglobal.h
--- qt-2.3.2/include/qglobal.h Mon Oct 29 09:21:15 2001
+++ qt-patched/include/qglobal.h Fri May 10 20:57:46 2002
@@ -73,6 +73,8 @@
#if defined(macintosh)
#define _OS_MAC_
+#elif defined(__APPLE__)
+#define _OS_DARWIN_
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
#define _OS_MSDOS_
#elif defined(OS2) || defined(_OS2) || defined(__OS2__)
diff -uNbr qt-2.3.2/qt.csh qt-patched/qt.csh
--- qt-2.3.2/qt.csh Wed Dec 31 19:00:00 1969
+++ qt-patched/qt.csh Fri May 10 22:42:30 2002
@@ -0,0 +1,3 @@
+# qt.csh
+
+setenv QTDIR @PREFIX@
diff -uNbr qt-2.3.2/qt.sh qt-patched/qt.sh
--- qt-2.3.2/qt.sh Wed Dec 31 19:00:00 1969
+++ qt-patched/qt.sh Fri May 10 22:42:37 2002
@@ -0,0 +1,4 @@
+# qt.sh
+
+QTDIR=@PREFIX@
+export QTDIR
diff -uNbr qt-2.3.2/src/network/qsocketdevice_unix.cpp
qt-patched/src/network/qsocketdevice_unix.cpp
--- qt-2.3.2/src/network/qsocketdevice_unix.cpp Mon Oct 29 09:21:14 2001
+++ qt-patched/src/network/qsocketdevice_unix.cpp Fri May 10 20:57:46 2002
@@ -114,7 +114,7 @@
# define SOCKLEN_T socklen_t
#elif defined(BSD4_4)
// BSD 4.4
-# if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000
+# if (defined(_OS_FREEBSD_) && __FreeBSD_version < 400000) || defined(_OS_DARWIN_)
// FreeBSD 4.0 and higher
# define SOCKLEN_T int
# else
diff -uNbr qt-2.3.2/src/tools/qglobal.h qt-patched/src/tools/qglobal.h
--- qt-2.3.2/src/tools/qglobal.h Mon Oct 29 09:21:15 2001
+++ qt-patched/src/tools/qglobal.h Fri May 10 20:57:46 2002
@@ -73,6 +73,8 @@
#if defined(macintosh)
#define _OS_MAC_
+#elif defined(__APPLE__)
+#define _OS_DARWIN_
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
#define _OS_MSDOS_
#elif defined(OS2) || defined(_OS2) || defined(__OS2__)
--- NEW FILE: qt3-3.0.5-4.info ---
Package: qt3
Version: 3.0.5
Revision: 4
Source: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%v.tar.bz2
SourceDirectory: qt-%v
Description: Cross-Platform GUI application framework.
Depends: dlcompat (>= 20020508), libgl, freetype2-shlibs, libpng-shlibs,
libjpeg-shlibs, %N-shlibs (= %v-%r)
Suggests: libpng, libjpeg, freetype2
BuildDepends: fink (>= 0.9.9), freetype2, libpng, libjpeg, dlcompat (>= 20020508)
Replaces: qt, qt2, %N-doc
Conflicts: qt, qt2, %N-shlibs (<< 3.0.5), %N (<< 3.0.5), %N-bin (<< 3.0.5)
SetLDFLAGS: -L.
BuildDependsOnly: true
SourceDirectory: qt-x11-free-%v
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
CompileScript: <<
(export QTDIR=`pwd`; export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH";
export PATH="$QTDIR/bin:$PATH"; echo "yes" | ./configure -no-g++-exceptions -stl
-thread -shared -system-zlib -system-libpng -system-libjpeg -sm -xft -xrender -xkb
-xinerama -qt-gif -plugin-imgfmt-png -qt-imgfmt-png -plugin-imgfmt-jpeg
-qt-imgfmt-jpeg -plugin-imgfmt-mng -qt-imgfmt-mng -prefix %p -bindir %p/bin -docdir
%p/share/doc/%n/html -datadir %p/share/qt -headerdir %p/include -libdir %p/lib
-plugindir %p/lib/qt-plugins $QTOPTS)
(export QTDIR=`pwd`; export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH";
export PATH="$QTDIR/bin:$PATH"; make INSTALLPREFIX=%p)
<<
InstallScript: <<
mkdir -p %i/share/qt
(export QTDIR=`pwd`; export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH";
export PATH="$QTDIR/bin:$PATH"; make install INSTALL_ROOT=%d INSTALLPREFIX=%p)
( cd lib; gnutar -cf - lib* | ( cd %i/lib; gnutar -xf -) )
mkdir -p %i/etc/profile.d
install -m 755 qt.sh %i/etc/profile.d/
install -m 755 qt.csh %i/etc/profile.d/
mv %i/bin/assistant.app/Contents/MacOS/assistant %i/bin
mv %i/bin/designer.app/Contents/MacOS/designer %i/bin
mv %i/bin/linguist.app/Contents/MacOS/linguist %i/bin
mv %i/bin/qtconfig.app/Contents/MacOS/qtconfig %i/bin
rm -rf %i/bin/assistant.app
rm -rf %i/bin/designer.app
rm -rf %i/bin/linguist.app
rm -rf %i/bin/qtconfig.app
( cd %i/lib; ln -s libqt-mt.3.0.5.dylib libqt-mt.3.0.4.dylib )
<<
SplitOff: <<
Package: %N-shlibs
Suggests: %N-bin
Replaces: qt-shlibs, qt
Conflicts: qt-shlibs, qt, %N (<< 3.0.5), %N-bin (<<3.0.5)
DocFiles: LICENSE.GPL LICENSE.QPL README.QT README
Depends: libjpeg-shlibs, libpng-shlibs, freetype2-shlibs, dlcompat, x11
Files: <<
lib/libqt-mt.*.dylib
lib/libeditor.*.dylib
lib/libqui.*.dylib
lib/qt-plugins/
<<
<<
SplitOff2: <<
Package: %N-doc
Replaces: qt-doc, qt2, qt
Conflicts: qt-doc, qt2, qt
Depends: %N-shlibs (= %v-%r)
DocFiles: LICENSE.GPL LICENSE.QPL
Files: <<
share/doc/%N/html/
<<
<<
SplitOff3: <<
Package: %N-bin
Conflicts: qt-bin, qt2, qt, %N (<< 3.0.5), %N-shlibs (<< 3.0.5)
Replaces: qt-bin, qt2, qt
Depends: %N-shlibs (= %v-%r), %N (= %v-%r)
DocFiles: LICENSE.GPL LICENSE.QPL
Files: <<
bin/assistant
bin/designer
bin/linguist
bin/lrelease
bin/lupdate
bin/qm2ts
<<
<<
DocFiles: LICENSE.GPL LICENSE.QPL
DescPort: <<
Uses a custom configure script. Patch adds config files to build
under Darwin, identifies OS as FreeBSD to prevent building of QtMac stuff
(which is not available in the free version).
unixmake.cpp patched so QMAKE_INCDIR, QMAKE_LIBDIR put at end of INCPATH
(instead of beginning). This prevents old qt headers and libs
(installed in %p/include and and %p/lib) from being used.
Added -no-g++-exceptions to configure line to speed qt up.
Note that as of 3.0.4-1, compatibility_version and current_version are
being set correctly. If you have anything built against a qt3 package
older than 3.0.4-1, they will probably need to be rebuilt.
Also note that in 3.0.5, TrollTech broke binary compatibility for QT
plugins, so you may need to recompile some qt applications.
<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
--- NEW FILE: qt3-3.0.5-4.patch ---
diff -uNbr qt-x11-free-3.0.5/Makefile qt-x11-free-3.0.5-new/Makefile
--- 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
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
+all: symlinks src-qmake src-moc sub-src sub-tools
@echo
@echo "The Qt library is now built in ./lib"
- @echo "The Qt examples are built in the directories in ./examples"
- @echo "The Qt tutorials are built in the directories in ./tutorial"
@echo
@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 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
Darwin:*)
- PLATFORM=macx-g++
+ PLATFORM=darwin-g++
# PLATFORM=macx-pbuilder
PLATFORM_NOTES="
- Also available for Mac OS X: macx-pbuilder
@@ -2134,10 +2134,13 @@
# some compilers generate binary incompatible code between different versions,
# so we need to generate a build key that is different between these compilers
COMPILER=`echo $PLATFORM | cut -f 2- -d-`
+if [ "$COMPILER" = "g++" ] && [ -x /usr/bin/c++ ]; then
+ COMPILER=c++
+fi
case "$COMPILER" in
-g++)
+g++|c++)
# GNU C++
- COMPILER_VERSION=`g++ --version`
+ COMPILER_VERSION=`$COMPILER --version`
case "$COMPILER_VERSION" in
*2.95.*)
COMPILER_VERSION="2.95.*"
@@ -2297,8 +2300,8 @@
#define QT_BUILD_KEY "$QT_BUILD_KEY"
EOF
[ '!' -z "$LicenseKey" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKey\""
>>$outpath/include/qconfig.h.new
-[ '!' -z "$QT_INSTALL_PLUGINS" ] && echo "#define QT_INSTALL_PLUGINS
${QT_INSTALL_PLUGINS}" >>$outpath/include/qconfig.h.new
-[ '!' -z "$QT_INSTALL_DATA" ] && echo "#define QT_INSTALL_DATA
${QT_INSTALL_DATA}" >>$outpath/include/qconfig.h.new
+[ '!' -z "$QT_INSTALL_PLUGINS" ] && echo "#define QT_INSTALL_PLUGINS
+\"${QT_INSTALL_PLUGINS}\"" >>$outpath/include/qconfig.h.new
+[ '!' -z "$QT_INSTALL_DATA" ] && echo "#define QT_INSTALL_DATA
+\"${QT_INSTALL_DATA}\"" >>$outpath/include/qconfig.h.new
# 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 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
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX)
#include <stdlib.h>
#include <qdir.h>
#endif
@@ -117,7 +117,7 @@
{
QString category;
QApplication a( argc, argv );
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX)
setenv("QTDIR", QDir::cleanDirPath(QDir::currentDirPath() + QDir::separator() +
".." + QDir::separator() + ".."), 0);
#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 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 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 @@
*/
#if defined(__APPLE__) && defined(__GNUC__)
-# define Q_OS_MACX
+# define Q_OS_FREEBSD
+# define Q_OS_DARWIN
#elif defined(__MACOSX__)
# define Q_OS_MACX
#elif defined(macintosh)
@@ -767,7 +768,7 @@
# if !defined(QT_NO_COMPAT)
// source compatibility with Qt 2.x
# if !defined(NO_DEBUG) && !defined(DEBUG)
-# if !defined(Q_OS_MACX) // clash with MacOS X headers
+# if !defined(Q_OS_MACX) && !defined(Q_OS_DARWIN) // clash with MacOS X headers
# define DEBUG
# 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 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 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
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O3
+QMAKE_CFLAGS_RELEASE = -Os
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_EXTENSION_SHLIB = dylib
+QMAKE_DARWIN_SHLIB = 1
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD =
@@ -35,8 +36,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
@@ -49,13 +50,14 @@
QMAKE_LFLAGS =
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -dynamiclib
+QMAKE_LFLAGS_SHLIB = -dynamiclib -install_name $$QMAKE_LIBDIR/$(TARGET)
QMAKE_LFLAGS_PLUGIN = -bundle
+QMAKE_LFLAGS_PREBIND = -prebind -seg1addr 0x90000000
QMAKE_LFLAGS_THREAD =
QMAKE_RPATH =
-QMAKE_LIBS_DYNLOAD =
-QMAKE_LIBS_X11 = -lXext -lX11 -lm
+QMAKE_LIBS_DYNLOAD = -ldl
+QMAKE_LIBS_X11 = -lXext -lX11 -lm -lXt
QMAKE_LIBS_X11SM = -lICE -lSM
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 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>
-
+#define QT_AOUT_UNDERSCORE
#define QT_STATBUF struct stat
#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 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");
if(project->isEmpty("QMAKE"))
- project->variables()["QMAKE"].append("qmake");
+ project->variables()["QMAKE"].append("$(QTDIR)/bin/qmake");
if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") ==
-1)
project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
return; /* subdirs is done */
@@ -114,10 +114,7 @@
!project->variables()["QMAKE_LIB_FLAG"].isEmpty() &&
project->isActiveConfig("dll"))
project->variables()["QMAKE_LFLAGS"] +=
project->variables()["QMAKE_LFLAGS_PREBIND"];
- if(!project->isEmpty("QMAKE_INCDIR"))
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
- if(!project->isEmpty("QMAKE_LIBDIR"))
- project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", " -L",
" -L", "" );
+
if ( extern_libs && (project->isActiveConfig("qt") ||
project->isActiveConfig("opengl")) ) {
if(configs.findIndex("x11lib") == -1)
configs.append("x11lib");
@@ -152,6 +149,10 @@
project->variables()["QMAKE_LIBS"] +=
project->variables()["QMAKE_LIBS_QT"];
}
}
+ if(!project->isEmpty("QMAKE_INCDIR"))
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+ if(!project->isEmpty("QMAKE_LIBDIR"))
+ project->variables()["QMAKE_LIBDIR_FLAGS"].append("-L" +
+project->first("QMAKE_LIBDIR"));
if ( project->isActiveConfig("thread") ) {
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 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"));
}
project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+
+ } else if ( !project->variables()["QMAKE_DARWIN_SHLIB"].isEmpty() ) {
+ project->variables()["TARGET_"].append("lib" + project->first("TARGET") +
+"." +
+
+project->first("QMAKE_EXTENSION_SHLIB"));
+ project->variables()["TARGET_x"].append("lib" + project->first("TARGET")
+ + "." + project->first("VER_MAJ")
+ + "." +
+project->first("QMAKE_EXTENSION_SHLIB"));
+ project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET")
+ + "." +
+project->first("VER_MAJ")
+ + "." +
+project->first("VER_MIN")
+ + "." +
+project->first("QMAKE_EXTENSION_SHLIB"));
+ project->variables()["TARGET_x.y.z"].append("lib" +
+project->first("TARGET")
+ + "." +
+project->first("VER_MAJ")
+ + "." +
+project->first("VER_MIN")
+ + "." +
+project->first("VER_PAT")
+ + "." +
+project->variables()["QMAKE_EXTENSION_SHLIB"].first());
+ project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
+ project->variables()["QMAKE_LFLAGS_SHLIB"].prepend("-compatibility_version
+" +
+ project->first("VER_MAJ") + "." +
+ project->first("VER_MIN") +
+ " -current_version " +
+ project->first("VER_MAJ") + "." +
+ project->first("VER_MIN") + "." +
+ project->first("VER_PAT") + " ");
} else {
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 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 $QTDIR/share/qt/mkspecs/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 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
+
+QTDIR=@PREFIX@
+QMAKESPEC=$QTDIR/share/qt/mkspecs/darwin-g++
+export QTDIR 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 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
int numEntries = env->count();
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
QString ld_library_path("DYLD_LIBRARY_PATH");
#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 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
{
-#ifdef Q_OS_MACX // Mac X doesn't support trailing /'s
+#if defined(Q_OS_MACX) || 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 -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 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 @@
*/
#if defined(__APPLE__) && defined(__GNUC__)
-# define Q_OS_MACX
+# define Q_OS_FREEBSD
#elif defined(__MACOSX__)
# 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 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() );
}
+
+#if defined(Q_OS_DARWIN)
+ /* do it again for .so's on Darwin */
+ filter = "so";
+ QStringList plugins = QDir(path).entryList( "*." + filter );
+ for ( QStringList::Iterator p = plugins.begin(); p != plugins.end(); ++p ) {
+ QString lib = path + "/" + *p;
+ if ( libList.contains( lib ) )
+ continue;
+
+ libList.append( lib );
+
+ }
+#endif
+
}
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 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 {
// read until we reach the end
- const int blocksize = 512;
+ int blocksize = 512;
int nread = 0;
QByteArray ba;
while ( !atEnd() ) {
@@ -600,6 +600,7 @@
if ( r < 0 )
return QByteArray();
nread += r;
+ blocksize *= 2;
}
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 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 )
filename += ".dll";
-#elif defined(Q_OS_MACX)
+#endif
+#if defined(Q_OS_MACX)
if ( filename.find( ".dylib" ) == -1 )
filename += ".dylib";
-#else
+#endif
+#if !defined(Q_WS_WIN) && !defined(Q_OS_MACX)
if ( filename.find( ".so" ) == -1 ) {
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 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
# if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
- defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE7)
+ defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE7) && !defined(__APPLE__)
// 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 -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 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;
// avoid needless iteration that confuses mmMatchedLen
- if ( nnext == 1 && mmNextStack[0] == FinalState
-#ifndef QT_NO_REGEXP_BACKREF
- && mmSleeping.isEmpty()
-#endif
- )
+ if ( nnext == 1 && mmNextStack[0] == FinalState )
stop = TRUE;
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 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() );
if ( orientation() == Horizontal ) {
- if ( p.x() > e->size().width()-d->extension->width()/2 )
+ if ( p.x() > ( doHide ?
+ e->size().width()-d->extension->width()/2 :
+ e->size().width() ) )
hide = TRUE;
} else {
- if ( p.y() > e->size().height()-d->extension->height()/2 )
+ if ( p.y() > ( doHide ?
+ e->size().height()-d->extension->height()/2 :
+ e->size().height() ) )
hide = TRUE;
}
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 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();
}
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
#include <stdlib.h>
#include <qdir.h>
#endif
@@ -213,7 +213,7 @@
QApplication a( argc, argv );
StdInParser *commandInput = 0;
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined (Q_OS_DARWIN)
QString qdir = QDir::cleanDirPath(QDir::currentDirPath() + QDir::separator() +
".." + 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 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;
#if defined(HAVE_KDE)
-#include <kapp.h>
+#include <kapplication.h>
class DesignerApplication : public KApplication
#else
-#include <qapplication.h>
class DesignerApplication : public QApplication
#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 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
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
#include <stdlib.h>
#include <qdir.h>
#endif
@@ -149,7 +149,7 @@
DesignerApplication a( argc, argv );
#endif
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
QString qdir = QDir::cleanDirPath(QDir::currentDirPath() + QDir::separator() +
"..");
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 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()
{
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX)
return QDir::cleanDirPath(QString(getenv("QTDIR")) + QDir::separator() +
"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 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
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
#include <stdlib.h>
#include <qdir.h>
#endif
@@ -38,7 +38,7 @@
QApplication app( argc, argv );
QApplication::setOverrideCursor( Qt::waitCursor );
-#ifdef Q_OS_MACX
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
QString qdir = QDir::cleanDirPath(QDir::currentDirPath() + QDir::separator() +
".." + QDir::separator());
setenv("QTDIR", qdir.latin1(), 0);
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
