Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32372/graphics

Added Files:
        qt3mac.info qt3mac.patch qt3mac-mysql.info 
        qt3mac-postgresql.info 
Log Message:
>From unstable

--- NEW FILE: qt3mac.info ---
Package: qt3mac
Version: 3.3.6
Revision: 12
GCC: 4.0
CustomMirror: <<
  Primary: ftp://ftp.trolltech.com/qt/source
  aus-AU: http://public.ftp.planetmirror.com.au/pub/trolltech/qt/source
  eur-DE: ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source
  eur-DE: http://wftp.tu-chemnitz.de/pub/Qt/source
  eur-ES: http://sunsite.rediris.es/mirror/Qt/source
  eur-GR: http://ftp.ntua.gr/pub/X11/Qt/qt/source
  eur-NO: ftp://ftp.trolltech.com/qt/source
  eur-RO: http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources
  nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source
<<
Source: mirror:custom:qt-mac-free-%v.tar.bz2
Source-MD5: 963f3efadbeef238ffc8a6faa14467eb
SourceDirectory: qt-mac-free-%v
Description: Aqua version of QT3 library and tools
Depends: %N-shlibs (>= %v-%r), pkgconfig
BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, freetype219, 
libpng3 (>= 1.2.5-4), libjpeg
BuildConflicts: qt3, qt3-designer, qt3-dev, autogen-dev
BuildDependsOnly: true
PatchScript: <<
#!/bin/sh -ex
 sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 perl -pi.bak -e 's|cp \-P|cp \-Rp|' qmake/Makefile.unix
<<
NoSetLDFLAGS: true
CompileScript: <<
#!/bin/sh -ex

 unset QMAKESPEC
 export QTDIR=%b
 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=""
 LIBRESOLV="-lresolv"
 echo "yes" | ./configure \
        '-I$(QTDIR)/include' '-I%p/lib/freetype219/include/freetype2' \
        '-L%p/lib/freetype219/lib' '-I%p/include' \
        '-L$(QTDIR)/lib' '-L%p/lib' $LIBRESOLV \
        -platform macx-g++ -xplatform macx-g++ \
        -translationdir '%p/share/%n/translations' \
        -prefix '%p/lib/%n'  -docdir '%p/share/doc/%n' \
        -datadir '%p/share/%n' \
        -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 -verbose \
        -plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql
# don't link against older versions of self
/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e 
's,-L%p/lib/%n/lib,,g'
# 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`; popd
 /usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e 
"s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)%p,g"
# 
 make
<<
InstallScript: <<
#!/bin/sh -e
 make install INSTALL_ROOT=%d
# remove stuff from the libtool archive that libtool doesn't understand
 perl -pi.bak -e 's,\$\(QTDIR\),%p,g;s,\-framework.*,\-lz \-ldl'\'',g' 
%i/lib/%n/lib/libqt-mt.la
# move the app bundles; the AppBundles field seems not to work here...
 /usr/bin/install -d -m 755 %i/Applications
 for APP in assistant designer linguist qtconfig
   do
     /bin/mv %i/lib/%n/bin/${APP}.app %i/Applications/
   done
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: freetype219-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs
  Shlibs: <<
    %p/lib/%N/lib/libqt-mt.3*.dylib 3.3.0 %n (>= 3.3.4-1)
    %p/lib/%N/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.4-1)
  <<
  Files: <<
    lib/%N/lib/libqt-mt.*.dylib
    lib/%N/lib/libqui.*.dylib
  <<
