Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12131/main/finkinfo/x11
Modified Files:
qt3-mysql.info qt3-postgresql.info qt3.info qt3.patch
Log Message:
kde3/qt3 updates: libpng14, libjpeg8, builds on 10.6, apidox works again
Index: qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- qt3.info 17 Apr 2009 15:41:11 -0000 1.25
+++ qt3.info 13 May 2010 17:47:10 -0000 1.26
@@ -1,30 +1,32 @@
Package: qt3
Version: 3.3.8
-Revision: 1028
-# NB: 3.3.8-1027 did exist for a while
+Revision: 2000
Description: Cross-Platform GUI application framework
License: GPL
-Maintainer: Benjamin Reed <q...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <q...@fink.raccoonfink.com>
Depends: <<
%N-shlibs (= %v-%r),
%N-designer (= %v-%r),
%N-linguist (= %v-%r),
%N-doc (= %v-%r),
- pkgconfig,
+ pkgconfig (>= 0.23-1),
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
cctools (>= 446-0) | cctools-single-module,
cups-dev,
- fink (>= 0.26.0-1),
- freetype219,
+ fink (>= 0.29.7-1),
+ fink-package-precedence (>= 0.7-1),
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.12-1),
libgl-dev,
- libpng3 (>= 1.2.8-1),
- libjpeg,
+ libpng14,
+ libjpeg8,
macosx (>= 10.4.3-1),
- pkgconfig,
- x11-dev
+ pkgconfig (>= 0.23-1),
+ x11-dev,
+ xft2-dev (>= 2.1.14-3)
<<
BuildConflicts: autogen-dev
Provides: %N-bin
@@ -42,8 +44,6 @@
%N-designer
<<
Suggests: <<
- libpng3,
- libjpeg,
%N-mysql (>= %v-1),
%N-postgresql (>= %v-1)
<<
@@ -67,14 +67,9 @@
Source2-MD5: 1f27d5222813a0a29fe53fd8669e2239
Source2ExtractDir: qt-x11-free-%v
SourceDirectory: qt-x11-free-%v
-PatchFile: %n.patch
-PatchFile-MD5: 126fd2a461a94a820110419cee277c9b
PatchScript: <<
#!/bin/sh -ex
- sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
-if [ "%m" = "x86_64" ] ; then
- perl -pi -e "s,\(int\)owner\, \(int\),\(long\)owner\, \(long\),g"
src/tools/qmutex_unix.cpp
-fi
+ sed -e 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi -e 's|cp \-P|/bin/cp \-RL|' qmake/Makefile.unix
for patch in \
@@ -121,8 +116,11 @@
patch -p0 --fuzz=4 < $patch
done
<<
+PatchFile: %n.patch
+PatchFile-MD5: e718fa9a9b61fe3d5f47ff3c2f0bab89
NoSetLDFLAGS: true
+UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ex
@@ -161,7 +159,7 @@
unset QMAKESPEC
export QTDIR=`pwd`
export
DYLD_LIBRARY_PATH="$QTDIR/lib:$QTDIR/plugins/designer:$QTDIR/plugins/imageformats"
- export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
+ export
PATH="$QTDIR/bin:%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH"
export INSTALL_ROOT=""
if [ -f /usr/lib/libresolv.dylib ]; then
LIBRESOLV="-lresolv"
@@ -169,23 +167,33 @@
else
LIBRESOLV=""
fi
+
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC="gcc-4.2 -MD" CXX="g++-4.2 -MD"
+ perl -pi -e 's,= cc,= gcc-4.2,g; s,= c\+\+,= g++-4.2,g'
mkspecs/darwin-g++/qmake.conf
+ else
+ export CC="gcc -MD" CXX="g++ -MD"
+ fi
+
# we have to force header/lib ordering or things get really wiggy
# looks ugly, but it's better than patching the source
# TODO: also, can't change the -buildkey until the next major OS
release, unless
# I want to break binary-compat. Wish I'd noticed it before it made it
into
- # the wild. Lookin' forward to 10.5! :)
+ # the wild.
echo "yes" | ./configure $DEFINES \
- '-I$(QTDIR)/include' '-L$(QTDIR)/lib' \
+ "-I`pwd`/include" "-L`pwd`/lib" \
'-I%p/lib/freetype219/include'
'-I%p/lib/freetype219/include/freetype2' '-L%p/lib/freetype219/lib' \
+ '-I%p/lib/fontconfig2/include' '-L%p/lib/fontconfig2/lib' \
+ '-I%p/lib/xft2/include' '-L%p/lib/xft2/lib' \
'-I%p/include' '-L%p/lib' \
'-I/usr/X11R6/include' '-L/usr/X11R6/lib' \
$LIBRESOLV -buildkey qt3-jaguar \
-platform darwin-g++ -xplatform darwin-g++ \
-prefix '%p/lib/qt3' -docdir '%p/share/doc/%n' \
-headerdir '%p/include/qt' -libdir '%p/lib' \
- -release -shared -no-exceptions -thread -cups -stl \
+ -no-pch -release -shared -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 \
@@ -196,10 +204,11 @@
# attempt to counterfix qmake's warped fileFixify logic that makes
install break
# when %p is a symlink and something exists already at -libdir or
-datadir etc
# second, better attempt at unfixifying %p:
- pushd %p; FixifiedSW=`/bin/pwd -P`; popd
+ pushd %p; FixifiedSW=`/bin/pwd`; popd
/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e
"s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)%p,g"
- make
+ make CC="$CC" CXX="$CXX"
+ fink-package-precedence --prohibit-bdep %N --depfile-ext=.d .
<<
InstallScript: <<
@@ -237,7 +246,7 @@
done
# clean up some bad data in the .la and .pc files
- perl -pi -e "s,^libdir=.*,libdir='%p/lib/%N/lib',; s,-L..QTDIR./lib ,,;
s,^includedir=.*,includedir='%p/lib/%N/include'," %i/lib/%N/lib/*.la
%i/lib/pkgconfig/*.pc
+ perl -pi -e "s,%b,%p/lib/%N,g; s,^libdir=.*,libdir='%p/lib/%N/lib',;
s,-L..QTDIR./lib ,,; s,^includedir=.*,includedir='%p/lib/%N/include',"
%i/lib/%N/lib/*.la %i/lib/pkgconfig/*.pc
# %p/lib/%N/doc
ln -sf ../../share/doc/%N %i/lib/%N/doc
@@ -314,12 +323,14 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- fink (>= 0.26.0-1),
- freetype219-shlibs,
+ fink (>= 0.29.7-1),
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.12-1),
libgl-shlibs,
- libpng3-shlibs (>= 1.2.8-1),
- libjpeg-shlibs,
- x11-shlibs
+ libpng14-shlibs,
+ libjpeg8-shlibs,
+ x11-shlibs,
+ xft2-shlibs (>= 2.1.14-3)
<<
Conflicts: <<
qt-shlibs,
@@ -352,7 +363,7 @@
%p/lib/libqui.1.dylib 1.0.0 %n (>= 3.3.6-2)
<<
PostInstScript: <<
-(/usr/X11R6/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || :
+(%p/lib/fontconfig2/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || :
if [ -d %p/lib/%N-plugins ] && [ ! -L %p/lib/%N-plugins ]; then
if rsync -arL %p/lib/%N-plugins/ %p/lib/%N/plugins/; then
rm -rf %p/lib/%N-plugins
@@ -388,10 +399,7 @@
<<
SplitOff3: <<
Package: %N-designer-shlibs
- Depends: <<
- %N-shlibs (= %v-%r),
- x11-shlibs
- <<
+ Depends: %N-shlibs (= %v-%r)
Conflicts: qt2
Replaces: <<
%N-designer,
@@ -406,12 +414,7 @@
<<
SplitOff4: <<
Package: %N-linguist
- Depends: <<
- %N-shlibs (= %v-%r),
- libjpeg-shlibs,
- libpng3-shlibs (>= 1.2.8-1),
- x11
- <<
+ Depends: %N-shlibs (= %v-%r)
Conflicts: qt2
Replaces: <<
%N-bin,
@@ -456,7 +459,5 @@
so the change should be transparent to existing software.
Also, "make install" actually works again. Yay!
-
- Thanks to Martin Costabel for the x86_64 fix.
<<
Index: qt3-postgresql.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3-postgresql.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- qt3-postgresql.info 30 Mar 2007 20:28:06 -0000 1.8
+++ qt3-postgresql.info 13 May 2010 17:47:10 -0000 1.9
@@ -1,17 +1,18 @@
Package: qt3-postgresql
Version: 3.3.8
-Revision: 1021
+Revision: 2000
Description: PostgreSQL Plugin for the Qt Toolkit
License: GPL
-Maintainer: Benjamin Reed <qt3-postgre...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <qt3-postgre...@fink.raccoonfink.com>
Depends: <<
- postgresql82-shlibs,
- qt3-shlibs (>= 3.3.6-1027)
+ postgresql90-shlibs,
+ qt3-shlibs (>= 3.3.8-2000)
<<
BuildDepends: <<
- postgresql82-dev,
- qt3 (>= 3.3.6-1027)
+ fink-package-precedence (>= 0.7-1),
+ postgresql90-dev,
+ qt3 (>= 3.3.8-2000)
<<
Replaces: <<
qt3,
@@ -33,24 +34,34 @@
Source: mirror:custom:qt-x11-free-%v.tar.bz2
Source-MD5: cf3c43a7dfde5bfb76f8001102fe6e85
SourceDirectory: qt-x11-free-%v
-PatchScript: perl -pi -e 's,REQUIRES.*=.*sql.*,,'
plugins/src/sqldrivers/*/*.pro
+PatchScript: perl -pi -e 's,REQUIRES.*=.*sql.*,,'
plugins/src/sqldrivers/*/*.pro
+UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ex
- pushd plugins/src/sqldrivers/psql
- qmake -o Makefile "INCLUDEPATH += %p/include/postgresql" "LIBS += -L%p/lib"
psql.pro
- make
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC="gcc-4.2 -MD" CXX="g++-4.2 -MD"
+ else
+ export CC="gcc -MD" CXX="g++ -MD"
+ fi
- mkdir -p %i/share/doc/kde-installed-packages
- touch %i/share/doc/kde-installed-packages/qt3-postgresql
+ export PATH="%p/opt/postgresql-9.0/bin:$PATH"
+ pushd plugins/src/sqldrivers/psql
+ qmake -o Makefile "INCLUDEPATH += %p/opt/postgresql-9.0/include
%p/opt/postgresql-9.0/include/server" psql.pro
+ perl -pi -e 's,-L%p/lib,-L%p/opt/postgresql-9.0/lib -L%p/lib,g' Makefile
+ make CC="$CC" CXX="$CXX"
+ fink-package-precedence --depfile-ext=.d .
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/lib/qt3/plugins/sqldrivers
- install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3/plugins/sqldrivers/
+ mkdir -p %i/share/doc/kde-installed-packages
+ touch %i/share/doc/kde-installed-packages/qt3-postgresql
+
+ install -d -m 755 %i/lib/qt3/plugins/sqldrivers
+ install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3/plugins/sqldrivers/
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README*
Index: qt3-mysql.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3-mysql.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- qt3-mysql.info 30 Mar 2007 20:28:06 -0000 1.8
+++ qt3-mysql.info 13 May 2010 17:47:10 -0000 1.9
@@ -1,17 +1,18 @@
Package: qt3-mysql
Version: 3.3.8
-Revision: 1021
+Revision: 2000
Description: MySQL Plugin for the Qt Toolkit
License: GPL
-Maintainer: Benjamin Reed <qt3-my...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <qt3-my...@fink.raccoonfink.com>
Depends: <<
- mysql14-shlibs,
- qt3-shlibs (>= 3.3.6-1027)
+ mysql-unified-shlibs,
+ qt3-shlibs (>= 3.3.8-2000)
<<
BuildDepends: <<
- mysql14-dev,
- qt3 (>= 3.3.6-1027)
+ fink-package-precedence (>= 0.7-1),
+ mysql-unified-dev,
+ qt3 (>= 3.3.8-2000)
<<
Replaces: <<
qt3,
@@ -33,24 +34,32 @@
Source: mirror:custom:qt-x11-free-%v.tar.bz2
Source-MD5: cf3c43a7dfde5bfb76f8001102fe6e85
SourceDirectory: qt-x11-free-%v
-PatchScript: perl -pi -e 's,REQUIRES.*=.*sql.*,,'
plugins/src/sqldrivers/*/*.pro
+PatchScript: perl -pi -e 's,REQUIRES.*=.*sql.*,,'
plugins/src/sqldrivers/*/*.pro
+UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ex
- pushd plugins/src/sqldrivers/mysql
- qmake -o Makefile "INCLUDEPATH += %p/include/mysql" "LIBS += -L%p/lib"
mysql.pro
- make
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC="gcc-4.2 -MD" CXX="g++-4.2 -MD"
+ else
+ export CC="gcc -MD" CXX="g++ -MD"
+ fi
- mkdir -p %i/share/doc/kde-installed-packages
- touch %i/share/doc/kde-installed-packages/qt3-mysql
+ pushd plugins/src/sqldrivers/mysql
+ qmake -o Makefile "INCLUDEPATH += %p/include/mysql" "LIBS += -L%p/lib"
mysql.pro
+ make CC="$CC" CXX="$CXX"
+ fink-package-precedence --depfile-ext=.d .
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/lib/qt3/plugins/sqldrivers
- install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3/plugins/sqldrivers/
+ mkdir -p %i/share/doc/kde-installed-packages
+ touch %i/share/doc/kde-installed-packages/qt3-mysql
+
+ install -d -m 755 %i/lib/qt3/plugins/sqldrivers
+ install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3/plugins/sqldrivers/
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README*
Index: qt3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- qt3.patch 4 Oct 2007 20:32:27 -0000 1.14
+++ qt3.patch 13 May 2010 17:47:10 -0000 1.15
@@ -1,6 +1,6 @@
-
+diff -Nurd qt-x11-free-3.3.8/Makefile qt-x11-free-3.3.8-new/Makefile
--- qt-x11-free-3.3.8/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.8-new/Makefile 2007-10-04 16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/Makefile 2010-05-12 08:13:10.000000000 -0400
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -10,8 +10,9 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
+diff -Nurd qt-x11-free-3.3.8/config.tests/x11/xfreetype.test
qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test
--- qt-x11-free-3.3.8/config.tests/x11/xfreetype.test 2004-08-09
16:16:57.000000000 -0400
-+++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test 2010-05-12
08:13:10.000000000 -0400
@@ -41,7 +41,7 @@
LIBS="Xft2 Xft"
for LIB in $LIBS; do
@@ -21,8 +22,9 @@
for E in $EXTENSIONS; do
if [ -f "$LIBDIR/lib$LIB.$E" ]; then
F="$LIB"
+diff -Nurd qt-x11-free-3.3.8/configure qt-x11-free-3.3.8-new/configure
--- qt-x11-free-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500
-+++ qt-x11-free-3.3.8-new/configure 2007-10-04 16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/configure 2010-05-12 08:13:10.000000000 -0400
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -73,8 +75,9 @@
else
QT_PROJECTS=
for a in `echo $QMAKE_PROJECTS`; do
+diff -Nurd qt-x11-free-3.3.8/include/qglobal.h
qt-x11-free-3.3.8-new/include/qglobal.h
--- qt-x11-free-3.3.8/include/qglobal.h 2007-02-02 09:01:04.000000000
-0500
-+++ qt-x11-free-3.3.8-new/include/qglobal.h 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/include/qglobal.h 2010-05-12 08:13:10.000000000
-0400
@@ -44,6 +44,10 @@
*/
#define QT_VERSION 0x030308
@@ -106,9 +109,10 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
+diff -Nurd qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf
--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf 2007-02-02
09:01:44.000000000 -0500
-+++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf 2007-10-04
16:09:55.000000000 -0400
-@@ -9,10 +9,10 @@
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qmake.conf 2010-05-12
08:13:10.000000000 -0400
+@@ -9,7 +9,7 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
CONFIG += qt warn_on release native_precompiled_headers
@@ -116,11 +120,7 @@
+CONFIG += qt warn_on release link_prl lib_version_first
DEFINES += __DARWIN_X11__
--QMAKE_CC = cc
-+QMAKE_CC = gcc-4.0
- QMAKE_LEX = flex
- QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
+ QMAKE_CC = cc
@@ -21,7 +21,7 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
@@ -130,15 +130,6 @@
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_EXTENSION_SHLIB = dylib
-@@ -29,7 +29,7 @@
- QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_THREAD =
-
--QMAKE_CXX = c++
-+QMAKE_CXX = g++-4.0
- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -40,8 +40,8 @@
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD =
@@ -150,15 +141,11 @@
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
QMAKE_INCDIR_QT = $(QTDIR)/include
-@@ -49,13 +49,13 @@
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
- QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+@@ -51,11 +51,11 @@
--QMAKE_LINK = c++
--QMAKE_LINK_SHLIB = c++
+ QMAKE_LINK = c++
+ QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
-+QMAKE_LINK = g++-4.0
-+QMAKE_LINK_SHLIB = g++-4.0
+QMAKE_LFLAGS =
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
@@ -203,8 +190,9 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
+diff -Nurd qt-x11-free-3.3.8/mkspecs/darwin-g++/qplatformdefs.h
qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h
--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27
11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/mkspecs/darwin-g++/qplatformdefs.h 2010-05-12
08:13:10.000000000 -0400
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -220,8 +208,9 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
+diff -Nurd qt-x11-free-3.3.8/qmake/Makefile.unix
qt-x11-free-3.3.8-new/qmake/Makefile.unix
--- qt-x11-free-3.3.8/qmake/Makefile.unix 2006-02-28 05:32:54.000000000
-0500
-+++ qt-x11-free-3.3.8-new/qmake/Makefile.unix 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/qmake/Makefile.unix 2010-05-12 08:13:10.000000000
-0400
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-...@build_path@/include/qmake -...@build_path@/include
-...@source_path@/include \
@@ -233,8 +222,9 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
+diff -Nurd qt-x11-free-3.3.8/qmake/main.cpp
qt-x11-free-3.3.8-new/qmake/main.cpp
--- qt-x11-free-3.3.8/qmake/main.cpp 2007-02-02 09:01:27.000000000 -0500
-+++ qt-x11-free-3.3.8-new/qmake/main.cpp 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/qmake/main.cpp 2010-05-12 08:13:10.000000000
-0400
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -244,8 +234,30 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
+diff -Nurd qt-x11-free-3.3.8/src/kernel/qpngio.cpp
qt-x11-free-3.3.8-new/src/kernel/qpngio.cpp
+--- qt-x11-free-3.3.8/src/kernel/qpngio.cpp 2007-02-02 09:01:15.000000000
-0500
++++ qt-x11-free-3.3.8-new/src/kernel/qpngio.cpp 2010-05-12
08:29:12.000000000 -0400
+@@ -159,7 +159,7 @@
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
+diff -Nurd qt-x11-free-3.3.8/src/kernel/qprocess_unix.cpp
qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp
--- qt-x11-free-3.3.8/src/kernel/qprocess_unix.cpp 2007-02-02
09:01:11.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/kernel/qprocess_unix.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -761,7 +761,7 @@
#endif
i++;
@@ -282,8 +294,9 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
+diff -Nurd qt-x11-free-3.3.8/src/moc/moc.pro
qt-x11-free-3.3.8-new/src/moc/moc.pro
--- qt-x11-free-3.3.8/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/moc/moc.pro 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/src/moc/moc.pro 2010-05-12 08:13:10.000000000
-0400
@@ -48,6 +48,8 @@
unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp
../tools/qfileinfo_unix.cpp
win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp
../tools/qfileinfo_win.cpp
@@ -293,8 +306,9 @@
target.path=$$bins.path
INSTALLS += target
+diff -Nurd qt-x11-free-3.3.8/src/network/qdns.cpp
qt-x11-free-3.3.8-new/src/network/qdns.cpp
--- qt-x11-free-3.3.8/src/network/qdns.cpp 2007-02-02 09:01:09.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/network/qdns.cpp 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/src/network/qdns.cpp 2010-05-12 08:13:10.000000000
-0400
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -304,8 +318,9 @@
#endif
//#define QDNS_DEBUG
+diff -Nurd qt-x11-free-3.3.8/src/qt_professional.pri
qt-x11-free-3.3.8-new/src/qt_professional.pri
--- qt-x11-free-3.3.8/src/qt_professional.pri 2004-02-06 07:08:19.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/qt_professional.pri 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/qt_professional.pri 2010-05-12
08:13:10.000000000 -0400
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -314,8 +329,9 @@
INCLUDEPATH += $$QT_SOURCE_TREE/src/network
include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
DEFINES *= QT_MODULE_NETWORK
+diff -Nurd qt-x11-free-3.3.8/src/qtmain.pro
qt-x11-free-3.3.8-new/src/qtmain.pro
--- qt-x11-free-3.3.8/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/qtmain.pro 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/src/qtmain.pro 2010-05-12 08:13:10.000000000
-0400
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -324,8 +340,9 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
+diff -Nurd qt-x11-free-3.3.8/src/sql/qdatatable.cpp
qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp
--- qt-x11-free-3.3.8/src/sql/qdatatable.cpp 2007-01-11 08:46:33.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/sql/qdatatable.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -1043,8 +1043,8 @@
return FALSE;
if ( !sqlCursor()->canInsert() ) {
@@ -369,8 +386,9 @@
#endif
return FALSE;
}
+diff -Nurd qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp
qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp
--- qt-x11-free-3.3.8/src/sql/qsqldatabase.cpp 2007-01-11 10:03:02.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/sql/qsqldatabase.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -234,7 +234,8 @@
db->open();
#ifdef QT_CHECK_RANGE
@@ -390,8 +408,9 @@
#endif
d->driver = new QNullDriver();
d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not
loaded" ) );
+diff -Nurd qt-x11-free-3.3.8/src/sql/qsqlindex.cpp
qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp
--- qt-x11-free-3.3.8/src/sql/qsqlindex.cpp 2007-01-11 08:46:35.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/sql/qsqlindex.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -273,7 +273,7 @@
if ( field )
newSort.append( *field, desc );
@@ -401,8 +420,9 @@
}
return newSort;
}
+diff -Nurd qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp
qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp
--- qt-x11-free-3.3.8/src/sql/qsqlrecord.cpp 2007-01-11 08:46:35.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/sql/qsqlrecord.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -298,7 +298,7 @@
return i;
}
@@ -430,8 +450,9 @@
#endif // QT_CHECK_RANGE
return 0;
}
+diff -Nurd qt-x11-free-3.3.8/src/tools/qdir_unix.cpp
qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp
--- qt-x11-free-3.3.8/src/tools/qdir_unix.cpp 2007-02-02 09:01:05.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qdir_unix.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -441,8 +462,9 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
+diff -Nurd qt-x11-free-3.3.8/src/tools/qglobal.cpp
qt-x11-free-3.3.8-new/src/tools/qglobal.cpp
--- qt-x11-free-3.3.8/src/tools/qglobal.cpp 2007-02-02 09:01:06.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qglobal.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -461,8 +483,9 @@
#endif
#else
Q_UNUSED( msg );
+diff -Nurd qt-x11-free-3.3.8/src/tools/qglobal.h
qt-x11-free-3.3.8-new/src/tools/qglobal.h
--- qt-x11-free-3.3.8/src/tools/qglobal.h 2007-02-02 09:01:04.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qglobal.h 2007-10-04 16:09:34.000000000
-0400
++++ qt-x11-free-3.3.8-new/src/tools/qglobal.h 2010-05-12 08:13:10.000000000
-0400
@@ -44,6 +44,10 @@
*/
#define QT_VERSION 0x030308
@@ -494,8 +517,9 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
+diff -Nurd qt-x11-free-3.3.8/src/tools/qgpluginmanager.cpp
qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp
--- qt-x11-free-3.3.8/src/tools/qgpluginmanager.cpp 2007-02-02
09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qgpluginmanager.cpp 2010-05-12
08:13:10.000000000 -0400
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -505,8 +529,9 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
+diff -Nurd qt-x11-free-3.3.8/src/tools/qlibrary.cpp
qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp
--- qt-x11-free-3.3.8/src/tools/qlibrary.cpp 2007-02-02 09:01:04.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -516,8 +541,9 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
+diff -Nurd qt-x11-free-3.3.8/src/tools/qlibrary_unix.cpp
qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp
--- qt-x11-free-3.3.8/src/tools/qlibrary_unix.cpp 2007-02-02
09:01:06.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qlibrary_unix.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -114,7 +114,7 @@
QString filename = library->library();
@@ -527,8 +553,9 @@
#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
if ( !pHnd )
qWarning( "%s", DL_PREFIX(dlerror)() );
+diff -Nurd qt-x11-free-3.3.8/src/tools/qmutex_unix.cpp
qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp
--- qt-x11-free-3.3.8/src/tools/qmutex_unix.cpp 2007-02-02
09:01:04.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qmutex_unix.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -538,8 +565,20 @@
// 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)
+@@ -261,8 +261,8 @@
+ } else {
+ #ifdef QT_CHECK_RANGE
+ qWarning("QMutex::unlock: unlock from different thread than locker");
+- qWarning(" was locked by %d, unlock attempt from %d",
+- (int)owner, (int)pthread_self());
++ qWarning(" was locked by %ld, unlock attempt from %ld",
++ (long)owner, (long)pthread_self());
+ #endif
+ }
+
+diff -Nurd qt-x11-free-3.3.8/src/tools/qsettings.cpp
qt-x11-free-3.3.8-new/src/tools/qsettings.cpp
--- qt-x11-free-3.3.8/src/tools/qsettings.cpp 2007-02-02 09:01:03.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qsettings.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qsettings.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -981,7 +981,7 @@
if ( filename.isEmpty() ) {
@@ -549,8 +588,9 @@
qWarning("QSettings::sync: filename is null/empty");
#endif // QT_CHECK_STATE
+diff -Nurd qt-x11-free-3.3.8/src/tools/qstring.cpp
qt-x11-free-3.3.8-new/src/tools/qstring.cpp
--- qt-x11-free-3.3.8/src/tools/qstring.cpp 2007-02-02 09:01:05.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qstring.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qstring.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -587,8 +627,9 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
+diff -Nurd qt-x11-free-3.3.8/src/tools/qt_tools.pri
qt-x11-free-3.3.8-new/src/tools/qt_tools.pri
--- qt-x11-free-3.3.8/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/tools/qt_tools.pri 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/tools/qt_tools.pri 2010-05-12
08:13:11.000000000 -0400
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -600,8 +641,9 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
+diff -Nurd qt-x11-free-3.3.8/src/widgets/qtextedit.cpp
qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp
--- qt-x11-free-3.3.8/src/widgets/qtextedit.cpp 2007-02-02
09:01:23.000000000 -0500
-+++ qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/widgets/qtextedit.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -6349,7 +6349,7 @@
cur = tag->prev;
if ( !cur ) {
@@ -620,8 +662,9 @@
#endif
return; // something is amiss - give up
}
+diff -Nurd qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp
qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp
--- qt-x11-free-3.3.8/src/xml/qsvgdevice.cpp 2007-02-02 09:01:03.000000000
-0500
-+++ qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/src/xml/qsvgdevice.cpp 2010-05-12
08:13:11.000000000 -0400
@@ -978,7 +978,7 @@
// ### catch references to embedded .svg files
QPixmap pix;
@@ -660,8 +703,9 @@
}
if ( ok )
*ok = TRUE;
+diff -Nurd qt-x11-free-3.3.8/tools/assistant/assistant.pro
qt-x11-free-3.3.8-new/tools/assistant/assistant.pro
--- qt-x11-free-3.3.8/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/assistant/assistant.pro 2010-05-12
08:13:11.000000000 -0400
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -671,8 +715,9 @@
target.path = $$bins.path
INSTALLS += target
+diff -Nurd qt-x11-free-3.3.8/tools/designer/app/app.pro
qt-x11-free-3.3.8-new/tools/designer/app/app.pro
--- qt-x11-free-3.3.8/tools/designer/app/app.pro 2004-01-16
19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/app/app.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/designer/app/app.pro 2010-05-12
08:13:11.000000000 -0400
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -683,8 +728,9 @@
target.path=$$bins.path
INSTALLS += target
+diff -Nurd qt-x11-free-3.3.8/tools/designer/designer/designer.pro
qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro
--- qt-x11-free-3.3.8/tools/designer/designer/designer.pro 2006-02-15
10:48:20.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/designer/designer/designer.pro 2010-05-12
08:13:11.000000000 -0400
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -693,8 +739,9 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
+diff -Nurd qt-x11-free-3.3.8/tools/designer/editor/editor.pro
qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro
--- qt-x11-free-3.3.8/tools/designer/editor/editor.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/designer/editor/editor.pro 2010-05-12
08:13:11.000000000 -0400
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -702,8 +749,9 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
+diff -Nurd qt-x11-free-3.3.8/tools/designer/uic/uic.pro
qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro
--- qt-x11-free-3.3.8/tools/designer/uic/uic.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/designer/uic/uic.pro 2010-05-12
08:13:11.000000000 -0400
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -711,8 +759,9 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
+diff -Nurd qt-x11-free-3.3.8/tools/linguist/linguist/linguist.pro
qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro
--- qt-x11-free-3.3.8/tools/linguist/linguist/linguist.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist/linguist.pro 2010-05-12
08:13:11.000000000 -0400
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -722,8 +771,9 @@
PROJECTNAME = Qt Linguist
+diff -Nurd qt-x11-free-3.3.8/tools/linguist/linguist.pro
qt-x11-free-3.3.8-new/tools/linguist/linguist.pro
--- qt-x11-free-3.3.8/tools/linguist/linguist.pro 2004-06-08
04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.8-new/tools/linguist/linguist.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/linguist.pro 2010-05-12
08:13:11.000000000 -0400
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -733,8 +783,9 @@
lrelease \
lupdate \
qm2ts
+diff -Nurd qt-x11-free-3.3.8/tools/linguist/lrelease/lrelease.pro
qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro
--- qt-x11-free-3.3.8/tools/linguist/lrelease/lrelease.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/lrelease/lrelease.pro 2010-05-12
08:13:11.000000000 -0400
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -742,8 +793,9 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
+diff -Nurd qt-x11-free-3.3.8/tools/linguist/lupdate/lupdate.pro
qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro
--- qt-x11-free-3.3.8/tools/linguist/lupdate/lupdate.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/lupdate/lupdate.pro 2010-05-12
08:13:11.000000000 -0400
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -752,8 +804,9 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
+diff -Nurd qt-x11-free-3.3.8/tools/linguist/qm2ts/qm2ts.pro
qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro
--- qt-x11-free-3.3.8/tools/linguist/qm2ts/qm2ts.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/linguist/qm2ts/qm2ts.pro 2010-05-12
08:13:11.000000000 -0400
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -761,8 +814,9 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+diff -Nurd qt-x11-free-3.3.8/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro
--- qt-x11-free-3.3.8/tools/qtconfig/qtconfig.pro 2005-07-19
20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro 2007-10-04
16:09:34.000000000 -0400
++++ qt-x11-free-3.3.8-new/tools/qtconfig/qtconfig.pro 2010-05-12
08:13:11.000000000 -0400
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
