OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jun-2009 20:34:47
Branch: HEAD Handle: 2009062519344600
Modified files:
openpkg-src/fontconfig fontconfig.patch fontconfig.spec
Log:
upgrading package: fontconfig 2.6.0 -> 2.7.0
Summary:
Revision Changes Path
1.8 +6 -7 openpkg-src/fontconfig/fontconfig.patch
1.54 +5 -8 openpkg-src/fontconfig/fontconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 fontconfig.patch
--- openpkg-src/fontconfig/fontconfig.patch 25 May 2008 07:48:17 -0000
1.7
+++ openpkg-src/fontconfig/fontconfig.patch 25 Jun 2009 18:34:46 -0000
1.8
@@ -1,12 +1,11 @@
Index: fontconfig.pc.in
---- fontconfig.pc.in.orig 2008-05-25 01:30:47 +0200
-+++ fontconfig.pc.in 2008-05-25 09:45:54 +0200
-@@ -6,6 +6,7 @@
- Name: Fontconfig
+--- fontconfig.pc.in.orig 2009-06-24 19:52:14 +0200
++++ fontconfig.pc.in 2009-06-25 20:30:31 +0200
+@@ -7,5 +7,6 @@
Description: Font configuration and customization library
Version: @VERSION@
-+Requires: freetype2
Libs: -L${libdir} -lfontconfig
--Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
-+Libs.private: -liconv @EXPAT_LIBS@
+-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
++Libs.private: @EXPAT_LIBS@ @ICONV_LIBS@
++Requires: freetype2 libxml-2.0
Cflags: -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 fontconfig.spec
--- openpkg-src/fontconfig/fontconfig.spec 18 Apr 2009 13:10:23 -0000
1.53
+++ openpkg-src/fontconfig/fontconfig.spec 25 Jun 2009 18:34:46 -0000
1.54
@@ -31,8 +31,8 @@
Class: BASE
Group: XWindow
License: GPL
-Version: 2.6.0
-Release: 20080908
+Version: 2.7.0
+Release: 20090625
# package options
%option with_x11 no
@@ -46,8 +46,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, grep
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: libiconv, freetype, expat
-PreReq: libiconv, freetype, expat
+BuildPreReq: libiconv, freetype, expat, libxml
+PreReq: libiconv, freetype, expat, libxml
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
@@ -77,15 +77,12 @@
%if "%{with_x11}" == "yes"
x11inc=`%{l_rc} --query x11_incdir`
x11lib=`%{l_rc} --query x11_libdir`
-%endif
%{l_shtool} subst \
- -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
-%if "%{with_x11}" == "yes"
-e "s;/usr/X11R6/lib/X11;$x11lib/X11;g" \
-e 's;/usr/X11/lib/X11;;g' \
-e 's;/usr/lib/X11;;g' \
-%endif
configure
+%endif
( echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}'
) >config.cache
CC="%{l_cc}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
