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: 12-May-2009 09:30:08
Branch: HEAD Handle: 2009051208300700
Modified files:
openpkg-src/poppler poppler.patch poppler.spec
Log:
upgrading package: poppler 0.10.6 -> 0.11.0
Summary:
Revision Changes Path
1.3 +12 -0 openpkg-src/poppler/poppler.patch
1.17 +6 -4 openpkg-src/poppler/poppler.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/poppler/poppler.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 poppler.patch
--- openpkg-src/poppler/poppler.patch 18 Mar 2009 20:03:44 -0000 1.2
+++ openpkg-src/poppler/poppler.patch 12 May 2009 07:30:07 -0000 1.3
@@ -9,3 +9,15 @@
+Libs: -L${libdir} -lpoppler -lz -ljpeg -lopenjpeg
Cflags: -I${includedir}/poppler
+Requires: fontconfig freetype2
+Index: configure
+--- configure.orig 2009-05-12 09:18:51 +0200
++++ configure 2009-05-12 09:24:16 +0200
+@@ -22572,7 +22572,7 @@
+ else
+
+ ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries $USER_LDFLAGS -lpng -lm"
++LIBS="$all_libraries $USER_LDFLAGS -lpng -lz -lm"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ cat >conftest.$ac_ext <<_ACEOF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/poppler/poppler.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 poppler.spec
--- openpkg-src/poppler/poppler.spec 18 Apr 2009 13:14:22 -0000 1.16
+++ openpkg-src/poppler/poppler.spec 12 May 2009 07:30:07 -0000 1.17
@@ -31,8 +31,8 @@
Class: EVAL
Group: Postscript
License: GPL
-Version: 0.10.6
-Release: 20090417
+Version: 0.11.0
+Release: 20090512
# list of sources
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
@@ -43,8 +43,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, gcc, gcc::with_cxx = yes
PreReq: OpenPKG, openpkg >= 20060823, poppler-data
-BuildPreReq: zlib, jpeg, openjpeg, cairo, freetype, fontconfig
-PreReq: zlib, jpeg, openjpeg, cairo, freetype, fontconfig
+BuildPreReq: zlib, png, jpeg, openjpeg, cairo, freetype, fontconfig, lcms
+PreReq: zlib, png, jpeg, openjpeg, cairo, freetype, fontconfig, lcms
AutoReq: no
AutoReqProv: no
@@ -72,10 +72,12 @@
CXXFLAGS="%{l_cxxflags -O} -Wno-write-strings" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ LIBS="-lm" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--enable-zlib \
+ --enable-png \
--enable-libjpeg \
--enable-libopenjpeg \
--enable-splash-output \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