<<
SplitOff2: <<
  Package: %N-apps
  Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4)
  Files: <<
    Applications/*.app
    share/%N/{phrasebooks,templates,translations}
    lib/%N/plugins
  <<
  PostInstScript: <<
   if ! test -e /Applications/Fink; then /usr/bin/install -d -m 755 
/Applications/Fink; fi
   for APP in assistant designer linguist qtconfig
   do
     ln -sf %p/Applications/${APP}.app /Applications/Fink/
   done
  <<
  PostRmScript: for APP in assistant designer linguist qtconfig; do rm -f 
/Applications/Fink/${APP}.app; done
<<
SplitOff3: <<
  Package: %N-doc
  Files: share/doc/%N
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* changes*
License: GPL
DescUsage: <<
 This version is independent of X11. 
 It installs the applications assistant, designer, linguist, qtconfig in 
 %p/Applications and makes double-clickable symbolic links to them
 in /Applications/Fink/.
 Since it installs into %p/lib/qt3mac and %/share/qt3mac, it can coexist with 
 the qt3 packages. To use its dylibs, set QTDIR to %p/lib/qt3mac.
 Fink packages that want to use it will also have to use
  BuildConflicts: qt3, qt3-dev
<<
DescPort: Adapted from Benjamin Reed's qt3 package
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/


--- NEW FILE: qt3mac.patch ---
diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf 
qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf
--- qt-mac-free-3.3.5/mkspecs/macx-g++/qmake.conf       2005-09-02 
14:43:36.000000000 +0200
+++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qmake.conf  2005-10-09 
20:21:18.000000000 +0200
@@ -26,6 +26,7 @@
 QMAKE_CFLAGS_DEBUG     = -g
 QMAKE_CFLAGS_SHLIB     = -fPIC
 QMAKE_EXTENSION_SHLIB  = dylib
+QMAKE_EXTENSION_PLUGIN  = so
 QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 
 QMAKE_CXX              = c++
@@ -38,9 +39,9 @@
 QMAKE_CXXFLAGS_SHLIB   = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
 
-QMAKE_LIBDIR           =
-QMAKE_INCDIR_QT                = $(QTDIR)/include
-QMAKE_LIBDIR_QT                = $(QTDIR)/lib
+QMAKE_LIBDIR           = @PREFIX@/lib/qt3mac/lib
+QMAKE_INCDIR_QT                = @PREFIX@/lib/qt3mac/include
+QMAKE_LIBDIR_QT                = @PREFIX@/lib/qt3mac/lib
 QMAKE_INCDIR_OPENGL    = /System/Library/Frameworks/OpenGL.framework/Headers \
        /System/Library/Frameworks/AGL.framework/Headers/
 
@@ -51,12 +52,12 @@
 QMAKE_LFLAGS_RELEASE   =
 QMAKE_LFLAGS_DEBUG     =
 QMAKE_LFLAGS_APP       = -prebind
-QMAKE_LFLAGS_SHLIB     = -prebind -dynamiclib 
-QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
+QMAKE_LFLAGS_SHLIB     = -prebind -dynamiclib -single_module
+QMAKE_LFLAGS_INCREMENTAL = -undefined dynamic_lookup
 QMAKE_LFLAGS_PLUGIN    = -bundle
 #You probably don't want to mess with this, instead look at 
install_name_tool(1)
 #QMAKE_LFLAGS_SONAME   = [EMAIL PROTECTED]/../Frameworks/
-QMAKE_LFLAGS_SONAME    = -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_SONAME    = -install_name$${LITERAL_WHITESPACE}$$QMAKE_LIBDIR/
 QMAKE_LFLAGS_THREAD    = 
 
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
@@ -64,7 +65,7 @@
 
 QMAKE_RPATH            = 
 
-QMAKE_LIBS_DYNLOAD     =
+QMAKE_LIBS_DYNLOAD     = -ldl
 QMAKE_LIBS_QT          = -lqt
 QMAKE_LIBS_QT_THREAD   = -lqt-mt
 QMAKE_LIBS_OPENGL      = -framework OpenGL -framework AGL
diff -Naur qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h 
qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h
--- qt-mac-free-3.3.5/mkspecs/macx-g++/qplatformdefs.h  2005-05-05 
02:17:04.000000000 +0200
+++ qt-mac-free-3.3.5_corr/mkspecs/macx-g++/qplatformdefs.h     2005-10-09 
16:17:40.000000000 +0200
@@ -22,6 +22,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
+#include <dlfcn.h>
 #define QT_NO_LIBRARY_UNLOAD
 
 #include <sys/types.h>
diff -Naur qt-mac-free-3.3.5/src/network/qdns.cpp 
qt-mac-free-3.3.5_corr/src/network/qdns.cpp
--- qt-mac-free-3.3.5/src/network/qdns.cpp      2005-09-02 14:42:59.000000000 
+0200
+++ qt-mac-free-3.3.5_corr/src/network/qdns.cpp 2005-10-09 20:28:15.000000000 
+0200
@@ -76,7 +76,8 @@
 #include "qcleanuphandler.h"
 #include <limits.h>
 #ifdef Q_OS_MAC
-#include "../3rdparty/dlcompat/dlfcn.h"
+#include <dlfcn.h>
+#define DL_PREFIX(x) x
 #endif
 
 //#define QDNS_DEBUG
diff -Naur qt-mac-free-3.3.5/src/qt_professional.pri 
qt-mac-free-3.3.5_corr/src/qt_professional.pri
--- qt-mac-free-3.3.5/src/qt_professional.pri   2004-02-06 13:08:19.000000000 
+0100
+++ qt-mac-free-3.3.5_corr/src/qt_professional.pri      2005-10-09 
16:20:08.000000000 +0200
@@ -25,7 +25,6 @@
        unix {
                NETWORK_H       = $$NETWORK_CPP
        }
-       mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
        INCLUDEPATH += $$QT_SOURCE_TREE/src/network
        include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
        DEFINES     *= QT_MODULE_NETWORK
diff -Naur qt-mac-free-3.3.5/src/tools/qt_tools.pri 
qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri
--- qt-mac-free-3.3.5/src/tools/qt_tools.pri    2004-04-01 12:20:06.000000000 
+0200
+++ qt-mac-free-3.3.5_corr/src/tools/qt_tools.pri       2005-10-09 
16:22:01.000000000 +0200
@@ -101,10 +101,6 @@
                  $$TOOLS_CPP/qwaitcondition_unix.cpp
 
         mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
-       mac {
-               SOURCES+=3rdparty/dlcompat/dlfcn.c
-               INCLUDEPATH+=3rdparty/dlcompat
-           }
        unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
 
        SOURCES += $$TOOLS_CPP/qbitarray.cpp \

--- NEW FILE: qt3mac-mysql.info ---
Package: qt3mac-mysql
Version: 3.3.6
Revision: 1001
GCC: 4.0
CustomMirror: <<
  Primary: ftp://ftp.trolltech.com/qt/source
  aus-AU: http://public.ftp.planetmirror.com.au/pub/trolltech/qt/source
  eur-DE: ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source
  eur-DE: http://wftp.tu-chemnitz.de/pub/Qt/source
  eur-ES: http://sunsite.rediris.es/mirror/Qt/source
  eur-GR: http://ftp.ntua.gr/pub/X11/Qt/qt/source
  eur-NO: ftp://ftp.trolltech.com/qt/source
  eur-RO: http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources
  nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source
<<
Source: mirror:custom:qt-mac-free-%v.tar.bz2
Source-MD5: 963f3efadbeef238ffc8a6faa14467eb
SourceDirectory: qt-mac-free-%v
Description: Aqua version of QT3 (MySQL Plugin)
Depends: mysql14-shlibs (>= 4.1.10-1002), qt3mac-shlibs (>= %v-1)
BuildDepends: mysql14-dev (>= 4.1.10-1002), qt3mac (>= %v-1)
BuildConflicts: qt3, qt3-dev
Replaces: qt3mac, qt3mac-shlibs
PatchScript: <<
  perl -pi.bak -e 's,REQUIRES.*=.*sql.*,,' plugins/src/sqldrivers/*/*.pro
