Просмотр исходного кода

upgrading package: poppler 0.10.6 -> 0.11.0

Ralf S. Engelschall 16 лет назад
Родитель
Сommit
3bff80ffcc
2 измененных файлов с 18 добавлено и 4 удалено
  1. 12 0
      poppler/poppler.patch
  2. 6 4
      poppler/poppler.spec

+ 12 - 0
poppler/poppler.patch

@@ -9,3 +9,15 @@ Index: poppler.pc.in
 +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

+ 6 - 4
poppler/poppler.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 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 @@ Prefix:       %{l_prefix}
 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 @@ AutoReqProv:  no
     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 \