Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv30335/main/finkinfo/libs
Modified Files:
Tag: pangocairo-branch
poppler-qt3.info poppler1.info poppler1.patch
Added Files:
Tag: pangocairo-branch
poppler2-cairo.info poppler2-glib.info poppler2-glib.patch
poppler2-qt3.info poppler2-qt3.patch poppler2.info
poppler2.patch
Log Message:
more validation fixes
Index: poppler1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.info,v
retrieving revision 1.5.2.17
retrieving revision 1.5.2.18
diff -u -d -r1.5.2.17 -r1.5.2.18
--- poppler1.info 18 Sep 2007 14:43:09 -0000 1.5.2.17
+++ poppler1.info 26 Sep 2007 21:03:41 -0000 1.5.2.18
@@ -1,13 +1,13 @@
Package: poppler1
Version: 0.5.4
-Revision: 1024
+Revision: 1026
Description: PDF rendering library
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: <<
%N-shlibs (= %v-%r),
- poppler-data
+ poppler-data (>= 1:0.1-1)
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
@@ -29,8 +29,16 @@
x11-dev,
xft2-dev
<<
-Conflicts: poppler
-Replaces: poppler
+Conflicts: <<
+ poppler,
+ poppler2,
+ poppler2-glib
+<<
+Replaces: <<
+ poppler,
+ poppler2,
+ poppler2-glib
+<<
BuildDependsOnly: True
GCC: 4.0
@@ -38,14 +46,14 @@
Source-MD5: 053fdfd70533ecce1a06353fa945f061
PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib -lexpat
SetCFLAGS: -Os
+SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
SetCXXFLAGS: -Os
-ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.%N
--disable-dependency-tracking --enable-zlib --enable-cairo-output
--disable-poppler-qt --disable-poppler-qt4 --disable-gtk-test
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib
+SetLIBS: -L%p/lib -lexpat
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
+ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.%N
--disable-dependency-tracking --enable-zlib --disable-cairo-output
--disable-poppler-qt --disable-poppler-qt4 --disable-gtk-test
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
@@ -75,17 +83,9 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- poppler-data,
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.3.2-13),
- freetype219-shlibs (>= 2.3.5-1),
- glib2-shlibs (>= 2.14.0-1),
+ poppler-data (>= 1:0.1-1),
gtk+2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
- libiconv,
- libjpeg-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.18.2-1),
- x11-shlibs
+ pango1-xft2-ft219-shlibs (>= 1.18.2-1)
<<
Replaces: <<
poppler (<< %v-%r),
@@ -98,7 +98,7 @@
etc
<<
Shlibs: <<
- %p/lib/libpoppler.1.dylib 2.0.0 %n (>= 0.5.4-1)
+ %p/lib/libpoppler.1.dylib 2.0.0 %n (>= 0.5.4-1)
%p/lib/libpoppler-glib.1.dylib 2.0.0 %n (>= 0.5.3-2)
<<
ConfFiles: %p/etc/xpdfrc.%N
--- NEW FILE: poppler2-glib.info ---
Package: poppler2-glib
Version: 0.6
Revision: 1021
Description: PDF rendering library (GLIB Interface)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.2-1),
expat1,
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev,
libjpeg,
libpng3,
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
poppler2 (>= %v-1),
x11-dev,
xft2-dev
<<
Conflicts: poppler1
Replaces: poppler1
BuildDependsOnly: True
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 96883867572aa1e55e979ec75369c562
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include
-I%p/lib/pango-ft219/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
-L%p/lib/pango-ft219/lib -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
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
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
./configure %c
pushd poppler
make libpoppler-cairo.la
popd
pushd glib
make
popd
make poppler-glib.pc
<<
InstallScript: <<
#!/bin/sh -ev
pushd glib
make -j1 install DESTDIR=%d
popd
install -d -m 755 %i/lib/pkgconfig
install -c -m 644 poppler-glib.pc %i/lib/pkgconfig/
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
Package: %n-shlibs
Depends: <<
expat1-shlibs,
gtk+2-shlibs (>= 2.12.0-1),
poppler2-shlibs (>= %v-1)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: lib/libpoppler-glib.2*.dylib
Shlibs: %p/lib/libpoppler-glib.2.dylib 3.0.0 %n (>= 0.6-1)
<<
Homepage: http://poppler.freedesktop.org/
DescDetail: <<
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
This is the GLIB plugin for Poppler.
<<
--- NEW FILE: poppler2-cairo.info ---
Package: poppler2-glib
Version: 0.6
Revision: 1021
Description: PDF rendering library (GLIB Interface)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.2-1),
expat1,
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1),
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
libgettext3-dev,
libiconv-dev,
libjpeg,
libpng3,
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
poppler2 (>= %v-1),
x11-dev,
xft2-dev
<<
Conflicts: poppler-qt3
Replaces: poppler-qt3
BuildDependsOnly: True
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 96883867572aa1e55e979ec75369c562
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include
-I%p/lib/pango-ft219/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
-L%p/lib/pango-ft219/lib -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
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
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
./configure %c
pushd glib
make
popd
make poppler-glib.pc
<<
InstallScript: <<
#!/bin/sh -ev
pushd glib
make -j1 install DESTDIR=%d
popd
install -d -m 755 %i/lib/pkgconfig
install -c -m 644 poppler-glib.pc %i/lib/pkgconfig/
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
Package: %n-shlibs
Depends: <<
expat1-shlibs,
gtk+2-shlibs (>= 2.12.0-1),
poppler2-shlibs (>= %v-1)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: lib/libpoppler-glib.2*.dylib
Shlibs: %p/lib/poppler-glib.2.dylib 3.0.0 %n (>= 0.6-1)
<<
Homepage: http://poppler.freedesktop.org/
DescDetail: <<
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
This is the GLIB plugin for Poppler.
<<
--- NEW FILE: poppler2-glib.patch ---
--- poppler-0.6/glib/Makefile.in 2007-09-03 14:55:20.000000000 -0400
+++ poppler-0.6-new/glib/Makefile.in 2007-09-26 15:07:57.000000000 -0400
@@ -66,7 +66,7 @@
@[EMAIL PROTECTED] = $(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_2)
am__objects_1 = poppler-enums.lo
@@ -78,7 +78,7 @@
am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
test_poppler_glib_DEPENDENCIES = \
- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
+ libpoppler-glib.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
@@ -290,11 +290,10 @@
-DG_LOG_DOMAIN=\"Poppler\" \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
- $(cairo_includes) \
- $(POPPLER_GLIB_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
- $(cairo_includes)
+ $(cairo_includes) \
+ $(POPPLER_GLIB_CFLAGS)
stamp_files = stamp-poppler-enums.h
poppler_glib_public_headers = \
@@ -323,22 +322,22 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_GLIB_LIBS) \
+ $(prefix)/lib/libpoppler.la \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
- $(cairo_libs)
+ $(cairo_libs) \
+ $(POPPLER_GLIB_LIBS)
libpoppler_glib_la_LDFLAGS = -version-info 2:0:0
test_poppler_glib_SOURCES = \
test-poppler-glib.c
test_poppler_glib_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ $(prefix)/lib/libpoppler.la \
libpoppler-glib.la \
- $(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
- $(cairo_libs)
+ $(cairo_libs) \
+ $(POPPLER_GLIB_LIBS)
BUILT_SOURCES = \
poppler-enums.c \
--- poppler-0.6/glib/demo/Makefile.in 2007-09-03 14:55:20.000000000 -0400
+++ poppler-0.6-new/glib/demo/Makefile.in 2007-09-26 15:08:25.000000000
-0400
@@ -58,7 +58,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 = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -261,7 +261,7 @@
LDADD = \
$(top_builddir)/glib/libpoppler-glib.la \
- $(top_builddir)/poppler/libpoppler.la \
+ $(prefix)/lib/libpoppler.la \
$(GTK_TEST_LIBS)
all: all-am
--- 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 15:08:34.000000000
-0400
@@ -293,7 +293,7 @@
$(POPPLER_GLIB_CFLAGS) \
$(FREETYPE_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la \
+GTKDOC_LIBS = $(prefix)/lib/libpoppler.la \
$(top_builddir)/glib/libpoppler-glib.la \
$(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
--- NEW FILE: poppler2-qt3.info ---
Package: poppler2-qt3
Version: 0.6
Revision: 1021
Description: PDF rendering library (Qt Interface)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
expat1,
freetype219,
libjpeg,
pkgconfig (>= 0.21-1),
poppler2 (>= %v-1),
qt3 (>= 3.3.8-1021),
x11-dev
<<
Conflicts: poppler-qt3
Replaces: poppler-qt3
BuildDependsOnly: True
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 96883867572aa1e55e979ec75369c562
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
<<
SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2
--disable-dependency-tracking --enable-zlib --disable-poppler-glib
--disable-poppler-qt4 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
unset QTDIR
export QTINC=%p/lib/qt3/include
export QTLIB=%p/lib/qt3/lib
export PATH="%p/lib/freetype219/bin:$PATH"
export jpeg_incdir="%p/include"
./configure %c
pushd qt
make
popd
make poppler-qt.pc
<<
InstallScript: <<
#!/bin/sh -ev
pushd qt
make -j1 install DESTDIR=%d
popd
install -d -m 755 %i/lib/pkgconfig
install -c -m 644 poppler-qt.pc %i/lib/pkgconfig/
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
Package: %n-shlibs
Depends: <<
expat1-shlibs,
poppler2-shlibs (>= %v-1),
qt3-shlibs (>= 3.3.8-1021)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: lib/libpoppler-qt.2*.dylib
Shlibs: %p/lib/libpoppler-qt.2.dylib 3.0.0 %n (>= 0.6-1)
<<
Homepage: http://poppler.freedesktop.org/
DescDetail: <<
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
This is the Qt plugin for Poppler.
<<
--- NEW FILE: poppler2.patch ---
--- 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 @@
fi
-jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include "
+jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include
@PREFIX@/include"
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 @@
-DG_LOG_DOMAIN=\"Poppler\" \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
- $(cairo_includes) \
- $(POPPLER_GLIB_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
+ $(cairo_includes) \
+ $(POPPLER_GLIB_CFLAGS) \
$(cairo_includes)
stamp_files = stamp-poppler-enums.h
@@ -324,9 +324,9 @@
libpoppler_glib_la_LIBADD = \
$(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
+ $(POPPLER_GLIB_LIBS) \
$(cairo_libs)
libpoppler_glib_la_LDFLAGS = -version-info 2:0:0
@@ -336,8 +336,8 @@
test_poppler_glib_LDADD = \
$(top_builddir)/poppler/libpoppler.la \
libpoppler-glib.la \
- $(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
+ $(POPPLER_GLIB_LIBS) \
$(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 @@
# 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) \
- $(FREETYPE_CFLAGS)
+ $(POPPLER_GLIB_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la \
$(top_builddir)/glib/libpoppler-glib.la \
- $(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
+ $(POPPLER_GLIB_LIBS) \
$(cairo_libs)
@[EMAIL PROTECTED] = $(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 @@
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) \
@@ -399,12 +399,12 @@
libpoppler_la_LIBADD = \
$(top_builddir)/goo/libgoo.la \
$(top_builddir)/fofi/libfofi.la \
+ $(FREETYPE_LIBS) \
+ $(FONTCONFIG_LIBS) \
$(splash_libs) \
$(libjpeg_libs) \
$(zlib_libs) \
$(abiword_libs) \
- $(FREETYPE_LIBS) \
- $(FONTCONFIG_LIBS) \
$(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 @@
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 = \
@@ -289,9 +289,9 @@
libpoppler_qt_la_LIBADD = \
$(top_builddir)/poppler/libpoppler.la \
- $(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS) \
- $(FONTCONFIG_LIBS)
+ $(FONTCONFIG_LIBS) \
+ $(POPPLER_QT_LIBS)
libpoppler_qt_la_LDFLAGS = -version-info 2:0:0
test_poppler_qt_SOURCES = \
@@ -300,8 +300,8 @@
test_poppler_qt_LDADD = \
$(top_builddir)/poppler/libpoppler.la \
libpoppler-qt.la \
- $(POPPLER_QT_LIBS) \
- $(FREETYPE_LIBS)
+ $(FREETYPE_LIBS) \
+ $(POPPLER_QT_LIBS)
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 @@
@BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@ pdf_inspector
@BUILD_CAIRO_OUTPUT_TRUE@@[EMAIL PROTECTED] = \
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)
\
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS)
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS) \
[EMAIL PROTECTED]@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS)
INCLUDES = \
-I$(top_srcdir) \
-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
@@ -288,9 +288,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
@@ -298,8 +298,8 @@
pdf_inspector_LDADD = \
$(top_builddir)/poppler/libpoppler.la \
$(top_builddir)/poppler/libpoppler-cairo.la \
- $(CAIRO_LIBS) \
$(FREETYPE_LIBS) \
+ $(CAIRO_LIBS) \
$(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
@@ -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)'"
--- NEW FILE: poppler2-qt3.patch ---
--- poppler-0.6/qt/Makefile.in 2007-09-03 14:55:21.000000000 -0400
+++ poppler-0.6-new/qt/Makefile.in 2007-09-26 14:32:05.000000000 -0400
@@ -63,7 +63,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 \
@@ -72,7 +72,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 = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -288,7 +288,7 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ $(prefix)/lib/libpoppler.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
@@ -298,7 +298,7 @@
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ $(prefix)/lib/libpoppler.la \
libpoppler-qt.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
Index: poppler-qt3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler-qt3.info,v
retrieving revision 1.8.2.14
retrieving revision 1.8.2.15
diff -u -d -r1.8.2.14 -r1.8.2.15
--- poppler-qt3.info 18 Sep 2007 14:43:09 -0000 1.8.2.14
+++ poppler-qt3.info 26 Sep 2007 21:03:41 -0000 1.8.2.15
@@ -1,6 +1,6 @@
Package: poppler-qt3
Version: 0.5.4
-Revision: 1024
+Revision: 1026
Description: PDF rendering library (Qt Interface)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -18,13 +18,15 @@
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
poppler1 (>= %v-1001),
- qt3 (>= 3.3.6-1027),
+ qt3 (>= 3.3.8-1021),
x11-dev,
xft2-dev
<<
BuildDependsOnly: True
GCC: 4.0
+Conflicts: poppler2-qt3
+Replaces: poppler2-qt3
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 053fdfd70533ecce1a06353fa945f061
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
@@ -32,8 +34,7 @@
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib
SetCFLAGS: -Os
SetCXXFLAGS: -Os
ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler1
--disable-dependency-tracking --enable-zlib --disable-poppler-glib
--disable-poppler-qt4
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
@@ -67,7 +68,7 @@
Depends: <<
expat1-shlibs,
poppler1-shlibs (>= %v-1001),
- qt3-shlibs (>= 3.3.6-1027)
+ qt3-shlibs (>= 3.3.8-1021)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: lib/libpoppler-qt.1*.dylib
--- NEW FILE: poppler2.info ---
Package: poppler2
Version: 0.6
Revision: 1021
Distribution: 10.4, 10.5
Description: PDF rendering library
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: <<
%N-shlibs (= %v-%r),
poppler-data (>= 1:0.1-1)
<<
BuildDepends: <<
cairo (>= 1.2-1),
expat1,
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1),
glitz,
gettext-bin,
gettext-tools,
libgettext3-dev,
libiconv-dev,
libjpeg,
libpng3,
libxml2,
pkgconfig (>= 0.21-1),
x11-dev,
xft2-dev
<<
Conflicts: <<
poppler,
poppler1
<<
Replaces: <<
poppler,
poppler1
<<
BuildDependsOnly: True
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 96883867572aa1e55e979ec75369c562
PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
SetCFLAGS: -Os
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
SetCXXFLAGS: -Os
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib
SetLIBS: -L%p/lib -lexpat
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.%N
--disable-dependency-tracking --enable-zlib --disable-poppler-glib
--enable-cairo-output --disable-poppler-qt --disable-poppler-qt4
--disable-gtk-test FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
./configure %c
make
if [ -f %p/lib/fontconfig2/lib/libfontconfig.a ] && [ ! -f
%p/lib/fontconfig2/lib/libfontconfig.dylib ]; then
mkdir fink-fc
( cd fink-fc && ar x %p/lib/fontconfig2/lib/libfontconfig.a )
|| exit 1
for a in poppler/.libs/libpoppler.a; do
ar d $a libfontconfig.a
ar d $a libfontconfig.a
ar ru $a fink-fc/*.o
ranlib $a
done
fi
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 install DESTDIR=%d
install -d %i/etc
install -c -m 644 xpdfrc.%N %i/etc/
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
Package: %N-shlibs
Depends: <<
poppler-data (>= 1:0.1-1),
fontconfig2-shlibs,
freetype219-shlibs,
libgettext3-shlibs,
libiconv,
libxml2-shlibs,
x11-shlibs
<<
Replaces: <<
poppler (<< %v-%r),
%N (<< %v-%r)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: <<
lib/libpoppler.2*.dylib
etc
<<
Shlibs: %p/lib/libpoppler.2.dylib 3.0.0 %n (>= 0.6-1)
ConfFiles: %p/etc/xpdfrc.%N
<<
SplitOff2: <<
Package: poppler-bin
Depends: %N-shlibs (>= %v-%r)
Conflicts: xpdf
Replaces: <<
poppler (<< %v-%r),
%N (<< %v-%r),
xpdf
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Files: bin share/man
<<
Homepage: http://poppler.freedesktop.org/
DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
DescPort: <<
xpdfrc file borrowed from xpdf. It is renamed xpdfrc.%N to avoid
a conflict with xpdf. Cairo output is disabled because cairo depends
on poppler too, circular dependencies are bad. :P
<<
Index: poppler1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- poppler1.patch 18 Sep 2007 00:27:32 -0000 1.1.2.3
+++ poppler1.patch 26 Sep 2007 21:03:41 -0000 1.1.2.4
@@ -1,4 +1,4 @@
-diff -uNr poppler-0.5.4/configure poppler-0.5.4-new/configure
+
--- poppler-0.5.4/configure 2006-09-21 20:54:32.000000000 -0400
+++ poppler-0.5.4-new/configure 2007-01-25 21:36:45.000000000 -0500
@@ -24268,7 +24268,7 @@
@@ -6,11 +6,10 @@
-jpeg_incdirs="$includedir /usr/include /usr/local/include "
-+jpeg_incdirs="[EMAIL PROTECTED]@/include"
++jpeg_incdirs="$includedir /usr/include /usr/local/include @PREFIX@/include"
jpeg_incdir=NO
for i in $jpeg_incdirs;
-diff -uNr poppler-0.5.4/glib/Makefile.in poppler-0.5.4-new/glib/Makefile.in
--- poppler-0.5.4/glib/Makefile.in 2006-09-21 20:54:20.000000000 -0400
+++ poppler-0.5.4-new/glib/Makefile.in 2007-01-25 21:45:15.000000000 -0500
@@ -283,9 +283,9 @@
@@ -44,7 +43,6 @@
$(cairo_libs)
BUILT_SOURCES = \
-diff -uNr poppler-0.5.4/glib/reference/Makefile.in
poppler-0.5.4-new/glib/reference/Makefile.in
--- poppler-0.5.4/glib/reference/Makefile.in 2006-09-21 20:54:21.000000000
-0400
+++ poppler-0.5.4-new/glib/reference/Makefile.in 2007-01-25
21:45:49.000000000 -0500
@@ -283,14 +283,14 @@
@@ -65,7 +63,6 @@
$(cairo_libs)
@[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-diff -uNr poppler-0.5.4/poppler/Makefile.in
poppler-0.5.4-new/poppler/Makefile.in
--- poppler-0.5.4/poppler/Makefile.in 2006-09-21 20:54:23.000000000 -0400
+++ poppler-0.5.4-new/poppler/Makefile.in 2007-01-25 21:36:45.000000000
-0500
@@ -366,11 +366,11 @@
@@ -99,7 +96,6 @@
libpoppler_la_LDFLAGS = -version-info 1:0:0
@[EMAIL PROTECTED] = $(includedir)/poppler
-diff -uNr poppler-0.5.4/qt/Makefile.in poppler-0.5.4-new/qt/Makefile.in
--- poppler-0.5.4/qt/Makefile.in 2006-09-21 20:54:24.000000000 -0400
+++ poppler-0.5.4-new/qt/Makefile.in 2007-01-25 21:49:20.000000000 -0500
@@ -259,10 +259,10 @@
@@ -137,7 +133,6 @@
all: all-am
-diff -uNr poppler-0.5.4/test/Makefile.in poppler-0.5.4-new/test/Makefile.in
--- poppler-0.5.4/test/Makefile.in 2006-09-21 20:54:27.000000000 -0400
+++ poppler-0.5.4-new/test/Makefile.in 2007-01-25 21:49:50.000000000 -0500
@@ -257,8 +257,8 @@
@@ -161,7 +156,6 @@
$(GTK_TEST_LIBS)
EXTRA_DIST = \
-diff -uNr poppler-0.5.4/xpdfrc.poppler1 poppler-0.5.4-new/xpdfrc.poppler1
--- poppler-0.5.4/xpdfrc.poppler1 1969-12-31 19:00:00.000000000 -0500
+++ poppler-0.5.4-new/xpdfrc.poppler1 2007-01-25 21:36:45.000000000 -0500
@@ -0,0 +1,91 @@
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