<<
CompileScript: <<
#!/bin/sh -ex

 export QTDIR=%p/lib/qt3mac
 export QMAKESPEC=%p/share/qt3mac/mkspecs/darwin-g++
 export PATH=%p/lib/qt3mac/bin:$PATH

 pushd plugins/src/sqldrivers/mysql
 qmake -o Makefile "INCLUDEPATH += %p/include/mysql" "LIBS += 
-L%p/lib/qt3mac/lib -L%p/lib" mysql.pro 
 make
<<
InstallScript: <<
#!/bin/sh -ex

 install -d -m 755 %i/lib/qt3mac/plugins/sqldrivers
 install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3mac/plugins/sqldrivers/
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* changes*
License: GPL
DescPort: Adapted from Benjamin Reed's qt3 packages
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/


--- NEW FILE: qt3mac-postgresql.info ---
Package: qt3mac-postgresql
Version: 3.3.6
Revision: 1001
GCC: 4.0
CustomMirror: <<
  Primary: ftp://ftp.trolltech.com/qt/source
  aus-AU: http://public.ftp.planetmirror.com.au/pub/trolltech/qt/source
  eur-DE: ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source
  eur-DE: http://wftp.tu-chemnitz.de/pub/Qt/source
  eur-ES: http://sunsite.rediris.es/mirror/Qt/source
  eur-GR: http://ftp.ntua.gr/pub/X11/Qt/qt/source
  eur-NO: ftp://ftp.trolltech.com/qt/source
  eur-RO: http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources
  nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source
<<
Source: mirror:custom:qt-mac-free-%v.tar.bz2
Source-MD5: 963f3efadbeef238ffc8a6faa14467eb
SourceDirectory: qt-mac-free-%v
Description: Aqua version of QT3 (PostgreSQL Plugin)
Depends: postgresql80-unified-shlibs, qt3mac-shlibs (>= %v-1)
BuildDepends: postgresql80-unified-dev, qt3mac (>= %v-1)
BuildConflicts: qt3, qt3-dev
Replaces: qt3mac, qt3mac-shlibs
PatchScript: <<
  perl -pi.bak -e 's,REQUIRES.*=.*sql.*,,' plugins/src/sqldrivers/*/*.pro
<<
CompileScript: <<
#!/bin/sh -ex

 export QTDIR=%p/lib/qt3mac
 export QMAKESPEC=%p/share/qt3mac/mkspecs/darwin-g++
 export PATH=%p/lib/qt3mac/bin:$PATH

 pushd plugins/src/sqldrivers/psql
 qmake -o Makefile "INCLUDEPATH += %p/include/postgresql" "LIBS += 
-L%p/lib/qt3mac/lib -L%p/lib" psql.pro 
 make
<<
InstallScript: <<
#!/bin/sh -ex

 install -d -m 755 %i/lib/qt3mac/plugins/sqldrivers
 install -c -m 755 plugins/sqldrivers/*.so %i/lib/qt3mac/plugins/sqldrivers/
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* changes*
License: GPL
DescPort: Adapted from Benjamin Reed's qt3 packages
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to