Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs In directory vz-cvs-3.sog:/tmp/cvs-serv18425
Modified Files: poppler2-glib.info poppler2.info poppler2.patch poppler4-glib.info poppler4.info poppler4.patch Log Message: sync. w/ 10.!4/stable, 10.4-EOL/unstable Index: poppler4-glib.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/poppler4-glib.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poppler4-glib.info 11 Jul 2011 04:08:33 -0000 1.1 +++ poppler4-glib.info 27 Oct 2011 21:07:37 -0000 1.2 @@ -1,7 +1,7 @@ Package: poppler4-glib # NOTE: Must keep %v in sync among all poppler4* packages! Version: 0.10.7 -Revision: 3 +Revision: 4 Description: PDF rendering library (GLIB Interface) License: GPL Maintainer: Benjamin Reed <poppler4-g...@fink.racoonfink.com> @@ -11,8 +11,10 @@ pkgconfig (>= 0.21-1) << BuildDepends: << + atk1 (>= 1.28.0-1), cairo (>= 1.8.8-3), fink (>= 0.28.0-1), + fink-package-precedence, fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), glib2-dev (>= 2.22.0-1), @@ -25,7 +27,7 @@ pango1-xft2-ft219-dev (>= 1.24.5-4), pixman (>= 0.16.0-1), pkgconfig (>= 0.23), - poppler4 (>= %v-1), + poppler4 (>= %v-2), x11-dev << Conflicts: << @@ -42,7 +44,7 @@ Source: http://poppler.freedesktop.org/poppler-%v.tar.gz Source-MD5: ba120e49a82567d85d00e159011ebe67 PatchFile: poppler4.patch -PatchFile-MD5: fedaec5cc0d9fb044e2d189e84d181da +PatchFile-MD5: 6284a64ff95cf0dbacb1357b146d3ad6 SetCPPFLAGS: -I%p/lib/fontconfig2/include SetLDFLAGS: -L%p/lib/fontconfig2/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib @@ -60,6 +62,7 @@ make -C poppler libpoppler-cairo.la make -C glib make poppler-glib.pc + fink-package-precedence --prohibit-bdep=%n . << InstallScript: << @@ -78,7 +81,7 @@ gtk+2-shlibs (>= 2.18.0-1), libopenjpeg-shlibs, pango1-xft2-ft219-shlibs (>= 1.24.5-4), - poppler4-shlibs (>= %v-1) + poppler4-shlibs (>= %v-2) << DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO Files: lib/libpoppler-glib.4.* Index: poppler2-glib.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/poppler2-glib.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poppler2-glib.info 11 Jul 2011 04:08:33 -0000 1.1 +++ poppler2-glib.info 27 Oct 2011 21:07:37 -0000 1.2 @@ -1,7 +1,7 @@ Package: poppler2-glib # NOTE: Must keep %v in sync among all poppler2* packages! Version: 0.6.4 -Revision: 4 +Revision: 5 Description: PDF rendering library (GLIB Interface) License: GPL Maintainer: Benjamin Reed <poppler2-g...@fink.racoonfink.com> @@ -14,6 +14,7 @@ atk1 (>= 1.28.0-1), cairo (>= 1.8.8-3), fink (>= 0.24.12), + fink-package-precedence, fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), glib2-dev (>= 2.22.0-1), @@ -24,8 +25,8 @@ libxml2, pango1-xft2-ft219-dev (>= 1.24.5-4), pixman (>= 0.16.0-1), - pkgconfig (>= 0.23-1), - poppler2 (>= %v-1), + pkgconfig (>= 0.23), + poppler2 (>= %v-4), x11-dev << Conflicts: poppler1, poppler4-glib @@ -41,26 +42,24 @@ SetCPPFLAGS: -I%p/lib/fontconfig2/include SetLDFLAGS: -L%p/lib/fontconfig2/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 --disable-dependency-tracking --enable-zlib --enable-poppler-glib --disable-poppler-qt --disable-poppler-qt4 PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" +ConfigureParams: << + --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 \ + --enable-dependency-tracking --disable-static \ + --enable-zlib \ + --enable-poppler-glib \ + --disable-poppler-qt --disable-poppler-qt4 \ + PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" +<< CompileScript: << -#!/bin/sh -ev - ./configure %c - pushd poppler - make libpoppler-cairo.la - popd - pushd glib - make - popd + make -C poppler libpoppler-cairo.la + make -C glib make poppler-glib.pc + fink-package-precedence --prohibit-bdep=%n . << InstallScript: << -#!/bin/sh -ev - - pushd glib - make -j1 install DESTDIR=%d - popd + make -C glib -j1 install DESTDIR=%d install -d -m 755 %i/lib/pkgconfig install -c -m 644 poppler-glib.pc %i/lib/pkgconfig/ << @@ -71,9 +70,10 @@ cairo-shlibs (>= 1.8.8-3), fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), + glib2-shlibs (>= 0.22.0-1), gtk+2-shlibs (>= 2.18.0-1), pango1-xft2-ft219-shlibs (>= 1.24.5-4), - poppler2-shlibs (>= %v-1) + poppler2-shlibs (>= %v-4) << DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO Files: lib/libpoppler-glib.2*.dylib Index: poppler4.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/poppler4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poppler4.patch 11 Jul 2011 04:08:33 -0000 1.1 +++ poppler4.patch 27 Oct 2011 21:07:37 -0000 1.2 @@ -161,6 +161,24 @@ $(PTHREAD_LIBS) \ $(win32_libs) +diff -Nurd -x'*~' poppler-0.10.7.orig/poppler-cairo.pc.cmake poppler-0.10.7/poppler-cairo.pc.cmake +--- poppler-0.10.7.orig/poppler-cairo.pc.cmake 2009-05-02 08:14:56.000000000 -0400 ++++ poppler-0.10.7/poppler-cairo.pc.cmake 2011-01-05 16:55:56.000000000 -0500 +@@ -6,4 +6,4 @@ + Name: poppler-cairo + Description: Cairo backend for Poppler PDF rendering library + Version: @POPPLER_VERSION@ +-Requires: poppler = @POPPLER_VERSION@ cairo >= @CAIRO_VERSION@ ++Requires: poppler = @POPPLER_VERSION@ +diff -Nurd -x'*~' poppler-0.10.7.orig/poppler-cairo.pc.in poppler-0.10.7/poppler-cairo.pc.in +--- poppler-0.10.7.orig/poppler-cairo.pc.in 2009-05-02 08:14:56.000000000 -0400 ++++ poppler-0.10.7/poppler-cairo.pc.in 2011-01-05 16:56:11.000000000 -0500 +@@ -6,4 +6,4 @@ + Name: poppler-cairo + Description: Cairo backend for Poppler PDF rendering library + Version: @VERSION@ +-Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@ ++Requires: poppler = @VERSION@ diff -Nurd -x'*~' poppler-0.10.7.orig/qt/Makefile.in poppler-0.10.7/qt/Makefile.in --- poppler-0.10.7.orig/qt/Makefile.in 2009-05-16 11:40:50.000000000 -0400 +++ poppler-0.10.7/qt/Makefile.in 2009-06-26 03:31:15.000000000 -0400 Index: poppler2.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/poppler2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poppler2.patch 11 Jul 2011 04:08:33 -0000 1.1 +++ poppler2.patch 27 Oct 2011 21:07:37 -0000 1.2 @@ -1,7 +1,7 @@ - ---- poppler-0.6/configure 2007-09-03 14:55:19.000000000 -0400 -+++ poppler-0.6-new/configure 2007-09-26 13:46:15.000000000 -0400 -@@ -24760,7 +24760,7 @@ +diff -Nurd poppler-0.6.4/configure poppler-0.6.4-new/configure +--- poppler-0.6.4/configure 2008-01-25 17:12:30.000000000 -0500 ++++ poppler-0.6.4-new/configure 2011-01-10 18:05:39.000000000 -0500 +@@ -25109,7 +25109,7 @@ fi @@ -10,9 +10,10 @@ jpeg_incdir=NO for i in $jpeg_incdirs; ---- poppler-0.6/glib/Makefile.in 2007-09-03 14:55:20.000000000 -0400 -+++ poppler-0.6-new/glib/Makefile.in 2007-09-26 13:47:12.000000000 -0400 -@@ -290,10 +290,10 @@ +diff -Nurd poppler-0.6.4/glib/Makefile.in poppler-0.6.4-new/glib/Makefile.in +--- poppler-0.6.4/glib/Makefile.in 2008-01-25 17:12:27.000000000 -0500 ++++ poppler-0.6.4-new/glib/Makefile.in 2011-01-10 18:05:39.000000000 -0500 +@@ -291,10 +291,10 @@ -DG_LOG_DOMAIN=\"Poppler\" \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ @@ -25,7 +26,7 @@ $(cairo_includes) stamp_files = stamp-poppler-enums.h -@@ -324,9 +324,9 @@ +@@ -325,9 +325,9 @@ libpoppler_glib_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ @@ -36,7 +37,7 @@ $(cairo_libs) libpoppler_glib_la_LDFLAGS = -version-info 2:0:0 -@@ -336,8 +336,8 @@ +@@ -337,8 +337,8 @@ test_poppler_glib_LDADD = \ $(top_builddir)/poppler/libpoppler.la \ libpoppler-glib.la \ @@ -46,9 +47,10 @@ $(cairo_libs) BUILT_SOURCES = \ ---- poppler-0.6/glib/reference/Makefile.in 2007-09-03 14:56:14.000000000 -0400 -+++ poppler-0.6-new/glib/reference/Makefile.in 2007-09-26 13:47:37.000000000 -0400 -@@ -289,14 +289,14 @@ +diff -Nurd poppler-0.6.4/glib/reference/Makefile.in poppler-0.6.4-new/glib/reference/Makefile.in +--- poppler-0.6.4/glib/reference/Makefile.in 2008-01-25 17:12:27.000000000 -0500 ++++ poppler-0.6.4-new/glib/reference/Makefile.in 2011-01-10 18:05:39.000000000 -0500 +@@ -290,14 +290,14 @@ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES = -I$(top_srcdir)/glib -I$(top_builddir)/glib \ @@ -66,9 +68,10 @@ $(cairo_libs) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ---- poppler-0.6/poppler/Makefile.in 2007-09-03 14:55:21.000000000 -0400 -+++ poppler-0.6-new/poppler/Makefile.in 2007-09-26 13:48:02.000000000 -0400 -@@ -385,12 +385,12 @@ +diff -Nurd poppler-0.6.4/poppler/Makefile.in poppler-0.6.4-new/poppler/Makefile.in +--- poppler-0.6.4/poppler/Makefile.in 2008-01-25 17:12:28.000000000 -0500 ++++ poppler-0.6.4-new/poppler/Makefile.in 2011-01-10 18:05:39.000000000 -0500 +@@ -386,12 +386,12 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/goo \ @@ -84,7 +87,7 @@ lib_LTLIBRARIES = libpoppler.la noinst_LTLIBRARIES = $(poppler_cairo) \ -@@ -399,12 +399,12 @@ +@@ -400,12 +400,12 @@ libpoppler_la_LIBADD = \ $(top_builddir)/goo/libgoo.la \ $(top_builddir)/fofi/libfofi.la \ @@ -99,9 +102,19 @@ $(win32_libs) libpoppler_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@ ---- poppler-0.6/qt/Makefile.in 2007-09-03 14:55:21.000000000 -0400 -+++ poppler-0.6-new/qt/Makefile.in 2007-09-26 13:48:33.000000000 -0400 -@@ -266,10 +266,10 @@ +diff -Nurd poppler-0.6.4/poppler-cairo.pc.in poppler-0.6.4-new/poppler-cairo.pc.in +--- poppler-0.6.4/poppler-cairo.pc.in 2008-01-21 14:59:14.000000000 -0500 ++++ poppler-0.6.4-new/poppler-cairo.pc.in 2011-01-10 18:06:01.000000000 -0500 +@@ -6,4 +6,4 @@ + Name: poppler-cairo + Description: Cairo backend for Poppler PDF rendering library + Version: @VERSION@ +-Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@ ++Requires: poppler = @VERSION@ +diff -Nurd poppler-0.6.4/qt/Makefile.in poppler-0.6.4-new/qt/Makefile.in +--- poppler-0.6.4/qt/Makefile.in 2008-01-25 17:12:28.000000000 -0500 ++++ poppler-0.6.4-new/qt/Makefile.in 2011-01-10 18:05:39.000000000 -0500 +@@ -267,10 +267,10 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ @@ -115,7 +128,7 @@ poppler_includedir = $(includedir)/poppler/qt3 poppler_include_HEADERS = \ -@@ -289,9 +289,9 @@ +@@ -290,9 +290,9 @@ libpoppler_qt_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ @@ -127,7 +140,7 @@ libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 test_poppler_qt_SOURCES = \ -@@ -300,8 +300,8 @@ +@@ -301,8 +301,8 @@ test_poppler_qt_LDADD = \ $(top_builddir)/poppler/libpoppler.la \ libpoppler-qt.la \ @@ -138,9 +151,10 @@ all: all-am ---- poppler-0.6/test/Makefile.in 2007-09-03 14:55:22.000000000 -0400 -+++ poppler-0.6-new/test/Makefile.in 2007-09-26 13:49:10.000000000 -0400 -@@ -263,17 +263,17 @@ +diff -Nurd poppler-0.6.4/test/Makefile.in poppler-0.6.4-new/test/Makefile.in +--- poppler-0.6.4/test/Makefile.in 2008-01-25 17:12:29.000000000 -0500 ++++ poppler-0.6.4-new/test/Makefile.in 2011-01-10 18:05:39.000000000 -0500 +@@ -264,17 +264,17 @@ @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@ pdf_inspector @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@cairo_includes = \ @@ -162,7 +176,7 @@ gtk_splash_test_SOURCES = \ gtk-splash-test.cc -@@ -288,9 +288,9 @@ +@@ -289,9 +289,9 @@ gtk_cairo_test_LDADD = \ $(top_builddir)/poppler/libpoppler.la \ $(top_builddir)/glib/libpoppler-glib.la \ @@ -174,7 +188,7 @@ pdf_inspector_SOURCES = \ pdf-inspector.cc -@@ -298,8 +298,8 @@ +@@ -299,8 +299,8 @@ pdf_inspector_LDADD = \ $(top_builddir)/poppler/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ @@ -184,8 +198,9 @@ $(GTK_TEST_LIBS) EXTRA_DIST = \ ---- poppler-0.6/xpdfrc.poppler2 1969-12-31 19:00:00.000000000 -0500 -+++ poppler-0.6-new/xpdfrc.poppler2 2007-09-26 13:49:42.000000000 -0400 +diff -Nurd poppler-0.6.4/xpdfrc.poppler2 poppler-0.6.4-new/xpdfrc.poppler2 +--- poppler-0.6.4/xpdfrc.poppler2 1969-12-31 19:00:00.000000000 -0500 ++++ poppler-0.6.4-new/xpdfrc.poppler2 2011-01-10 18:05:39.000000000 -0500 @@ -0,0 +1,91 @@ +#======================================================================== +# Index: poppler4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/poppler4.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poppler4.info 11 Jul 2011 04:08:33 -0000 1.1 +++ poppler4.info 27 Oct 2011 21:07:37 -0000 1.2 @@ -1,7 +1,7 @@ Package: poppler4 # NOTE: Must keep %v in sync among all poppler4* packages! Version: 0.10.7 -Revision: 1 +Revision: 2 Description: PDF rendering library License: GPL Maintainer: Benjamin Reed <poppl...@fink.racoonfink.com> @@ -10,24 +10,19 @@ %N-shlibs (= %v-%r) << BuildDepends: << - cairo (>= 1.8-1), - expat1, + cairo (>= 1.8.8-3), fink (>= 0.28.0-1), - fontconfig2-dev (>= 2.4.1-1), - freetype219 (>= 2.3.8-2), + fink-package-precedence, + fontconfig2-dev (>= 2.8.0-4), + freetype219 (>= 2.3.12-1), glitz, - gettext-bin, - gettext-tools, - libgettext3-dev, libiconv-dev, - libjpeg, + libjpeg8, libopenjpeg, - libpng3, libxml2, - pixman (>= 0.14.0-1), + pixman (>= 0.16.0-1), pkgconfig (>= 0.23), - x11-dev, - xft2-dev + x11-dev << Conflicts: << poppler, @@ -45,7 +40,7 @@ Source: http://poppler.freedesktop.org/poppler-%v.tar.gz Source-MD5: ba120e49a82567d85d00e159011ebe67 PatchFile: %n.patch -PatchFile-MD5: fedaec5cc0d9fb044e2d189e84d181da +PatchFile-MD5: 6284a64ff95cf0dbacb1357b146d3ad6 SetCFLAGS: -Os SetCXXFLAGS: -Os @@ -53,12 +48,16 @@ SetLDFLAGS: -L%p/lib/fontconfig2/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib ConfigureParams: << --mandir=%p/share/man \ - --disable-dependency-tracking --disable-static \ + --enable-dependency-tracking --disable-static \ --enable-zlib --enable-libopenjpeg --enable-cairo-output \ --disable-poppler-glib --disable-gdk --disable-gtk-test \ --disable-poppler-qt --disable-poppler-qt4 \ --disable-splash-output \ - PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" +<< +CompileScript: << + %{default_script} + fink-package-precedence --prohibit-bdep=%n . << InstallScript: << @@ -69,12 +68,10 @@ Package: %N-shlibs Depends: << poppler-data (>= 1:0.2.1-1), - expat1-shlibs, - fontconfig2-shlibs (>= 2.4.1-1), - freetype219-shlibs (>= 2.3.8-2), - libiconv, + fontconfig2-shlibs (>= 2.8.0-4), + freetype219-shlibs (>= 2.3.12-1), + libjpeg8-shlibs, libopenjpeg-shlibs, - libjpeg-shlibs, libxml2-shlibs << DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO @@ -86,11 +83,9 @@ Depends: << %N-shlibs (>= %v-%r), poppler-data (>= 1:0.2.1-1), - expat1-shlibs, - expat1-shlibs, 1:0.2.1-1), eLog NEWS README README-XPDF TODO g2/lib/pkgconfig:$PKG_CONFIG_PATH"