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: 25-Feb-2006 09:38:52
Branch: HEAD Handle: 2006022508385100
Added files:
openpkg-src/fontconfig fontconfig.patch
Modified files:
openpkg-src/fontconfig fontconfig.spec
Log:
upgrading package: fontconfig 2.3.93 -> 2.3.94
Summary:
Revision Changes Path
1.3 +19 -0 openpkg-src/fontconfig/fontconfig.patch
1.28 +8 -7 openpkg-src/fontconfig/fontconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.patch
============================================================================
$ cvs diff -u -r0 -r1.3 fontconfig.patch
--- /dev/null 2006-02-25 09:38:48 +0100
+++ fontconfig.patch 2006-02-25 09:38:51 +0100
@@ -0,0 +1,19 @@
+Index: fc-cat/fc-cat.c
+--- fc-cat/fc-cat.c.orig 2006-02-21 15:10:42 +0100
++++ fc-cat/fc-cat.c 2006-02-25 09:35:29 +0100
+@@ -377,6 +377,7 @@
+ return FcFalse;
+ }
+
++#if 0
+ FcBool
+ FcFileIsDir (const FcChar8 *file)
+ {
+@@ -386,6 +387,7 @@
+ return FcFalse;
+ return S_ISDIR(statb.st_mode);
+ }
++#endif
+
+ int
+ main (int argc, char **argv)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 fontconfig.spec
--- openpkg-src/fontconfig/fontconfig.spec 1 Jan 2006 13:13:38 -0000
1.27
+++ openpkg-src/fontconfig/fontconfig.spec 25 Feb 2006 08:38:51 -0000
1.28
@@ -32,11 +32,12 @@
Class: BASE
Group: XWindow
License: GPL
-Version: 2.3.93
-Release: 20051221
+Version: 2.3.94
+Release: 20060225
# list of sources
Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
+Patch0: fontconfig.patch
# build information
Prefix: %{l_prefix}
@@ -62,10 +63,7 @@
%prep
%setup -q
- echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}' >config.cache
- %{l_shtool} subst \
- -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
- configure
+ %patch -p0
%build
x11inc=`%{l_rc} --query x11_incdir`
@@ -73,7 +71,8 @@
# make configure look only in our path
%{l_shtool} subst \
- -e "s;/usr/X11R6/lib/X11;$x11lib/X11;"g \
+ -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+ -e "s;/usr/X11R6/lib/X11;$x11lib/X11;g" \
-e 's;/usr/X11/lib/X11;;g' \
-e 's;/usr/lib/X11;;g' \
configure
@@ -83,12 +82,14 @@
-e '/^Libs:/s;$; -liconv -lfreetype -lexpat;' \
fontconfig.pc.in
+ echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}' >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
LIBS="-liconv" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--with-x \
--x-includes=$x11inc \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
