Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv25879
Modified Files:
poppler1.info poppler1.patch
Log Message:
conflicts with poppler2
Index: poppler1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- poppler1.info 4 Sep 2007 06:05:05 -0000 1.12
+++ poppler1.info 26 Sep 2007 18:10:30 -0000 1.13
@@ -1,13 +1,13 @@
Package: poppler1
Version: 0.5.4
-Revision: 1024
+Revision: 1025
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: <<
expat1,
@@ -25,8 +25,14 @@
pkgconfig (>= 0.21-1),
x11-dev
<<
-Conflicts: poppler
-Replaces: poppler
+Conflicts: <<
+ poppler,
+ poppler2
+<<
+Replaces: <<
+ poppler,
+ poppler2
+<<
BuildDependsOnly: True
GCC: 4.0
@@ -36,8 +42,10 @@
SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetCFLAGS: -Os
+SetCXXFLAGS: -Os
SetLIBS: -L%p/lib -lexpat
-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
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+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:$PKG_CONFIG_PATH"
CompileScript: <<
#!/bin/sh -ev
@@ -67,7 +75,7 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- poppler-data,
+ poppler-data (>= 1:0.1-1),
expat1-shlibs,
fontconfig2-shlibs,
freetype219-shlibs,
@@ -90,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
Index: poppler1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poppler1.patch 4 Sep 2007 06:05:06 -0000 1.4
+++ poppler1.patch 26 Sep 2007 18:10:30 -0000 1.5
@@ -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
