Update of /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32289/10.4/main/finkinfo/x11
Modified Files: qt3-mysql.info qt3-postgresql.info qt3.info qt3.patch Log Message: totally rearranged qt3 into %p/lib/qt3 Index: qt3.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.info,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- qt3.info 15 Mar 2006 22:20:19 -0000 1.25 +++ qt3.info 20 Mar 2006 22:31:24 -0000 1.26 @@ -1,12 +1,12 @@ Package: qt3 Version: 3.3.6 -Revision: 1021 +Revision: 1022 Description: Cross-Platform GUI application framework License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> -Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r), %N-doc (>= %v-%r), pkgconfig -BuildDepends: cctools (>= 446-0) | cctools-single-module, cups-dev, fink (>= 0.17.3-1), freetype219, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, x11-dev +Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r), %N-doc (>= %v-%r), pkgconfig, macosx (>= 10.4.3-1) +BuildDepends: cctools (>= 446-0) | cctools-single-module, cups-dev, fink (>= 0.17.3-1), freetype219, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, x11-dev, macosx (>= 10.4.3-1) Provides: %N-bin Conflicts: qt, qt2 Replaces: qt, qt2, %N-doc, %N-bin, %N-dev @@ -42,7 +42,7 @@ patches/qt-x11-free-3.3.2-quiet.patch \ patches/qt-uic-nostdlib.patch \ patches/qt-x11-free-3.3.4-qfontdatabase_x11.patch \ - patches/qt-3.3.3-gtkstyle.patch \ + patches/qt-3.3.3-gtkstyle.patch \ patches/0038-dragobject-dont-prefer-unknown.rr.patch \ patches/0047-fix-kmenu-width.rr.diff \ patches/0048-qclipboard_hack_80072.rr.patch \ @@ -58,156 +58,150 @@ CompileScript: << #!/bin/sh -ex - PRODUCT_VERSION=`uname -r` - - case $PRODUCT_VERSION in - 8*) - export DEFINES="$DEFINES -DTIGER_DLSYM_HACK=1" - ;; - esac - - CURRENTVERSION=`dpkg -p qt3 | grep '^Version:' | cut -d' ' -f2-` - DOREMOVE=0 - for BADUPGRADE in 3.2.1-1 3.2.1-11 3.2.1-12; do - if [ "$CURRENTVERSION" = "$BADUPGRADE" ]; then - DOREMOVE=1 - fi - done + CURRENTVERSION=`dpkg -p qt3 | grep '^Version:' | cut -d' ' -f2-` + DOREMOVE=0 + for BADUPGRADE in 3.2.1-1 3.2.1-11 3.2.1-12; do + if [ "$CURRENTVERSION" = "$BADUPGRADE" ]; then + DOREMOVE=1 + fi + done - for file in `ls -1 /lib/ 2>/dev/null | grep -E '(qt-mt|qt3)' | grep -v '.bad$'`; do - echo "WARNING: found suspicious file or directory \"$file\" -- moving to \"${file}.bad\"" - /bin/mv "/lib/${file}" "/lib/${file}.bad" - done + for file in `ls -1 /lib/ 2>/dev/null | grep -E '(qt-mt|qt3)' | grep -v '.bad$'`; do + echo "WARNING: found suspicious file or directory \"$file\" -- moving to \"${file}.bad\"" + /bin/mv "/lib/${file}" "/lib/${file}.bad" + done - if [ "$DOREMOVE" = "1" ]; then - echo "You have a version of qt3 installed that contains a bug that makes it impossible" - echo "to build this package. I am going to remove qt3 not to allow the upgrade to" - echo "happen. It should get re-installed as needed when the upgrade completes." - echo "" - echo -e "removing qt3... \c" - if dpkg -r --force-depends qt3 >/tmp/dpkg.output 2>&1; then - echo "done" - else - echo "failed!" - echo "" - echo "I was unable to remove the old qt3, this will probably cause problems building" - echo "this package. Please remove qt3 and then retry this build." - echo "" - echo "---( dpkg output )---" - cat /tmp/dpkg.output - fi - fi + if [ "$DOREMOVE" = "1" ]; then + echo "You have a version of qt3 installed that contains a bug that makes it impossible" + echo "to build this package. I am going to remove qt3 not to allow the upgrade to" + echo "happen. It should get re-installed as needed when the upgrade completes." + echo "" + echo -e "removing qt3... \c" + if dpkg -r --force-depends qt3 >/tmp/dpkg.output 2>&1; then + echo "done" + else + echo "failed!" + echo "" + echo "I was unable to remove the old qt3, this will probably cause problems building" + echo "this package. Please remove qt3 and then retry this build." + echo "" + echo "---( dpkg output )---" + cat /tmp/dpkg.output + fi + fi - export QTDIR=`pwd` - export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib/freetype219/lib:$DYLD_LIBRARY_PATH" - export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH" - export INSTALL_ROOT="" - if [ -f /usr/lib/libresolv.dylib ]; then - LIBRESOLV="-lresolv" - perl -pi -e 's,#define QT_AOUT_UNDERSCORE,,' mkspecs/darwin-g++/qplatformdefs.h - else - LIBRESOLV="" - fi - # 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 $DEFINES \ - '-I$(QTDIR)/include' '-I%p/lib/freetype219/include/freetype2' \ - '-L%p/lib/freetype219/lib' '-I/usr/X11R6/include' '-I%p/include' \ - '-L$(QTDIR)/lib' '-L%p/lib' '-L/usr/X11R6/lib' $LIBRESOLV \ - -buildkey qt3-jaguar -platform darwin-g++ -xplatform darwin-g++ \ - -translationdir '%p/share/qt3/translations' \ - -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 -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 \ - -plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql + 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 INSTALL_ROOT="" + if [ -f /usr/lib/libresolv.dylib ]; then + LIBRESOLV="-lresolv" + perl -pi -e 's,#define QT_AOUT_UNDERSCORE,,' mkspecs/darwin-g++/qplatformdefs.h + else + LIBRESOLV="" + fi + # 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 $DEFINES \ + '-I$(QTDIR)/include' '-L$(QTDIR)/lib' \ + '-I%p/lib/freetype219/include' '-I%p/lib/freetype219/include/freetype2' '-L%p/lib/freetype219/lib' \ + '-I%p/include' '-L%p/lib' \ + '-I/usr/X11R6/include' '-L/usr/X11R6/lib' \ + $LIBRESOLV -fast -buildkey qt3-jaguar \ + -platform darwin-g++ -xplatform darwin-g++ \ + -prefix '%p/lib/qt3' -docdir '%p/share/doc/%n' \ + -headerdir '%p/include/qt' \ + -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 \ + -plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql - /usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e 's,-I%p/include/qt,,g' - make symlinks src-qmake src-moc sub-src sub-tools + make << InstallScript: << #!/bin/sh -ex - mkdir -p %i/share/qt3 - export QTDIR=`pwd` - export DYLD_LIBRARY_PATH="$QTDIR/lib:/usr/X11R6/lib:$DYLD_LIBRARY_PATH" - export PATH="$QTDIR/bin:$PATH" + #### MAIN INSTALL #### - perl -pi -e 's,\$\(QTDIR\),%p,g' lib/*.la + unset QMAKESPEC + export QTDIR=`pwd` + export DYLD_LIBRARY_PATH="$QTDIR/lib:$QTDIR/plugins/designer:$QTDIR/plugins/imageformats" + export PATH="$QTDIR/bin:$PATH" - install -d -m 0755 %i/bin - install -c -m 0755 bin/* %i/bin/ + make install INSTALL_ROOT=%d - install -d -m 0755 %i/lib - install -c -m 0755 lib/* %i/lib/ + #### CLEAN UP FILES #### - install -d -m 0755 %i/lib/qt3-plugins - /bin/cp -fRL plugins/* %i/lib/qt3-plugins/ + # fix the -L$(QTDIR) junk in the .la file + perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/qt3/lib/*.la - ln -sf libdesignercore.1.0.0.dylib %i/lib/libdesignercore.1.0.dylib - ln -sf libdesignercore.1.0.dylib %i/lib/libdesignercore.1.dylib - ln -sf libdesignercore.1.dylib %i/lib/libdesignercore.dylib + # remove the .prl files, we don't want them + rm -rf %i/lib/qt3/lib/*.prl - ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.0.dylib - ln -sf libeditor.1.0.dylib %i/lib/libeditor.1.dylib - ln -sf libeditor.1.dylib %i/lib/libeditor.dylib + #### COMPATIBILITY WITH OLD QT3 PACKAGES #### - ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.3.dylib - ln -sf libqt-mt.3.3.dylib %i/lib/libqt-mt.3.dylib - ln -sf libqt-mt.3.dylib %i/lib/libqt-mt.dylib + # set up symlinks for compatibility with old packages - ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.0.dylib - ln -sf libqui.1.0.dylib %i/lib/libqui.1.dylib - ln -sf libqui.1.dylib %i/lib/libqui.dylib + # %p/bin + install -d -m 0755 %i/bin + for file in `cd %i/lib/qt3/bin; ls`; do + ln -sf %p/lib/qt3/bin/$file %i/bin/$file + done - install -d -m 0755 %i/lib/pkgconfig - install -c -m 644 %i/lib/qt-mt.pc %i/lib/pkgconfig/ + # %p/include/qt + install -d -m 0755 %i/include + ln -sf %p/include/qt %i/lib/qt3/include - 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/ + # %p/lib + install -d -m 0755 %i/lib + for file in `cd %i/lib/qt3/lib; ls`; do + [ "$file" != "pkgconfig" ] && ln -sf %p/lib/qt3/lib/$file %i/lib/$file + done + install -d -m 0755 %i/lib/pkgconfig + ln -sf %p/lib/qt3/lib/pkgconfig/qt-mt.pc %i/lib/pkgconfig/ - # clean up the makefiles - make -C tutorial clean - make -C examples clean - perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find examples -name "*.pro"` - for a in */*/Makefile ; do - perl -pi -e 's,^SYSCONF_MOC.*,SYSCONF_MOC = %p/bin/moc,' $a - done + # %p/share/qt3 + for dir in mkspecs phrasebooks templates translations; do + install -d -m 0755 %i/share/qt3/$dir + for sub in `cd %i/lib/qt3/$dir; ls`; do + ln -sf %p/lib/qt3/$dir/$sub %i/share/qt3/$dir/$sub + done + done - # install the includes - for i in include/* include/*/*; do [ -e $i ] || rm -f $i; done - install -d -m 0755 %i/include/qt - /bin/cp -fRL include/* %i/include/qt/ + # %p/lib/qt3-plugins + for dir in `cd %i/lib/qt3/plugins; ls`; do + install -d -m 755 %i/lib/qt3-plugins/$dir + for pluginfile in `cd %i/lib/qt3/plugins/$dir; ls`; do + ln -sf %p/lib/qt3/plugins/$dir/$pluginfile %i/lib/qt3-plugins/$dir/$pluginfile + done + done - # 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 - /bin/cp -fRL doc/html/* %i/share/doc/%N/html/ - /bin/cp -fRL tutorial/* %i/share/doc/%N/tutorial/ - /bin/cp -fRL examples/* %i/share/doc/%N/examples/ + # %p/lib/qt3/doc + ln -sf %p/share/doc/%N %i/lib/qt3/doc - # the mkspecs - install -d -m 0755 %i/share/%N/mkspecs - /bin/cp -fRL mkspecs/* %i/share/%N/mkspecs/ + #### MAN PAGES #### - # qt designer and linguist templates and phrasebooks - install -d -m 0755 %i/share/%N/templates - install -d -m 0755 %i/share/%N/phrasebooks - /bin/cp -fRL tools/designer/templates/* %i/share/%N/templates/ - /bin/cp -fRL tools/linguist/phrasebooks/* %i/share/%N/phrasebooks/ + 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/ - install -d -m 0755 %i/share/qt3/translations - install -c -m 644 `find . -name \*.qm` %i/share/qt3/translations/ + #### TUTORIALS AND EXAMPLES #### - # kde icon for qt designer - /bin/mkdir -p %i/share/applnk/Development - cat >%i/share/applnk/Development/designer.desktop <<EOF + # clean up the makefiles + perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find examples -name "*.pro"` + + install -d -m 0755 %i/share/doc/%N/tutorial + install -d -m 0755 %i/share/doc/%N/examples + /bin/cp -fRL tutorial/* %i/share/doc/%N/tutorial/ + /bin/cp -fRL examples/* %i/share/doc/%N/examples/ + + # kde icon for qt designer + install -d -m 0755 %i/share/applnk/Development + cat >%i/share/applnk/Development/designer.desktop <<EOF [Desktop Entry] BinaryPattern=designer; Name=Qt Designer @@ -221,7 +215,7 @@ Encoding=UTF-8 Type=Application EOF - cat >%i/share/applnk/Development/linguist.desktop <<EOF + cat >%i/share/applnk/Development/linguist.desktop <<EOF [Desktop Entry] BinaryPattern=linguist; Name=Qt Linguist @@ -235,46 +229,39 @@ Type=Application EOF - # remove extra junk - /bin/rm -rf \ - %i/lib/README \ - %i/lib/qt3-plugins/src \ - %i/lib/*f.prl - - /usr/bin/find %i/share/doc/%n -name \*.moc -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || : - /usr/bin/find %i/share/doc/%n -name \*.obj -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || : - /usr/bin/find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile -print0 | xargs -0 rm -rf >/dev/null 2>&1 || : - /usr/bin/find %i/share/doc/%n -name \*.pro -print0 | xargs -0 perl -pi -e 's,^(CONFIG\s*.*)$,$1 thread,' >/dev/null 2>&1 || : - /usr/bin/find %i -name \*.bak -print0 | xargs -0 rm -rf >/dev/null 2>&1 || : - - perl -pi -e 's,\$\(QTDIR\),%p,g' %i/lib/libqt-mt.la + /usr/bin/find %i/share/doc/%n/ -name \*.moc -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || : + /usr/bin/find %i/share/doc/%n/ -name \*.obj -print0 | xargs -0 rm -rf {} >/dev/null 2>&1 || : + /usr/bin/find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile -print0 | xargs -0 rm -rf >/dev/null 2>&1 || : + /usr/bin/find %i/share/doc/%n/ -name \*.pro -print0 | xargs -0 perl -pi -e 's,^(CONFIG\s*.*)$,$1 thread,' >/dev/null 2>&1 || : + /usr/bin/find %i/ -name \*.bak -print0 | xargs -0 rm -rf >/dev/null 2>&1 || : - install -d -m 755 %i/share/doc/installed-packages - touch %i/share/doc/installed-packages/%N - touch %i/share/doc/installed-packages/%N-dev + install -d -m 755 %i/share/doc/installed-packages + touch %i/share/doc/installed-packages/%N + touch %i/share/doc/installed-packages/%N-dev << -DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* +DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* bin/findtr bin/qt20fix bin/qtrename140 SplitOff: << Package: %N-shlibs Depends: fink (>= 0.17.1-1), freetype219-shlibs, libgl-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, x11-shlibs Conflicts: qt-shlibs, qt Replaces: qt-shlibs, qt, qt3 Suggests: %N-designer, %N-linguist, %N-doc - RuntimeVars: << -QTDIR: %p -QMAKESPEC: %p/share/qt3/mkspecs/darwin-g++ - << + RuntimeVars: QTDIR: %p/lib/qt3 Files: << lib/libqt-mt.*.dylib lib/libeditor.*.dylib lib/libqui.*.dylib - lib/qt3-plugins/imageformats - lib/qt3-plugins/sqldrivers/libqsqlite.so + lib/qt3/lib/libqt-mt.*.dylib + lib/qt3/lib/libeditor.*.dylib + lib/qt3/lib/libqui.*.dylib + lib/qt3-plugins + lib/qt3/plugins/imageformats + lib/qt3/plugins/sqldrivers << Shlibs: << - %p/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.2-1) - %p/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.2-1) - %p/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.2-1) + %p/lib/qt3/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.6-2) + %p/lib/qt3/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.6-2) + %p/lib/qt3/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.6-2) << PostInstScript: /usr/X11R6/bin/fc-cache >/dev/null 2>&1 || : << @@ -286,9 +273,12 @@ Files: << bin/designer lib/libdesigner* - lib/qt3-plugins/designer share/applnk/Development/designer.desktop share/qt3/templates + lib/qt3/bin/designer + lib/qt3/lib/libdesigner* + lib/qt3/plugins/designer + lib/qt3/templates << << SplitOff3: << @@ -303,6 +293,9 @@ share/man/man1/lrelease.1 share/man/man1/lupdate.1 share/applnk/Development/linguist.desktop + lib/qt3/bin/l* + lib/qt3/bin/qm2ts + lib/qt3/phrasebooks << << SplitOff4: << @@ -314,10 +307,10 @@ Package: %N-doc Conflicts: qt-doc, qt2, qt Replaces: qt-doc, qt2, qt, qt3 - Files: share/doc/%N + Files: share/doc/%N lib/qt3/doc << -PreInstScript: rm -rf %p/share/qt3/mkspecs/default +PreInstScript: rm -rf %p/lib/qt3/mkspecs/default Homepage: http://www.trolltech.com/ Index: qt3-postgresql.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3-postgresql.info,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- qt3-postgresql.info 15 Mar 2006 22:20:19 -0000 1.14 +++ qt3-postgresql.info 20 Mar 2006 22:31:24 -0000 1.15 @@ -1,12 +1,12 @@ Package: qt3-postgresql Version: 3.3.6 -Revision: 1021 +Revision: 1022 Description: Cross-Platform GUI application framework (PostgreSQL Plugin) License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> -Depends: postgresql81-shlibs, qt3-shlibs (>= 3.3.5-1026) -BuildDepends: postgresql81-dev, qt3 (>= 3.3.5-1026) +Depends: postgresql81-shlibs, qt3-shlibs (>= 3.3.6-1022) +BuildDepends: postgresql81-dev, qt3 (>= 3.3.6-1022) Replaces: qt3, qt3-shlibs GCC: 4.0 Index: qt3-mysql.info =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3-mysql.info,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- qt3-mysql.info 15 Mar 2006 22:20:19 -0000 1.12 +++ qt3-mysql.info 20 Mar 2006 22:31:24 -0000 1.13 @@ -1,12 +1,12 @@ Package: qt3-mysql Version: 3.3.6 -Revision: 1021 +Revision: 1022 Description: Cross-Platform GUI application framework (MySQL Plugin) License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> -Depends: mysql14-shlibs (>= 4.1.10-1002), qt3-shlibs (>= 3.3.5-1026) -BuildDepends: mysql14-dev (>= 4.1.10-1002), qt3 (>= 3.3.5-1026) +Depends: mysql14-shlibs (>= 4.1.10-1002), qt3-shlibs (>= 3.3.6-1022) +BuildDepends: mysql14-dev (>= 4.1.10-1002), qt3 (>= 3.3.6-1022) Replaces: qt3, qt3-shlibs GCC: 4.0 Index: qt3.patch =================================================================== RCS file: /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- qt3.patch 16 Mar 2006 02:56:24 -0000 1.27 +++ qt3.patch 20 Mar 2006 22:31:24 -0000 1.28 @@ -1,6 +1,5 @@ -diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile --- qt-x11-free-3.3.6/Makefile 2005-01-03 11:08:00.000000000 -0500 -+++ qt-x11-free-3.3.6-new/Makefile 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/Makefile 2006-03-19 19:02:19.000000000 -0500 @@ -11,7 +11,7 @@ install: FORCE @$(MAKE) qt.install @@ -10,9 +9,8 @@ @echo @echo "The Qt library is now built in ./lib" @echo "The Qt examples are built in the directories in ./examples" -diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure --- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500 -+++ qt-x11-free-3.3.6-new/configure 2006-03-15 21:50:20.000000000 -0500 ++++ qt-x11-free-3.3.6-new/configure 2006-03-19 19:02:19.000000000 -0500 @@ -36,7 +36,7 @@ # need that throughout the script @@ -42,9 +40,8 @@ ;; *) ;; -diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h --- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000 -0500 -+++ qt-x11-free-3.3.6-new/include/qglobal.h 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/include/qglobal.h 2006-03-19 19:02:19.000000000 -0500 @@ -44,6 +44,10 @@ */ #define QT_VERSION 0x030306 @@ -76,9 +73,8 @@ #else # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL -diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h --- qt-x11-free-3.3.6/include/qprogressbar.h 2006-03-08 11:47:58.000000000 -0500 -+++ qt-x11-free-3.3.6-new/include/qprogressbar.h 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/include/qprogressbar.h 2006-03-19 19:02:19.000000000 -0500 @@ -61,6 +61,7 @@ public: QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 ); @@ -95,10 +91,9 @@ private: int total_steps; -diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf --- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf 2006-03-08 11:48:20.000000000 -0500 -+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-15 21:47:34.000000000 -0500 -@@ -9,19 +9,19 @@ ++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-20 10:03:17.000000000 -0500 +@@ -9,10 +9,10 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt warn_on release native_precompiled_headers @@ -111,9 +106,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -+QMAKE_CFLAGS = -pipe -fno-common -fPIC +@@ -21,7 +21,7 @@ QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -w @@ -131,20 +124,18 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -@@ -40,22 +40,22 @@ +@@ -40,8 +40,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = -+QMAKE_INCDIR = @PREFIX@/include/qt -+QMAKE_LIBDIR = @PREFIX@/lib ++QMAKE_INCDIR = @PREFIX@/lib/qt3/include ++QMAKE_LIBDIR = @PREFIX@/lib/qt3/lib QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_QT = $(QTDIR)/include --QMAKE_LIBDIR_QT = $(QTDIR)/lib -+QMAKE_INCDIR_QT = @PREFIX@/include/qt -+QMAKE_LIBDIR_QT = @PREFIX@/lib + QMAKE_INCDIR_QT = $(QTDIR)/include +@@ -49,13 +49,13 @@ QMAKE_INCDIR_OPENGL = /usr/X11R6/include QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib @@ -170,24 +161,17 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_QT = -lqt -@@ -73,20 +73,20 @@ - QMAKE_LIBS_OPENGL_QT = -lGL -lXmu - QMAKE_LIBS_THREAD = - --QMAKE_MOC = $(QTDIR)/bin/moc --QMAKE_UIC = $(QTDIR)/bin/uic -+QMAKE_MOC = @PREFIX@/bin/moc -+QMAKE_UIC = @PREFIX@/bin/uic +@@ -76,17 +76,17 @@ + QMAKE_MOC = $(QTDIR)/bin/moc + QMAKE_UIC = $(QTDIR)/bin/uic -QMAKE_AR = ar cq -QMAKE_RANLIB = ranlib -s +QMAKE_AR = /usr/bin/ar cq +QMAKE_RANLIB = /usr/bin/ranlib -s --QMAKE_TAR = tar -cf --QMAKE_GZIP = gzip -9f -+QMAKE_TAR = @PREFIX@/bin/tar -cf -+QMAKE_GZIP = @PREFIX@/bin/gzip -9f + QMAKE_TAR = tar -cf + QMAKE_GZIP = gzip -9f -QMAKE_COPY = cp -f +QMAKE_COPY = /bin/cp -f @@ -203,9 +187,8 @@ +QMAKE_DEL_DIR = /bin/rmdir +QMAKE_CHK_DIR_EXISTS = /bin/test -d +QMAKE_MKDIR = /bin/mkdir -p -diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h --- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27 11:19:20.000000000 -0400 -+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h 2006-03-19 19:02:19.000000000 -0500 @@ -74,12 +74,13 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN @@ -221,9 +204,8 @@ +#define QT_MITSHM #endif // QPLATFORMDEFS_H -diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix --- qt-x11-free-3.3.6/qmake/Makefile.unix 2006-02-28 05:32:54.000000000 -0500 -+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/qmake/Makefile.unix 2006-03-19 19:02:19.000000000 -0500 @@ -36,8 +36,8 @@ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ [EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@/include \ @@ -235,9 +217,8 @@ qmake: $(OBJS) $(QOBJS) $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) -diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp --- qt-x11-free-3.3.6/qmake/main.cpp 2006-03-08 11:48:02.000000000 -0500 -+++ qt-x11-free-3.3.6-new/qmake/main.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/qmake/main.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -49,7 +49,7 @@ // for Borland, main is defined to qMain which breaks qmake @@ -247,9 +228,8 @@ // for qurl bool qt_resolve_symlinks = FALSE; #endif -diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp --- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp 2006-03-08 11:47:45.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -761,7 +761,7 @@ #endif i++; @@ -286,9 +266,8 @@ arglistQ[0] = fileInfo.absFilePath().local8Bit(); #else arglistQ[0] = fileInfo.filePath().local8Bit(); -diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp --- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp 2006-03-08 11:47:47.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -2671,6 +2671,9 @@ void QWidget::createInputContext() @@ -299,9 +278,8 @@ QWidget *tlw = topLevelWidget(); QTLWExtra *topdata = tlw->topData(); -diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro --- qt-x11-free-3.3.6/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-19 19:02:19.000000000 -0500 @@ -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 @@ -311,9 +289,8 @@ target.path=$$bins.path INSTALLS += target -diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp --- qt-x11-free-3.3.6/src/network/qdns.cpp 2006-03-08 11:47:43.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/network/qdns.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -76,7 +76,7 @@ #include "qcleanuphandler.h" #include <limits.h> @@ -323,9 +300,8 @@ #endif //#define QDNS_DEBUG -diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri --- qt-x11-free-3.3.6/src/qt_professional.pri 2004-02-06 07:08:19.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/qt_professional.pri 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/qt_professional.pri 2006-03-19 19:02:19.000000000 -0500 @@ -25,7 +25,6 @@ unix { NETWORK_H = $$NETWORK_CPP @@ -334,9 +310,8 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/network include( $$QT_SOURCE_TREE/src/network/qt_network.pri ) DEFINES *= QT_MODULE_NETWORK -diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro --- qt-x11-free-3.3.6/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/qtmain.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/qtmain.pro 2006-03-19 19:02:19.000000000 -0500 @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = qtmain @@ -345,9 +320,8 @@ DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += qt staticlib warn_on release -diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp --- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp 2006-03-08 11:47:38.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -88,7 +88,7 @@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const @@ -357,9 +331,8 @@ QString name = dirName; if (dirName[dirName.length() - 1] == "/") name = dirName.left( dirName.length() - 1 ); -diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp --- qt-x11-free-3.3.6/src/tools/qglobal.cpp 2006-03-08 11:47:40.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -161,7 +161,7 @@ return TRUE; } @@ -369,9 +342,8 @@ #include "qt_mac.h" -diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.h --- qt-x11-free-3.3.6/src/tools/qglobal.h 2006-03-08 11:47:38.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qglobal.h 2006-03-19 19:02:19.000000000 -0500 @@ -44,6 +44,10 @@ */ #define QT_VERSION 0x030306 @@ -403,9 +375,8 @@ #else # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL -diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp --- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp 2006-03-08 11:47:38.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -316,7 +316,7 @@ #if defined(Q_OS_WIN32) @@ -415,9 +386,8 @@ QString filter = "*.dylib; *.so; *.bundle"; #elif defined(Q_OS_HPUX) QString filter = "*.sl"; -diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp --- qt-x11-free-3.3.6/src/tools/qlibrary.cpp 2006-03-08 11:47:37.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -400,7 +400,7 @@ filename += ".dll"; #else @@ -427,9 +397,8 @@ filters << ".so"; filters << ".bundle"; filters << ".dylib"; //the last one is also the default one.. -diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp --- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08 11:47:37.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -44,7 +44,7 @@ // POSIX threads mutex types #if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \ @@ -439,9 +408,8 @@ // 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 -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp --- qt-x11-free-3.3.6/src/tools/qstring.cpp 2006-03-08 11:47:39.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -1362,7 +1362,7 @@ QStringData* QString::makeSharedNull() { @@ -478,9 +446,8 @@ if ( sl == 1 ) return findRev( *str.unicode(), index, cs ); #endif -diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri --- qt-x11-free-3.3.6/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri 2006-03-19 19:02:19.000000000 -0500 @@ -101,10 +101,6 @@ $$TOOLS_CPP/qwaitcondition_unix.cpp @@ -492,9 +459,8 @@ unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp SOURCES += $$TOOLS_CPP/qbitarray.cpp \ -diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp --- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp 2006-03-08 11:47:58.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -105,7 +105,6 @@ initFrame(); } @@ -524,9 +490,8 @@ /*! This method is called to generate the text displayed in the center -diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h --- qt-x11-free-3.3.6/src/widgets/qprogressbar.h 2006-03-08 11:47:58.000000000 -0500 -+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h 2006-03-19 19:02:19.000000000 -0500 @@ -61,6 +61,7 @@ public: QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 ); @@ -543,9 +508,8 @@ private: int total_steps; -diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro --- qt-x11-free-3.3.6/tools/assistant/assistant.pro 2003-11-17 07:40:25.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-19 19:02:19.000000000 -0500 @@ -32,6 +32,8 @@ win32:RC_FILE = assistant.rc @@ -555,9 +519,8 @@ target.path = $$bins.path INSTALLS += target -diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro --- qt-x11-free-3.3.6/tools/designer/app/app.pro 2004-01-16 19:51:08.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro 2006-03-19 19:02:19.000000000 -0500 @@ -20,7 +20,8 @@ QMAKE_INFO_PLIST = Info_mac.plist staticlib:CONFIG -= global_init_link_order #yuck @@ -568,9 +531,8 @@ target.path=$$bins.path INSTALLS += target -diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro --- qt-x11-free-3.3.6/tools/designer/designer/designer.pro 2006-02-15 10:48:20.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro 2006-03-19 19:02:19.000000000 -0500 @@ -1,6 +1,6 @@ TEMPLATE = lib @@ -579,9 +541,8 @@ CONFIG -= dll !force_static:!win32:contains(QT_PRODUCT,qt-internal) { CONFIG -= staticlib -diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro --- qt-x11-free-3.3.6/tools/designer/editor/editor.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro 2006-03-19 19:02:19.000000000 -0500 @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on staticlib @@ -589,9 +550,8 @@ CONFIG -= dll HEADERS = editor.h \ parenmatcher.h \ -diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp --- qt-x11-free-3.3.6/tools/designer/uic/form.cpp 2005-08-31 06:13:47.000000000 -0400 -+++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp 2006-03-19 19:02:19.000000000 -0500 @@ -731,6 +731,13 @@ while ( !n2.isNull() ) { if ( n2.tagName() == "includehint" ) { @@ -606,9 +566,8 @@ localIncludes += file; } n2 = n2.nextSibling().toElement(); -diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro --- qt-x11-free-3.3.6/tools/designer/uic/uic.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-19 19:02:19.000000000 -0500 @@ -40,3 +40,6 @@ LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb SOURCES += mwerks_mac.cpp @@ -616,9 +575,8 @@ +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic + -diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro --- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500 @@ -43,6 +43,8 @@ staticlib:CONFIG -= global_init_link_order #yuck RC_FILE = linguist.icns @@ -628,9 +586,8 @@ PROJECTNAME = Qt Linguist -diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro --- qt-x11-free-3.3.6/tools/linguist/linguist.pro 2004-06-08 04:06:56.000000000 -0400 -+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro 2006-03-19 19:02:19.000000000 -0500 @@ -1,8 +1,5 @@ TEMPLATE = subdirs SUBDIRS = linguist \ @@ -640,9 +597,8 @@ lrelease \ lupdate \ qm2ts -diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro --- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro 2006-03-19 19:02:19.000000000 -0500 @@ -15,3 +15,6 @@ target.path=$$bins.path @@ -650,9 +606,8 @@ + +QMAKE_CFLAGS += -mdynamic-no-pic +QMAKE_CXXFLAGS += -mdynamic-no-pic -diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro --- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro 2006-03-19 19:02:19.000000000 -0500 @@ -19,3 +19,7 @@ target.path=$$bins.path @@ -661,9 +616,8 @@ +macx:CFLAGS += -mdynamic-no-pic +macx:CXXFLAGS += -mdynamic-no-pic + -diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro --- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro 2003-10-31 09:36:28.000000000 -0500 -+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro 2006-03-19 19:02:19.000000000 -0500 @@ -13,3 +13,6 @@ target.path=$$bins.path @@ -671,9 +625,8 @@ + +CFLAGS += -mdynamic-no-pic +CXXFLAGS += -mdynamic-no-pic -diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro --- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro 2005-07-19 20:59:24.000000000 -0400 -+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro 2006-03-15 21:47:34.000000000 -0500 ++++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro 2006-03-19 19:02:19.000000000 -0500 @@ -15,4 +15,7 @@ INSTALLS += target INCLUDEPATH += . ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits