Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11811

Modified Files:
        poppler4-glib.info poppler4-qt4.info poppler4-xpdf.info 
        poppler4-xpdf.patch poppler4.info poppler4.patch 
Log Message:
new version, lots of missing bdep...forgot to commit this after talking to RR 
about it weeks ago:(


Index: poppler4-glib.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-glib.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler4-glib.info  16 Apr 2009 03:01:22 -0000      1.3
+++ poppler4-glib.info  28 Jun 2009 05:50:39 -0000      1.4
@@ -1,6 +1,6 @@
 Package: poppler4-glib
 # NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.5
+Version: 0.10.7
 Revision: 1
 Description: PDF rendering library (GLIB Interface)
 License: GPL
@@ -15,18 +15,18 @@
        expat1,
        fink (>= 0.28.0-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
-       glib2-dev (>= 2.18.0-1),
+       freetype219 (>= 2.3.8-2),
+       glib2-dev (>= 2.20.0-1),
        glitz,
-       gtk+2-dev (>= 2.14.0-1),
+       gtk+2-dev (>= 2.16.0-1),
        libgettext3-dev,
        libiconv-dev,
        libjpeg,
        libopenjpeg,
        libpng3,
        libxml2,
-       pango1-xft2-ft219-dev (>= 1.22.0-4),
-       pixman (>= 0.12.0-1),
+       pango1-xft2-ft219-dev (>= 1.24.0-1),
+       pixman (>= 0.14.0-1),
        pkgconfig (>= 0.23),
        poppler4 (>= %v-1),
        x11-dev,
@@ -44,9 +44,9 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 125f671a19707861132fb03e73b61184
+Source-MD5: ba120e49a82567d85d00e159011ebe67
 PatchFile: poppler4.patch
-PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
+PatchFile-MD5: fedaec5cc0d9fb044e2d189e84d181da
 
 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
@@ -78,19 +78,20 @@
                cairo-shlibs (>= 1.8-1),
                expat1-shlibs,
                fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs (>= 2.3.7-7),
-               glib2-shlibs (>= 0.18.0-1),
+               freetype219-shlibs (>= 2.3.8-2),
+               glib2-shlibs (>= 0.20.0-1),
                glitz-shlibs,
-               gtk+2-shlibs (>= 2.14.0-1),
+               gtk+2-shlibs (>= 2.16.0-1),
                libgettext3-shlibs,
                libiconv,
                libjpeg-shlibs,
                libopenjpeg-shlibs,
                libpng3-shlibs,
                libxml2-shlibs,
-               pango1-xft2-ft219-shlibs (>= 1.22.0-4),
-               pixman-shlibs (>= 0.12.0-1),
-               poppler4-shlibs (>= %v-1)
+               pango1-xft2-ft219-shlibs (>= 1.24.0-1),
+               pixman-shlibs (>= 0.14.0-1),
+               poppler4-shlibs (>= %v-1),
+               x11
        <<
        DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
        Files: lib/libpoppler-glib.4.*

Index: poppler4-qt4.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-qt4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler4-qt4.info   12 Jun 2009 15:24:12 -0000      1.3
+++ poppler4-qt4.info   28 Jun 2009 05:50:39 -0000      1.4
@@ -1,7 +1,7 @@
 Info3: <<
 Package: poppler4-qt4-%type_pkg[qt]
-Version: 0.10.5
-Revision: 2
+Version: 0.10.7
+Revision: 1
 Description: PDF rendering library (Qt4 binding)
 Type: qt (x11 mac)
 License: GPL
@@ -9,11 +9,23 @@
 
 Depends: %N-shlibs (>= %v-1)
 BuildDepends: <<
+       expat1,
        fink (>= 0.29.7-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.8-2),
+       (%type_pkg[qt] = x11) glib2-dev,
        glitz,
        kde4-buildenv (>= 4.2.4-2),
+       (%type_pkg[qt] = x11) libgettext3-dev,
+       libiconv-dev,
+       libjpeg,
+       libopenjpeg,
+       (%type_pkg[qt] = x11) libpng3,
+       libxml2,
+       pkgconfig (>= 0.23),
+       poppler4 (>= %v-1),
        qt4-%type_pkg[qt] (>= 4.5.1-1),
-       poppler4 (>= %v-1)
+       (%type_pkg[qt] = x11) x11-dev
 <<
 Conflicts: <<
        poppler-qt4-x11,
@@ -35,9 +47,9 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 125f671a19707861132fb03e73b61184
+Source-MD5: ba120e49a82567d85d00e159011ebe67
 PatchFile: poppler4.patch
-PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
+PatchFile-MD5: fedaec5cc0d9fb044e2d189e84d181da
 
 CompileScript: <<
 #!/bin/sh -ev
@@ -72,8 +84,20 @@
 SplitOff: <<
        Package: %N-shlibs
        Depends: <<
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.8-2),
+               (%type_pkg[qt] = x11) glib2-shlibs,
+               glitz-shlibs,
+               (%type_pkg[qt] = x11) libgettext3-shlibs,
+               libiconv,
+               libjpeg-shlibs,
+               libopenjpeg-shlibs,
+               (%type_pkg[qt] = x11) libpng3-shlibs,
+               libxml2-shlibs,
                poppler4-shlibs (>= %v-1),
-               qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.1-1)
+               qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.1-1),
+               (%type_pkg[qt] = x11) x11
        <<
        Files: opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.3*.dylib
        Shlibs: %p/opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.3.dylib 5.0.0 %n 
(>= 0.10.5-2)

Index: poppler4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poppler4.patch      16 Apr 2009 03:01:22 -0000      1.1
+++ poppler4.patch      28 Jun 2009 05:50:40 -0000      1.2
@@ -1,27 +1,27 @@
-diff -Nurd poppler-0.10.5/configure poppler-0.10.5-new/configure
---- poppler-0.10.5/configure   2009-03-11 19:15:52.000000000 -0400
-+++ poppler-0.10.5-new/configure       2009-04-15 22:27:52.000000000 -0400
-@@ -23367,7 +23367,7 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/configure poppler-0.10.7/configure
+--- poppler-0.10.7.orig/configure      2009-05-16 11:40:49.000000000 -0400
++++ poppler-0.10.7/configure   2009-06-26 03:31:15.000000000 -0400
+@@ -23889,7 +23889,7 @@
  
  qt_test_include="qstyle.h"
  qt_test_la_library="libqt-mt.la"
 -qt_test_library="libqt-mt.so"
 +qt_test_library="libqt-mt.dylib"
  
- { echo "$as_me:$LINENO: checking for Qt headers" >&5
- echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; }
-@@ -23558,7 +23558,7 @@
+ { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5
+ $as_echo_n "checking for Qt headers... " >&6; }
+@@ -24090,7 +24090,7 @@
  
  qt_test_include="qstyle.h"
  qt_test_la_library="libqt-mt.la"
 -qt_test_library="libqt-mt.so"
 +qt_test_library="libqt-mt.dylib"
  
- { echo "$as_me:$LINENO: checking for Qt headers" >&5
- echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; }
-diff -Nurd poppler-0.10.5/glib/Makefile.in poppler-0.10.5-new/glib/Makefile.in
---- poppler-0.10.5/glib/Makefile.in    2009-03-11 19:15:52.000000000 -0400
-+++ poppler-0.10.5-new/glib/Makefile.in        2009-04-15 22:27:52.000000000 
-0400
+ { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5
+ $as_echo_n "checking for Qt headers... " >&6; }
+diff -Nurd -x'*~' poppler-0.10.7.orig/glib/Makefile.in 
poppler-0.10.7/glib/Makefile.in
+--- poppler-0.10.7.orig/glib/Makefile.in       2009-05-16 11:40:50.000000000 
-0400
++++ poppler-0.10.7/glib/Makefile.in    2009-06-26 03:31:15.000000000 -0400
 @@ -65,7 +65,7 @@
  @build_cairo_output_t...@am__dependencies_2 = 
