Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4553/10.4/unstable/main/finkinfo/x11
Modified Files:
xft2-dev.info fontconfig2-dev-10.5.info
Log Message:
Sync with pangocairo-branch.
Index: xft2-dev.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xft2-dev.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xft2-dev.info 20 Jan 2006 20:34:22 -0000 1.1
+++ xft2-dev.info 30 Mar 2008 15:12:04 -0000 1.2
@@ -1,17 +1,23 @@
Package: xft2-dev
Version: 2.1.2
-Revision: 4
+Revision: 5
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
BuildDependsOnly: true
-BuildDepends: fontconfig2-dev, x11-dev, pkgconfig, x11-shlibs, freetype219,
expat
+BuildDepends: fontconfig2-dev, x11-dev, pkgconfig, x11-shlibs, freetype219,
expat1
Source-MD5: defb7e801d4938b8b15a426ae57e2f3f
Source: http://pdx.freedesktop.org/software/fontconfig/releases/xft-%v.tar.gz
NoSetCPPFLAGS: true
NoSetCFLAGS: true
+PatchScript: <<
+ perl -pi.bak \
+ -e "s|<freetype/freetype.h>|<ft2build.h>\n#include FT_FREETYPE_H|" \
+ Xft.h
+<<
#ConfigureParams: --prefix=%p/lib/xft2 --disable-shared --mandir=%p/share/man
CompileScript: <<
-#!/bin/sh -e
+#!/bin/sh -ev
export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig/"
+export PATH="%p/lib/freetype219/bin:$PATH"
./configure --prefix=%p/lib/xft2 --disable-shared --mandir=%i/share/man
make
<<
Index: fontconfig2-dev-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev-10.5.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fontconfig2-dev-10.5.info 19 Dec 2007 18:10:07 -0000 1.4
+++ fontconfig2-dev-10.5.info 30 Mar 2008 15:12:04 -0000 1.5
@@ -1,6 +1,6 @@
Package: fontconfig2-dev
Version: 2.4.1
-Revision: 101
+Revision: 102
Distribution: 10.5
Description: Font configuration library
Type: nosource
@@ -19,6 +19,8 @@
#!/bin/sh -ev
FC_ROOT="%i/lib/fontconfig2"
+ FC_LIB="%p/lib/fontconfig2/lib"
+ FT_LIB="%p/lib/freetype219/lib"
X11_ROOT="/usr/X11"
declare -a bad_files
@@ -39,11 +41,9 @@
for file in \
include/fontconfig \
- lib/pkgconfig/fontconfig.pc \
lib/libfontconfig.1.1.0.dylib \
lib/libfontconfig.1.dylib \
lib/libfontconfig.dylib \
- lib/libfontconfig.la \
bin/fc-cache \
bin/fc-cat \
bin/fc-list \
@@ -53,6 +53,20 @@
/bin/ln -sfh "$X11_ROOT/$file" "$FC_ROOT/$file"
done
+ # Use fink's freetype219 and expat1
+ sed -e "s|-L$X11_ROOT/lib||g" \
+ -e "s|$X11_ROOT/lib/libfreetype.la|-L$FT_LIB
$FT_LIB/libfreetype.la|" \
+ -e "s|/usr/lib/libexpat.la|-L%p/lib %p/lib/libexpat.la|" \
+ -e "s|libdir=$X11_ROOT/lib|libdir=$FC_LIB|" \
+ "$X11_ROOT/lib/libfontconfig.la" > "$FC_ROOT/lib/libfontconfig.fink.la"
+ /bin/ln -sfh "$FC_LIB/libfontconfig.fink.la" \
+ "$FC_ROOT/lib/libfontconfig.la"
+ sed -e "s|$X11_ROOT|%p/lib/fontconfig2|" \
+ "$X11_ROOT/lib/pkgconfig/fontconfig.pc" \
+ > "$FC_ROOT/lib/pkgconfig/fontconfig.fink.pc"
+ /bin/ln -sfh "$FC_LIB/pkgconfig/fontconfig.fink.pc" \
+ "$FC_ROOT/lib/pkgconfig/fontconfig.pc"
+
if [ ${#bad_files[*]} -gt 0 ]; then
echo ""
echo ""
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
