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: 08-Sep-2008 08:46:28
Branch: HEAD Handle: 2008090807462700
Modified files:
openpkg-src/fontconfig fontconfig.spec
Log:
allow fontconfig to be build without X11 by default
Summary:
Revision Changes Path
1.52 +19 -4 openpkg-src/fontconfig/fontconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 fontconfig.spec
--- openpkg-src/fontconfig/fontconfig.spec 1 Jun 2008 15:23:49 -0000
1.51
+++ openpkg-src/fontconfig/fontconfig.spec 8 Sep 2008 06:46:27 -0000
1.52
@@ -32,7 +32,10 @@
Group: XWindow
License: GPL
Version: 2.6.0
-Release: 20080601
+Release: 20080908
+
+# package options
+%option with_x11 no
# list of sources
Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -43,8 +46,12 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, grep
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: X11, libiconv, freetype, expat
-PreReq: X11, libiconv, freetype, expat
+BuildPreReq: libiconv, freetype, expat
+PreReq: libiconv, freetype, expat
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
AutoReq: no
AutoReqProv: no
@@ -67,13 +74,17 @@
%patch -p0
%build
+%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
( echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}'
) >config.cache
@@ -87,16 +98,20 @@
--cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+%if "%{with_x11}" == "yes"
--with-x \
--x-includes=$x11inc \
--x-libraries=$x11lib \
+ --with-default-fonts=$x11lib/X11/fonts/TTF \
+%else
+ --without-x \
+%endif
--with-glib-prefix=%{l_prefix} \
--with-freetype-config=%{l_prefix}/bin/freetype-config \
--with-expat=%{l_prefix} \
--with-confdir=%{l_prefix}/etc/fontconfig \
--with-docdir=%{l_prefix}/share/fontconfig \
--with-cache-dir=%{l_prefix}/var/fontconfig \
- --with-default-fonts=$x11lib/X11/fonts/TTF \
--disable-nls \
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