$(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@     $(am__DEPENDENCIES_1)
@@ -39,7 +39,7 @@
  @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \
  @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
  @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -301,11 +300,11 @@
+@@ -303,11 +302,11 @@
        -DG_LOG_DOMAIN=\"Poppler\"              \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/poppler                 \
@@ -53,7 +53,7 @@
        $(cairo_includes)                       
  
  stamp_files = stamp-poppler-enums.h
-@@ -337,11 +336,11 @@
+@@ -339,11 +338,11 @@
        poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -68,7 +68,7 @@
        $(cairo_libs)
  
  libpoppler_glib_la_LDFLAGS = -version-info 4:0:0 @create_shared_lib@
-@@ -349,11 +348,11 @@
+@@ -351,11 +350,11 @@
  @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
  
  @build_with_gdk_t...@test_poppler_glib_ldadd = \
@@ -82,9 +82,9 @@
  @BUILD_WITH_GDK_TRUE@ $(cairo_libs)
  
  BUILT_SOURCES = \
-diff -Nurd poppler-0.10.5/glib/demo/Makefile.in 
poppler-0.10.5-new/glib/demo/Makefile.in
---- poppler-0.10.5/glib/demo/Makefile.in       2009-03-11 19:15:53.000000000 
-0400
-+++ poppler-0.10.5-new/glib/demo/Makefile.in   2009-04-15 22:27:52.000000000 
-0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/glib/demo/Makefile.in 
poppler-0.10.7/glib/demo/Makefile.in
+--- poppler-0.10.7.orig/glib/demo/Makefile.in  2009-05-16 11:40:50.000000000 
-0400
++++ poppler-0.10.7/glib/demo/Makefile.in       2009-06-26 03:31:15.000000000 
-0400
 @@ -59,7 +59,7 @@
  am__DEPENDENCIES_1 =
  poppler_glib_demo_DEPENDENCIES =  \
@@ -94,7 +94,7 @@
  DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -283,7 +283,7 @@
+@@ -285,7 +285,7 @@
  
  LDADD = \
        $(top_builddir)/glib/libpoppler-glib.la \
@@ -103,10 +103,10 @@
        $(GTK_TEST_LIBS)
  
  all: all-am
-diff -Nurd poppler-0.10.5/glib/reference/Makefile.in 
poppler-0.10.5-new/glib/reference/Makefile.in
---- poppler-0.10.5/glib/reference/Makefile.in  2009-03-11 19:15:53.000000000 
-0400
-+++ poppler-0.10.5-new/glib/reference/Makefile.in      2009-04-15 
22:27:52.000000000 -0400
-@@ -288,15 +288,15 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/glib/reference/Makefile.in 
poppler-0.10.7/glib/reference/Makefile.in
+--- poppler-0.10.7.orig/glib/reference/Makefile.in     2009-05-16 
11:40:50.000000000 -0400
++++ poppler-0.10.7/glib/reference/Makefile.in  2009-06-26 03:31:15.000000000 
-0400
+@@ -290,15 +290,15 @@
  # 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        \
@@ -125,11 +125,11 @@
 +      $(POPPLER_GLIB_LIBS)                            \
        $(cairo_libs)
  
- @gtk_doc_use_libtool_fa...@gtkdoc_cc = $(CC) $(INCLUDES) $(AM_CFLAGS) 
$(CFLAGS)
-diff -Nurd poppler-0.10.5/poppler/Makefile.in 
poppler-0.10.5-new/poppler/Makefile.in
---- poppler-0.10.5/poppler/Makefile.in 2009-03-11 19:15:53.000000000 -0400
-+++ poppler-0.10.5-new/poppler/Makefile.in     2009-04-15 22:27:52.000000000 
-0400
-@@ -407,12 +407,12 @@
+ @gtk_doc_use_libtool_fa...@gtkdoc_cc = $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -Nurd -x'*~' poppler-0.10.7.orig/poppler/Makefile.in 
poppler-0.10.7/poppler/Makefile.in
+--- poppler-0.10.7.orig/poppler/Makefile.in    2009-05-16 11:40:50.000000000 
-0400
++++ poppler-0.10.7/poppler/Makefile.in 2009-06-26 03:31:15.000000000 -0400
+@@ -409,12 +409,12 @@
  INCLUDES = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/goo                     \
@@ -145,7 +145,7 @@
  
  lib_LTLIBRARIES = libpoppler.la
  noinst_LTLIBRARIES = $(poppler_cairo)         \
-@@ -421,13 +421,13 @@
+@@ -423,13 +423,13 @@
  libpoppler_la_LIBADD = \
        $(top_builddir)/goo/libgoo.la           \
        $(top_builddir)/fofi/libfofi.la         \
@@ -161,9 +161,9 @@
        $(PTHREAD_LIBS)                         \
        $(win32_libs)
  
-diff -Nurd poppler-0.10.5/qt/Makefile.in poppler-0.10.5-new/qt/Makefile.in
---- poppler-0.10.5/qt/Makefile.in      2009-03-11 19:15:53.000000000 -0400
-+++ poppler-0.10.5-new/qt/Makefile.in  2009-04-15 22:27:52.000000000 -0400
+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
 @@ -62,7 +62,7 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -182,7 +182,7 @@
        libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -270,10 +270,10 @@
+@@ -272,10 +272,10 @@
  INCLUDES = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/poppler                 \
@@ -196,7 +196,7 @@
  
  poppler_includedir = $(includedir)/poppler/qt3
  poppler_include_HEADERS = \
-@@ -292,20 +292,20 @@
+@@ -294,20 +294,20 @@
        poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
@@ -223,9 +223,9 @@
  
  all: all-am
  
-diff -Nurd poppler-0.10.5/qt4/demos/Makefile.in 
poppler-0.10.5-new/qt4/demos/Makefile.in
---- poppler-0.10.5/qt4/demos/Makefile.in       2009-03-11 19:15:53.000000000 
-0400
-+++ poppler-0.10.5-new/qt4/demos/Makefile.in   2009-04-15 22:27:52.000000000 
-0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/qt4/demos/Makefile.in 
poppler-0.10.7/qt4/demos/Makefile.in
+--- poppler-0.10.7.orig/qt4/demos/Makefile.in  2009-05-16 11:40:50.000000000 
-0400
++++ poppler-0.10.7/qt4/demos/Makefile.in       2009-06-26 03:31:15.000000000 
-0400
 @@ -57,7 +57,7 @@
        toc.$(OBJEXT) viewer.$(OBJEXT)
  poppler_qt4viewer_OBJECTS = $(am_poppler_qt4viewer_OBJECTS)
@@ -235,7 +235,7 @@
        $(top_builddir)/qt4/src/libpoppler-qt4.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  poppler_qt4viewer_DEPENDENCIES = $(am__DEPENDENCIES_2)
-@@ -259,7 +259,7 @@
+@@ -261,7 +261,7 @@
        $(POPPLER_QT4_CFLAGS)
  
  LDADDS = \
@@ -244,9 +244,9 @@
        $(top_builddir)/qt4/src/libpoppler-qt4.la       \
        $(FONTCONFIG_LIBS)                              \
        $(POPPLER_QT4_LIBS)
-diff -Nurd poppler-0.10.5/qt4/src/Makefile.in 
poppler-0.10.5-new/qt4/src/Makefile.in
---- poppler-0.10.5/qt4/src/Makefile.in 2009-03-11 19:15:53.000000000 -0400
-+++ poppler-0.10.5-new/qt4/src/Makefile.in     2009-04-15 22:27:52.000000000 
-0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/qt4/src/Makefile.in 
poppler-0.10.7/qt4/src/Makefile.in
+--- poppler-0.10.7.orig/qt4/src/Makefile.in    2009-05-16 11:40:50.000000000 
-0400
++++ poppler-0.10.7/qt4/src/Makefile.in 2009-06-26 03:31:15.000000000 -0400
 @@ -64,7 +64,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -256,7 +256,7 @@
        $(am__DEPENDENCIES_1) $(am__append_1)
  am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
        poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
-@@ -318,7 +318,7 @@
+@@ -320,7 +320,7 @@
        poppler-export.h                        \
        poppler-private.h
  
@@ -265,9 +265,9 @@
        $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
  libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
  all: all-am
-diff -Nurd poppler-0.10.5/qt4/tests/Makefile.in 
poppler-0.10.5-new/qt4/tests/Makefile.in
---- poppler-0.10.5/qt4/tests/Makefile.in       2009-03-11 19:15:53.000000000 
-0400
-+++ poppler-0.10.5-new/qt4/tests/Makefile.in   2009-04-15 22:27:52.000000000 
-0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/qt4/tests/Makefile.in 
poppler-0.10.7/qt4/tests/Makefile.in
+--- poppler-0.10.7.orig/qt4/tests/Makefile.in  2009-05-16 11:40:51.000000000 
-0400
++++ poppler-0.10.7/qt4/tests/Makefile.in       2009-06-26 03:31:15.000000000 
-0400
 @@ -80,7 +80,7 @@
  @BUILD_POPPLER_QT4_TRUE@      check_actualtext.$(OBJEXT)
  check_actualtext_OBJECTS = $(am_check_actualtext_OBJECTS)
@@ -277,7 +277,7 @@
        $(top_builddir)/qt4/src/libpoppler-qt4.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  @build_poppler_qt4_t...@check_actualtext_dependencies =  \
-@@ -384,7 +384,7 @@
+@@ -386,7 +386,7 @@
        $(POPPLER_QT4_CFLAGS)
  
  LDADDS = \
@@ -286,10 +286,10 @@
        $(top_builddir)/qt4/src/libpoppler-qt4.la       \
        $(FONTCONFIG_LIBS)                              \
        $(POPPLER_QT4_LIBS)
-diff -Nurd poppler-0.10.5/test/Makefile.in poppler-0.10.5-new/test/Makefile.in
---- poppler-0.10.5/test/Makefile.in    2009-03-11 19:15:54.000000000 -0400
-+++ poppler-0.10.5-new/test/Makefile.in        2009-04-15 22:27:52.000000000 
-0400
-@@ -277,8 +277,8 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/test/Makefile.in 
poppler-0.10.7/test/Makefile.in
+--- poppler-0.10.7.orig/test/Makefile.in       2009-05-16 11:40:51.000000000 
-0400
++++ poppler-0.10.7/test/Makefile.in    2009-06-26 03:31:15.000000000 -0400
+@@ -279,8 +279,8 @@
  @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@        pdf_inspector
  
  @BUILD_CAIRO_OUTPUT_TRUE@@build_gtk_test_t...@cairo_includes = \
@@ -300,7 +300,7 @@
  
  @build_splash_output_t...@perf_test = \
  @BUILD_SPLASH_OUTPUT_TRUE@    perf-test
-@@ -291,9 +291,9 @@
+@@ -293,9 +293,9 @@
        -I$(top_srcdir)/poppler                 \
        -I$(top_srcdir)/glib                    \
        -I$(top_builddir)/glib                  \
@@ -312,7 +312,7 @@
  
  gtk_splash_test_SOURCES = \
         gtk-splash-test.cc
-@@ -308,9 +308,9 @@
+@@ -310,9 +310,9 @@
  gtk_cairo_test_LDADD = \
        $(top_builddir)/poppler/libpoppler.la           \
        $(top_builddir)/glib/libpoppler-glib.la         \
@@ -324,7 +324,7 @@
  
  pdf_inspector_SOURCES = \
         pdf-inspector.cc
-@@ -318,8 +318,8 @@
+@@ -320,8 +320,8 @@
  pdf_inspector_LDADD = \
        $(top_builddir)/poppler/libpoppler-cairo.la     \
        $(top_builddir)/poppler/libpoppler.la           \
@@ -334,10 +334,10 @@
        $(GTK_TEST_LIBS)                                \
        $(X_EXTRA_LIBS)
  
-diff -Nurd poppler-0.10.5/utils/Makefile.in 
poppler-0.10.5-new/utils/Makefile.in
---- poppler-0.10.5/utils/Makefile.in   2009-03-11 19:15:54.000000000 -0400
-+++ poppler-0.10.5-new/utils/Makefile.in       2009-04-15 22:27:52.000000000 
-0400
-@@ -318,14 +318,14 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/utils/Makefile.in 
poppler-0.10.7/utils/Makefile.in
+--- poppler-0.10.7.orig/utils/Makefile.in      2009-05-16 11:40:51.000000000 
-0400
++++ poppler-0.10.7/utils/Makefile.in   2009-06-26 03:31:15.000000000 -0400
+@@ -317,14 +317,14 @@
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/utils                   \
        -I$(top_srcdir)/poppler                 \
@@ -353,11 +353,11 @@
 +      $(FONTCONFIG_LIBS) \
 +      $(UTILS_LIBS)
  
- dist_man1_MANS = \
-       pdffonts.1                              \
-diff -Nurd poppler-0.10.5/xpdfrc.poppler4 poppler-0.10.5-new/xpdfrc.poppler4
---- poppler-0.10.5/xpdfrc.poppler4     1969-12-31 19:00:00.000000000 -0500
-+++ poppler-0.10.5-new/xpdfrc.poppler4 2009-04-15 22:27:52.000000000 -0400
+ @build_abiword_output_t...@pdftoabw_sources = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@   pdftoabw.cc                             \
+diff -Nurd -x'*~' poppler-0.10.7.orig/xpdfrc.poppler4 
poppler-0.10.7/xpdfrc.poppler4
+--- poppler-0.10.7.orig/xpdfrc.poppler4        1969-12-31 19:00:00.000000000 
-0500
++++ poppler-0.10.7/xpdfrc.poppler4     2009-06-26 03:31:15.000000000 -0400
 @@ -0,0 +1,91 @@
 +#========================================================================
 +#

Index: poppler4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler4.info       16 Apr 2009 03:01:22 -0000      1.3
+++ poppler4.info       28 Jun 2009 05:50:40 -0000      1.4
@@ -1,6 +1,6 @@
 Package: poppler4
 # NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.5
+Version: 0.10.7
 Revision: 1
 Description: PDF rendering library
 License: GPL
@@ -14,7 +14,7 @@
        expat1,
        fink (>= 0.28.0-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       freetype219 (>= 2.3.8-2),
        glitz,
        gettext-bin,
        gettext-tools,
@@ -24,7 +24,7 @@
        libopenjpeg,
        libpng3,
        libxml2,
-       pixman (>= 0.12.0-1),
+       pixman (>= 0.14.0-1),
        pkgconfig (>= 0.23),
        x11-dev,
        xft2-dev
@@ -43,9 +43,9 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 125f671a19707861132fb03e73b61184
+Source-MD5: ba120e49a82567d85d00e159011ebe67
 PatchFile: %n.patch
-PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
+PatchFile-MD5: fedaec5cc0d9fb044e2d189e84d181da
 
 SetCFLAGS: -Os
 SetCXXFLAGS: -Os
@@ -71,7 +71,7 @@
                poppler-data (>= 1:0.2.1-1),
                expat1-shlibs,
                fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs (>= 2.3.7-7),
+               freetype219-shlibs (>= 2.3.8-2),
                libiconv,
                libopenjpeg-shlibs,
                libjpeg-shlibs,
@@ -88,7 +88,7 @@
                poppler-data (>= 1:0.2.1-1),
                expat1-shlibs,
                fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs (>= 2.3.7-7),
+               freetype219-shlibs (>= 2.3.8-2),
                libiconv,
                libjpeg-shlibs,
                libopenjpeg-shlibs,

Index: poppler4-xpdf.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-xpdf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poppler4-xpdf.patch 30 Oct 2008 22:25:57 -0000      1.1
+++ poppler4-xpdf.patch 28 Jun 2009 05:50:39 -0000      1.2
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' poppler-0.10.0.orig/goo/Makefile.am 
poppler-0.10.0/goo/Makefile.am
---- poppler-0.10.0.orig/goo/Makefile.am        2008-07-24 16:45:05.000000000 
-0400
-+++ poppler-0.10.0/goo/Makefile.am     2008-10-30 02:16:25.000000000 -0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/goo/Makefile.am 
poppler-0.10.7/goo/Makefile.am
+--- poppler-0.10.7.orig/goo/Makefile.am        2009-05-02 08:14:56.000000000 
-0400
++++ poppler-0.10.7/goo/Makefile.am     2009-06-26 03:26:56.000000000 -0400
 @@ -15,6 +15,9 @@
        gfile.h                                 \
        FixedPoint.h
@@ -11,10 +11,10 @@
  endif
  
  libgoo_la_SOURCES =                           \
-diff -Nurd -x'*~' poppler-0.10.0.orig/poppler/Makefile.am 
poppler-0.10.0/poppler/Makefile.am
---- poppler-0.10.0.orig/poppler/Makefile.am    2008-09-09 16:50:37.000000000 
-0400
-+++ poppler-0.10.0/poppler/Makefile.am 2008-10-30 02:16:25.000000000 -0400
-@@ -204,6 +204,9 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/poppler/Makefile.am 
poppler-0.10.7/poppler/Makefile.am
+--- poppler-0.10.7.orig/poppler/Makefile.am    2009-05-02 08:14:57.000000000 
-0400
++++ poppler-0.10.7/poppler/Makefile.am 2009-06-26 03:26:56.000000000 -0400
+@@ -202,6 +202,9 @@
        Sound.h                 \
        poppler-config.h
  
@@ -24,9 +24,9 @@
  endif
  
  libpoppler_la_SOURCES =               \
-diff -Nurd -x'*~' poppler-0.10.0.orig/splash/Makefile.am 
poppler-0.10.0/splash/Makefile.am
---- poppler-0.10.0.orig/splash/Makefile.am     2008-07-24 16:45:06.000000000 
-0400
-+++ poppler-0.10.0/splash/Makefile.am  2008-10-30 02:16:25.000000000 -0400
+diff -Nurd -x'*~' poppler-0.10.7.orig/splash/Makefile.am 
poppler-0.10.7/splash/Makefile.am
+--- poppler-0.10.7.orig/splash/Makefile.am     2009-05-02 08:14:56.000000000 
-0400
++++ poppler-0.10.7/splash/Makefile.am  2009-06-26 03:26:56.000000000 -0400
 @@ -33,6 +33,9 @@
        SplashXPath.h                           \
        SplashXPathScanner.h

Index: poppler4-xpdf.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-xpdf.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler4-xpdf.info  16 Apr 2009 03:01:22 -0000      1.3
+++ poppler4-xpdf.info  28 Jun 2009 05:50:39 -0000      1.4
@@ -1,6 +1,6 @@
 Package: poppler4-xpdf
 # NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.5
+Version: 0.10.7
 Revision: 1
 Description: PDF rendering library (alternate interface)
 License: GPL
@@ -22,9 +22,9 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 125f671a19707861132fb03e73b61184
+Source-MD5: ba120e49a82567d85d00e159011ebe67
 PatchFile: %n.patch
-PatchFile-MD5: 85cf2391e28efbbd1f7ef897dfd44a5e
+PatchFile-MD5: 786610cf50611f0387f93804b090cae3
 
 PatchScript: <<
 #!/bin/sh -ev


------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to