OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Nov-2006 12:12:58
Branch: HEAD Handle: 2006111211125800
Modified files:
openpkg-src/cairo cairo.patch cairo.spec
Log:
try to fix 'pkg-config cairo --libs' output under static linking world
order by moving freetype behind fontconfig
Summary:
Revision Changes Path
1.11 +15 -3 openpkg-src/cairo/cairo.patch
1.27 +1 -1 openpkg-src/cairo/cairo.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 cairo.patch
--- openpkg-src/cairo/cairo.patch 15 Jul 2006 08:23:17 -0000 1.10
+++ openpkg-src/cairo/cairo.patch 12 Nov 2006 11:12:58 -0000 1.11
@@ -1,7 +1,19 @@
+Index: configure
+--- configure.orig 2006-11-12 12:09:11 +0100
++++ configure 2006-11-12 12:10:38 +0100
+@@ -26071,7 +26071,7 @@
+ fi
+
+ if test "x$freetype_pkgconfig" = "xyes"; then
+- ft_REQUIRES="freetype2 >= $FREETYPE_MIN_VERSION $ft_REQUIRES"
++ ft_REQUIRES="$ft_REQUIRES freetype2 >= $FREETYPE_MIN_VERSION"
+ else
+
+ if test -z "$FREETYPE_CONFIG"; then
Index: src/cairoint.h
---- src/cairoint.h.orig 2006-06-30 02:05:59 +0200
-+++ src/cairoint.h 2006-07-15 10:20:06 +0200
-@@ -160,8 +160,6 @@
+--- src/cairoint.h.orig 2006-11-02 23:53:40 +0100
++++ src/cairoint.h 2006-11-12 12:09:11 +0100
+@@ -171,8 +171,6 @@
#endif
#ifndef CAIRO_MUTEX_DECLARE
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 cairo.spec
--- openpkg-src/cairo/cairo.spec 3 Nov 2006 07:21:00 -0000 1.26
+++ openpkg-src/cairo/cairo.spec 12 Nov 2006 11:12:58 -0000 1.27
@@ -33,7 +33,7 @@
Group: Graphics
License: MIT-style
Version: 1.2.6
-Release: 20061103
+Release: 20061112
# package options
%option with_pdf yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
