Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29503/main/finkinfo/graphics
Modified Files:
Tag: pangocairo-branch
cairo.info
Log Message:
* Fix odd linking problems (multiple linking with /usr and /sw, or only /usr)
There are some miss linking dylibs, wrongly linking with system's dylib.
For example, expat, freetype, libpng etc.
This problems arise due to the update of fontconfig2-dev in Nov. 2007.
I fix following packages:
x11/fontconfig2-dev-10.5.info
- Modifiy libfontconfig.la and fontconfig.pc for fink builds.
x11/xft2-dev.info
- Add %p/lib/freetype219/bin to PATH.
- Modify Xft.h in order to build on Leopard.
- Switch to expat1.
graphics/cairo.info
- Add %p/lib/pkgconfig to PKG_CONFIG_PATH. `pwd` is not needed.
gnome/pango1-xft2-ft219.info
- Depends on xft2-dev (>= 2.1.2-5). Don't use system's Xft.la.
- Add %p/lib/xft2/lib/pkgconfig:%p/lib/pkgconfig to PKG_CONFIG_PATH.
gnome/pango1-xft2-ft219.patch
- $(XFT_LIBS) must be before $(X_LIBS) in order to link correctly.
Note: Package should be update if it depend on packages above.
Index: cairo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/cairo.info,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -d -r1.9.2.17 -r1.9.2.18
--- cairo.info 26 Jan 2008 22:27:25 -0000 1.9.2.17
+++ cairo.info 30 Mar 2008 14:56:33 -0000 1.9.2.18
@@ -1,6 +1,6 @@
Package: cairo
Version: 1.4.14
-Revision: 1
+Revision: 3
Description: Vector graphics library
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -11,7 +11,7 @@
<<
BuildDepends: <<
expat1,
- fontconfig2-dev (>= 2.4.1-1),
+ fontconfig2-dev (>= 2.4.1-102),
freetype219,
glitz (>= 0.5.6-1),
pkgconfig (>= 0.21-1),
@@ -40,7 +40,7 @@
#!/bin/sh -ex
export lt_cv_sys_max_cmd_len=65536
export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH"
- export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:`pwd`:$PKG_CONFIG_PATH"
+ export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
./configure %c
find . -name Makefile | xargs perl -pi -e 's,^CAIRO_CFLAGS =
,CAIRO_CFLAGS = -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include ,'
make
@@ -58,7 +58,7 @@
Package: %N-shlibs
Depends: <<
expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
+ fontconfig2-shlibs (>= 2.4.1-102),
freetype219-shlibs,
glitz-shlibs (>= 0.5.6-1),
libgl-shlibs,
-------------------------------------------------------------------------
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
