Author: ranger
Date: Sat Nov 3 21:29:46 2007
New Revision: 1048
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1048&repname=user%3a+ranger
Log:
run the right fc-cache
Modified:
trunk/experimental/10.4/main/finkinfo/x11/qt3.info
trunk/experimental/10.4/main/finkinfo/x11/qt3.patch
trunk/experimental/common/main/finkinfo/x11/qt3.info
trunk/experimental/common/main/finkinfo/x11/qt3.patch
Modified: trunk/experimental/10.4/main/finkinfo/x11/qt3.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/qt3.info&rev=1048&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/qt3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/x11/qt3.info Sat Nov 3 21:29:46 2007
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.8
-Revision: 6
+Revision: 1027
Description: Cross-Platform GUI application framework
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -17,6 +17,7 @@
cctools (>= 446-0) | cctools-single-module,
cups-dev,
fink (>= 0.26.0-1),
+ fontconfig2-dev (>= 2.4.1-1),
freetype219,
libgl-dev,
libpng3 (>= 1.2.8-1),
@@ -155,7 +156,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"
@@ -173,13 +174,14 @@
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/lib/fontconfig2/include' '-L%p/lib/fontconfig2/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 \
+ -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 \
@@ -309,6 +311,7 @@
Package: %N-shlibs
Depends: <<
fink (>= 0.26.0-1),
+ fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs,
libgl-shlibs,
libpng3-shlibs (>= 1.2.8-1),
@@ -346,7 +349,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
Modified: trunk/experimental/10.4/main/finkinfo/x11/qt3.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/qt3.patch&rev=1048&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/qt3.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/x11/qt3.patch Sat Nov 3 21:29:46 2007
@@ -117,7 +117,7 @@
DEFINES += __DARWIN_X11__
-QMAKE_CC = cc
-+QMAKE_CC = gcc-4.0
++QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
@@ -135,7 +135,7 @@
QMAKE_CFLAGS_THREAD =
-QMAKE_CXX = c++
-+QMAKE_CXX = g++-4.0
++QMAKE_CXX = c++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -157,8 +157,8 @@
-QMAKE_LINK = c++
-QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
-+QMAKE_LINK = g++-4.0
-+QMAKE_LINK_SHLIB = g++-4.0
++QMAKE_LINK = c++
++QMAKE_LINK_SHLIB = c++
+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 =
Modified: trunk/experimental/common/main/finkinfo/x11/qt3.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt3.info&rev=1048&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt3.info Sat Nov 3 21:29:46
2007
@@ -1,7 +1,7 @@
Package: qt3
Version: 3.3.8
-Revision: 6
-GCC: 3.3
+Revision: 1027
+GCC: 4.0
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
aus-AU: http://public.ftp.planetmirror.com.au/pub/trolltech/qt/source
@@ -38,8 +38,8 @@
cctools (>= 446) | cctools-single-module,
cups-dev,
fink (>= 0.17.3-1),
+ fontconfig2-dev (>= 2.4.1-1),
freetype219,
- gcc3.3,
libgl-dev,
libpng3 (>= 1.2.5-4),
libjpeg,
@@ -140,7 +140,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"
@@ -158,13 +158,14 @@
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/lib/fontconfig2/include' '-L%p/lib/fontconfig2/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 \
+ -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 \
@@ -297,7 +298,7 @@
Suggests: %N-designer, %N-linguist, %N-doc
Replaces: qt-shlibs, qt, qt3
Conflicts: qt-shlibs, qt
- Depends: fink (>= 0.17.1-1), freetype219-shlibs, libgl-shlibs,
libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, x11-shlibs
+ Depends: fink (>= 0.17.1-1), fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs, libgl-shlibs, libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs,
x11-shlibs
Shlibs: <<
%p/lib/libeditor.1.dylib 1.0.0 %n (>= 3.3.6-2)
%p/lib/libqt-mt.3.dylib 3.3.0 %n (>= 3.3.6-2)
@@ -314,7 +315,7 @@
lib/%N/plugins/sqldrivers
<<
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
Modified: trunk/experimental/common/main/finkinfo/x11/qt3.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt3.patch&rev=1048&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt3.patch (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt3.patch Sat Nov 3 21:29:46
2007
@@ -121,7 +121,7 @@
DEFINES += __DARWIN_X11__
-QMAKE_CC = cc
-+QMAKE_CC = gcc-3.3
++QMAKE_CC = cc
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
@@ -139,7 +139,7 @@
QMAKE_CFLAGS_THREAD =
-QMAKE_CXX = c++
-+QMAKE_CXX = g++-3.3
++QMAKE_CXX = c++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
@@ -161,8 +161,8 @@
-QMAKE_LINK = c++
-QMAKE_LINK_SHLIB = c++
-QMAKE_LFLAGS =
-+QMAKE_LINK = g++-3.3
-+QMAKE_LINK_SHLIB = g++-3.3
++QMAKE_LINK = c++
++QMAKE_LINK_SHLIB = c++
+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 =
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
