Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv603
Modified Files:
poppler2-qt4.info poppler4-glib.info poppler4-xpdf.info
poppler4.info
Added Files:
poppler4-qt4.info poppler4.patch
Removed Files:
poppler4-glib.patch
Log Message:
new upstream
Index: poppler4-glib.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-glib.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler4-glib.info 5 Jan 2009 22:42:07 -0000 1.2
+++ poppler4-glib.info 16 Apr 2009 03:01:22 -0000 1.3
@@ -1,10 +1,10 @@
Package: poppler4-glib
# NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.2
+Version: 0.10.5
Revision: 1
Description: PDF rendering library (GLIB Interface)
License: GPL
-Maintainer: Benjamin Reed <[email protected]>
+Maintainer: Benjamin Reed <[email protected]>
Depends: <<
%N-shlibs (>= %v-%r),
@@ -13,6 +13,7 @@
BuildDepends: <<
cairo (>= 1.8-1),
expat1,
+ fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.18.0-1),
@@ -43,10 +44,9 @@
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: a802a178d12f453f1d0176d67f923c7d
-PatchScript: <<
- find . -name Makefile.in | xargs perl -pi -e
's,\$\(top_builddir\)/poppler/libpoppler.la,\$\(prefix\)/lib/libpoppler.la,'g
-<<
+Source-MD5: 125f671a19707861132fb03e73b61184
+PatchFile: poppler4.patch
+PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
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
@@ -56,6 +56,7 @@
--enable-zlib --enable-libopenjpeg --enable-cairo-output \
--enable-poppler-glib --enable-gdk --disable-gtk-test \
--disable-poppler-qt --disable-poppler-qt4 \
+ --disable-splash-output \
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
<<
CompileScript: <<
--- NEW FILE: poppler4-qt4.info ---
Info3: <<
Package: poppler4-qt4-%type_pkg[qt]
# NOTE: Must keep %v in sync among all poppler4* packages!
Version: 0.10.5
Revision: 1
Type: qt (x11 mac)
Description: PDF rendering library (Qt4 binding)
License: GPL
Maintainer: Benjamin Reed <[email protected]>
BuildDependsOnly: true
BuildDepends: <<
fink (>= 0.28.0-1),
kde4-buildenv (>= 4.2.1-2),
qt4-%type_pkg[qt] (>= 4.5.0-1),
poppler4 (>= %v-1)
<<
Depends: <<
%N-shlibs (>= %v-1)
<<
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 125f671a19707861132fb03e73b61184
PatchFile: poppler4.patch
PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
Conflicts: poppler-qt4-x11, poppler-qt4-mac, poppler2-qt4-x11,
poppler2-qt4-mac, poppler3-qt4-x11, poppler3-qt4-mac
Replaces: poppler-qt4-x11, poppler-qt4-mac, poppler2-qt4-x11, poppler2-qt4-mac,
poppler3-qt4-x11, poppler3-qt4-mac
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
. %p/sbin/kde4-buildenv.sh
./configure \
--prefix=%p/lib/%type_pkg[qt] \
--mandir=%p/share/man \
--disable-dependency-tracking --disable-static \
--enable-zlib --enable-libopenjpeg --enable-cairo-output \
--disable-poppler-glib --disable-gdk --disable-gtk-test \
--disable-poppler-qt --enable-poppler-qt4 \
--disable-splash-output \
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/qt4-%type_pkg[qt]/lib/pkgconfig:$PKG_CONFIG_PATH"
pushd qt4
make -j1
popd
make -j1 poppler-qt4.pc
<<
InstallScript: <<
#!/bin/sh -ev
pushd qt4
make -j1 install DESTDIR=%d
popd
make -j1 install-pkgconfigDATA DESTDIR=%d pkgconfig_DATA=poppler-qt4.pc
perl -pi -e 's,%b/build,%p,g' %i/lib/%type_pkg[qt]/lib/*.la
%i/lib/%type_pkg[qt]/lib/pkgconfig/*.pc
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
Package: %N-shlibs
Depends: <<
poppler4-shlibs (>= %v-1),
qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.0-1)
<<
Files: <<
lib/%type_pkg[qt]/lib/libpoppler-qt4.3*.dylib
<<
Shlibs: <<
%p/lib/%type_pkg[qt]/lib/libpoppler-qt4.3.dylib 5.0.0 %n (>=
0.10.2-1)
<<
<<
Homepage: http://poppler.freedesktop.org/
DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
<<
Index: poppler2-qt4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler2-qt4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler2-qt4.info 23 Mar 2009 14:46:19 -0000 1.2
+++ poppler2-qt4.info 16 Apr 2009 03:01:22 -0000 1.3
@@ -2,7 +2,7 @@
Package: poppler2-qt4-%type_pkg[qt]
# NOTE: Must keep %v in sync among all poppler2* packages!
Version: 0.6.4
-Revision: 2
+Revision: 3
Type: qt (x11 mac)
Description: PDF rendering library (Qt4 binding)
License: GPL
@@ -20,6 +20,9 @@
<<
GCC: 4.0
+Conflicts: poppler-qt4-x11, poppler-qt4-mac, poppler3-qt4-x11,
poppler3-qt4-mac, poppler4-qt4-x11, poppler4-qt4-mac
+Replaces: poppler-qt4-x11, poppler-qt4-mac, poppler3-qt4-x11,
poppler3-qt4-mac, poppler4-qt4-x11, poppler4-qt4-mac
+
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
PatchFile: poppler2-qt4.patch
--- NEW FILE: poppler4.patch ---
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 @@
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 @@
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
@@ -65,7 +65,7 @@
@build_cairo_output_t...@am__dependencies_2 =
$(top_builddir)/poppler/libpoppler-cairo.la \
@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1)
libpoppler_glib_la_DEPENDENCIES = \
- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am__objects_1 = poppler-enums.lo
@@ -82,7 +82,6 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT)
test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
@build_with_gdk_t...@test_poppler_glib_dependencies = \
-...@build_with_gdk_true@ $(top_builddir)/poppler/libpoppler.la \
@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 @@
-DG_LOG_DOMAIN=\"Poppler\" \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
+ $(FREETYPE_CFLAGS) \
+ $(FONTCONFIG_CFLAGS) \
$(cairo_includes) \
$(POPPLER_GLIB_CFLAGS) \
$(GDK_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(FONTCONFIG_CFLAGS) \
$(cairo_includes)
stamp_files = stamp-poppler-enums.h
@@ -337,11 +336,11 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_GLIB_LIBS) \
- $(GDK_LIBS) \
+ -lpoppler \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
+ $(POPPLER_GLIB_LIBS) \
+ $(GDK_LIBS) \
$(cairo_libs)
libpoppler_glib_la_LDFLAGS = -version-info 4:0:0 @create_shared_lib@
@@ -349,11 +348,11 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc
@build_with_gdk_t...@test_poppler_glib_ldadd = \
-...@build_with_gdk_true@ $(top_builddir)/poppler/libpoppler.la \
+...@build_with_gdk_true@ -lpoppler \
@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la \
+...@build_with_gdk_true@ $(FREETYPE_LIBS) \
@BUILD_WITH_GDK_TRUE@ $(POPPLER_GLIB_LIBS) \
@BUILD_WITH_GDK_TRUE@ $(GDK_LIBS) \
-...@build_with_gdk_true@ $(FREETYPE_LIBS) \
@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
@@ -59,7 +59,7 @@
am__DEPENDENCIES_1 =
poppler_glib_demo_DEPENDENCIES = \
$(top_builddir)/glib/libpoppler-glib.la \
- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -283,7 +283,7 @@
LDADD = \
$(top_builddir)/glib/libpoppler-glib.la \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(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 @@
# 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 \
+ $(FREETYPE_CFLAGS) \
$(CAIRO_CFLAGS) \
$(POPPLER_GLIB_CFLAGS) \
- $(GDK_CFLAGS) \
- $(FREETYPE_CFLAGS)
+ $(GDK_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la \
+GTKDOC_LIBS = -lpoppler \
$(top_builddir)/glib/libpoppler-glib.la \
- $(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
+ $(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 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/goo \
+ $(FREETYPE_CFLAGS) \
+ $(FONTCONFIG_CFLAGS) \
$(splash_includes) \
$(cairo_includes) \
$(arthur_includes) \
- $(abiword_includes) \
- $(FREETYPE_CFLAGS) \
- $(FONTCONFIG_CFLAGS)
+ $(abiword_includes)
lib_LTLIBRARIES = libpoppler.la
noinst_LTLIBRARIES = $(poppler_cairo) \
@@ -421,13 +421,13 @@
libpoppler_la_LIBADD = \
$(top_builddir)/goo/libgoo.la \
$(top_builddir)/fofi/libfofi.la \
+ $(FREETYPE_LIBS) \
+ $(FONTCONFIG_LIBS) \
$(splash_libs) \
$(libjpeg_libs) \
$(zlib_libs) \
$(libjpeg2000_libs) \
$(abiword_libs) \
- $(FREETYPE_LIBS) \
- $(FONTCONFIG_LIBS) \
$(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
@@ -62,7 +62,7 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+libpoppler_qt_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
@@ -74,7 +74,7 @@
PROGRAMS = $(noinst_PROGRAMS)
am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
-test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+test_poppler_qt_DEPENDENCIES = \
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 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
- $(cairo_includes) \
- $(POPPLER_QT_CXXFLAGS) \
$(FREETYPE_CFLAGS) \
- $(FONTCONFIG_CFLAGS)
+ $(FONTCONFIG_CFLAGS) \
+ $(cairo_includes) \
+ $(POPPLER_QT_CXXFLAGS)
poppler_includedir = $(includedir)/poppler/qt3
poppler_include_HEADERS = \
@@ -292,20 +292,20 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_QT_LIBS) \
+ -lpoppler \
$(FREETYPE_LIBS) \
- $(FONTCONFIG_LIBS)
+ $(FONTCONFIG_LIBS) \
+ $(POPPLER_QT_LIBS)
libpoppler_qt_la_LDFLAGS = -version-info 2:0:0
test_poppler_qt_SOURCES = \
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
libpoppler-qt.la \
- $(POPPLER_QT_LIBS) \
- $(FREETYPE_LIBS)
+ $(FREETYPE_LIBS) \
+ $(POPPLER_QT_LIBS)
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
@@ -57,7 +57,7 @@
toc.$(OBJEXT) viewer.$(OBJEXT)
poppler_qt4viewer_OBJECTS = $(am_poppler_qt4viewer_OBJECTS)
am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
+am__DEPENDENCIES_2 = \
$(top_builddir)/qt4/src/libpoppler-qt4.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
poppler_qt4viewer_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -259,7 +259,7 @@
$(POPPLER_QT4_CFLAGS)
LDADDS = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(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
@@ -64,7 +64,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_qt4_la_DEPENDENCIES = \
- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) \
$(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 @@
poppler-export.h \
poppler-private.h
-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
+libpoppler_qt4_la_LIBADD = -lpoppler \
$(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
@@ -80,7 +80,7 @@
@BUILD_POPPLER_QT4_TRUE@ check_actualtext.$(OBJEXT)
check_actualtext_OBJECTS = $(am_check_actualtext_OBJECTS)
am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
+am__DEPENDENCIES_2 = \
$(top_builddir)/qt4/src/libpoppler-qt4.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@build_poppler_qt4_t...@check_actualtext_dependencies = \
@@ -384,7 +384,7 @@
$(POPPLER_QT4_CFLAGS)
LDADDS = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(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 @@
@BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@ pdf_inspector
@BUILD_CAIRO_OUTPUT_TRUE@@build_gtk_test_t...@cairo_includes = \
-...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)
\
-...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS)
+...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS) \
+...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)
@build_splash_output_t...@perf_test = \
@BUILD_SPLASH_OUTPUT_TRUE@ perf-test
@@ -291,9 +291,9 @@
-I$(top_srcdir)/poppler \
-I$(top_srcdir)/glib \
-I$(top_builddir)/glib \
+ $(FONTCONFIG_CFLAGS) \
$(cairo_includes) \
- $(GTK_TEST_CFLAGS) \
- $(FONTCONFIG_CFLAGS)
+ $(GTK_TEST_CFLAGS)
gtk_splash_test_SOURCES = \
gtk-splash-test.cc
@@ -308,9 +308,9 @@
gtk_cairo_test_LDADD = \
$(top_builddir)/poppler/libpoppler.la \
$(top_builddir)/glib/libpoppler-glib.la \
+ $(FONTCONFIG_LIBS) \
$(CAIRO_LIBS) \
- $(GTK_TEST_LIBS) \
- $(FONTCONFIG_LIBS)
+ $(GTK_TEST_LIBS)
pdf_inspector_SOURCES = \
pdf-inspector.cc
@@ -318,8 +318,8 @@
pdf_inspector_LDADD = \
$(top_builddir)/poppler/libpoppler-cairo.la \
$(top_builddir)/poppler/libpoppler.la \
- $(CAIRO_LIBS) \
$(FREETYPE_LIBS) \
+ $(CAIRO_LIBS) \
$(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 @@
-I$(top_srcdir) \
-I$(top_srcdir)/utils \
-I$(top_srcdir)/poppler \
- $(UTILS_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
+ $(UTILS_CFLAGS) \
$(ABIWORD_CFLAGS)
LDADD = \
$(top_builddir)/poppler/libpoppler.la \
- $(UTILS_LIBS) \
- $(FONTCONFIG_LIBS)
+ $(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
@@ -0,0 +1,91 @@
+#========================================================================
+#
+# Sample xpdfrc file
+#
+# The Xpdf tools look for a config file in two places:
+# 1. ~/.xpdfrc
+# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc
+#
+# This sample config file demonstrates some of the more common
+# configuration options. Everything here is commented out. You
+# should edit things (especially the file/directory paths, since
+# they'll likely be different on your system), and uncomment whichever
+# options you want to use. For complete details on config file syntax
+# and available options, please see the xpdfrc(5) man page.
+#
+# Also, the Xpdf language support packages each include a set of
+# options to be added to the xpdfrc file.
+#
+# http://www.foolabs.com/xpdf/
+#
+#========================================================================
+
+#----- display fonts
+
+# These map the Base-14 fonts to the Type 1 fonts that ship with
+# ghostscript. You'll almost certainly want to use something like
+# this, but you'll need to adjust this to point to wherever
+# ghostscript is installed on your system. (But if the fonts are
+# installed in a "standard" location, xpdf will find them
+# automatically.)
+
+displayFontT1 Times-Roman
@PREFIX@/share/ghostscript/fonts/n021003l.pfb
+displayFontT1 Times-Italic
@PREFIX@/share/ghostscript/fonts/n021023l.pfb
+displayFontT1 Times-Bold
@PREFIX@/share/ghostscript/fonts/n021004l.pfb
+displayFontT1 Times-BoldItalic
@PREFIX@/share/ghostscript/fonts/n021024l.pfb
+displayFontT1 Helvetica
@PREFIX@/share/ghostscript/fonts/n019003l.pfb
+displayFontT1 Helvetica-Oblique
@PREFIX@/share/ghostscript/fonts/n019023l.pfb
+displayFontT1 Helvetica-Bold
@PREFIX@/share/ghostscript/fonts/n019004l.pfb
+displayFontT1 Helvetica-BoldOblique
@PREFIX@/share/ghostscript/fonts/n019024l.pfb
+displayFontT1 Courier
@PREFIX@/share/ghostscript/fonts/n022003l.pfb
+displayFontT1 Courier-Oblique
@PREFIX@/share/ghostscript/fonts/n022023l.pfb
+displayFontT1 Courier-Bold
@PREFIX@/share/ghostscript/fonts/n022004l.pfb
+displayFontT1 Courier-BoldOblique
@PREFIX@/share/ghostscript/fonts/n022024l.pfb
+displayFontT1 Symbol
@PREFIX@/share/ghostscript/fonts/s050000l.pfb
+displayFontT1 ZapfDingbats
@PREFIX@/share/ghostscript/fonts/d050000l.pfb
+
+# If you need to display PDF files that refer to non-embedded fonts,
+# you should add one or more fontDir options to point to the
+# directories containing the font files. Xpdf will only look at .pfa,
+# .pfb, and .ttf files in those directories (other files will simply
+# be ignored).
+
+fontDir /usr/local/fonts/bakoma
+
+#----- PostScript output control
+
+# Set the default PostScript file or command.
+
+psFile "|lpr -Pmyprinter"
+
+# Set the default PostScript paper size -- this can be letter, legal,
+# A4, or A3. You can also specify a paper size as width and height
+# (in points).
+
+psPaperSize letter
+
+#----- text output control
+
+# Choose a text encoding for copy-and-paste and for pdftotext output.
+# The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf. Other
+# encodings are available in the language support packages.
+
+textEncoding UTF-8
+
+# Choose the end-of-line convention for multi-line copy-and-past and
+# for pdftotext output. The available options are unix, mac, and dos.
+
+textEOL unix
+
+#----- misc settings
+
+# Enable t1lib, FreeType, and anti-aliased text.
+
+enableT1lib yes
+enableFreeType yes
+antialias yes
+
+# Set the command used to run a web browser when a URL hyperlink is
+# clicked.
+
+urlCommand "open 'openURL(%s)'"
Index: poppler4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler4.info 5 Jan 2009 22:42:07 -0000 1.2
+++ poppler4.info 16 Apr 2009 03:01:22 -0000 1.3
@@ -1,10 +1,10 @@
Package: poppler4
# NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.2
+Version: 0.10.5
Revision: 1
Description: PDF rendering library
License: GPL
-Maintainer: Benjamin Reed <[email protected]>
+Maintainer: Benjamin Reed <[email protected]>
Depends: <<
%N-shlibs (= %v-%r)
@@ -12,6 +12,7 @@
BuildDepends: <<
cairo (>= 1.8-1),
expat1,
+ fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glitz,
@@ -42,7 +43,9 @@
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: a802a178d12f453f1d0176d67f923c7d
+Source-MD5: 125f671a19707861132fb03e73b61184
+PatchFile: %n.patch
+PatchFile-MD5: b6b608ba1d8adea09470ff169e28b59d
SetCFLAGS: -Os
SetCXXFLAGS: -Os
@@ -54,6 +57,7 @@
--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"
<<
--- poppler4-glib.patch DELETED ---
Index: poppler4-xpdf.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-xpdf.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler4-xpdf.info 5 Jan 2009 22:42:07 -0000 1.2
+++ poppler4-xpdf.info 16 Apr 2009 03:01:22 -0000 1.3
@@ -1,13 +1,13 @@
Package: poppler4-xpdf
# NOTE: Must keep %v in sync among all poppler4* packages!
-Version: 0.10.2
+Version: 0.10.5
Revision: 1
Description: PDF rendering library (alternate interface)
License: GPL
-Maintainer: Benjamin Reed <[email protected]>
+Maintainer: Benjamin Reed <[email protected]>
BuildDepends: <<
- fink (>= 0.24.12-1)
+ fink (>= 0.28.0-1)
<<
Depends: <<
poppler4-shlibs (>= %v-1)
@@ -22,10 +22,10 @@
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: a802a178d12f453f1d0176d67f923c7d
-
+Source-MD5: 125f671a19707861132fb03e73b61184
PatchFile: %n.patch
PatchFile-MD5: 85cf2391e28efbbd1f7ef897dfd44a5e
+
PatchScript: <<
#!/bin/sh -ev
%{default_script}
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
