OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: t...@openpkg.org
Module: openpkg-src Date: 10-Apr-2009 22:46:57
Branch: HEAD Handle: 2009041021465700
Modified files:
openpkg-src/xpdf xpdf.spec
Log:
freetype and t1lib are always needed, even with_x11=no
Summary:
Revision Changes Path
1.30 +7 -5 openpkg-src/xpdf/xpdf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 xpdf.spec
--- openpkg-src/xpdf/xpdf.spec 10 Apr 2009 17:42:42 -0000 1.29
+++ openpkg-src/xpdf/xpdf.spec 10 Apr 2009 20:46:57 -0000 1.30
@@ -50,9 +50,11 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: freetype >= 2.2, t1lib
+PreReq: freetype >= 2.2, t1lib
%if "%{with_x11}" == "yes"
-BuildPreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif
-PreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif
+BuildPreReq: X11, xpm, openmotif
+PreReq: X11, xpm, openmotif
%endif
AutoReq: no
AutoReqProv: no
@@ -97,13 +99,13 @@
--with-appdef-dir=%{l_prefix}/share/xpdf \
--with-Xpm-includes=%{l_prefix}/include \
--with-Xpm-library=%{l_prefix}/lib \
+%else
+ --without-x \
+%endif
--with-t1-includes=%{l_prefix}/include \
--with-t1-library=%{l_prefix}/lib \
--with-freetype2-includes=%{l_prefix}/include \
--with-freetype2-library=%{l_prefix}/lib \
-%else
- --without-x \
-%endif
--enable-a4-paper
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
