Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19691/main/finkinfo/libs

Modified Files:
      Tag: pangocairo-branch
        poppler-data.info poppler2-glib.info poppler2-glib.patch 
        poppler2-qt3.info poppler2.info 
Removed Files:
      Tag: pangocairo-branch
        poppler2-cairo.info 
Log Message:
new upstreams

Index: poppler2-glib.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/poppler2-glib.info,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- poppler2-glib.info  4 Nov 2007 02:34:50 -0000       1.1.2.4
+++ poppler2-glib.info  13 Dec 2007 04:00:30 -0000      1.1.2.5
@@ -1,13 +1,13 @@
 Package: poppler2-glib
-Version: 0.6
-Revision: 1021
+Version: 0.6.3
+Revision: 1
 Description: PDF rendering library (GLIB Interface)
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: <<
        %N-shlibs (>= %v-%r),
-       pkgconfig (>= 0.20-1)
+       pkgconfig (>= 0.21-1)
 <<
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
@@ -23,6 +23,7 @@
        libjpeg,
        libpng3,
        pango1-xft2-ft219-dev (>= 1.18.2-1),
+       pkgconfig (>= 0.21-1),
        poppler2 (>= %v-1),
        x11-dev,
        xft2-dev
@@ -33,11 +34,11 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 96883867572aa1e55e979ec75369c562
+Source-MD5: a585677188cd56a090c4dc3357e03a95
 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
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 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"

--- poppler2-cairo.info DELETED ---

Index: poppler2-glib.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/poppler2-glib.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- poppler2-glib.patch 26 Sep 2007 21:03:43 -0000      1.1.2.1
+++ poppler2-glib.patch 13 Dec 2007 04:00:30 -0000      1.1.2.2
@@ -1,6 +1,6 @@
-
---- 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
+diff -uNr poppler-0.6.3/glib/Makefile.in poppler-0.6.3-new/glib/Makefile.in
+--- poppler-0.6.3/glib/Makefile.in     2007-12-12 13:51:42.000000000 -0500
++++ poppler-0.6.3-new/glib/Makefile.in 2007-12-12 22:54:33.000000000 -0500
 @@ -66,7 +66,7 @@
  @[EMAIL PROTECTED] = $(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@     $(am__DEPENDENCIES_1)
@@ -19,7 +19,7 @@
        $(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 @@
+@@ -291,11 +291,10 @@
        -DG_LOG_DOMAIN=\"Poppler\"              \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/poppler                 \
@@ -33,37 +33,35 @@
  
  stamp_files = stamp-poppler-enums.h
  poppler_glib_public_headers = \
-@@ -323,22 +322,22 @@
+@@ -324,10 +323,10 @@
        poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -      $(top_builddir)/poppler/libpoppler.la           \
 -      $(POPPLER_GLIB_LIBS)                            \
-+      $(prefix)/lib/libpoppler.la             \
++      $(prefix)/lib/libpoppler.la \
        $(FREETYPE_LIBS)                                \
        $(FONTCONFIG_LIBS)                              \
--      $(cairo_libs)
-+      $(cairo_libs) \
-+      $(POPPLER_GLIB_LIBS)
++      $(POPPLER_GLIB_LIBS)                            \
+       $(cairo_libs)
  
  libpoppler_glib_la_LDFLAGS = -version-info 2:0:0
- test_poppler_glib_SOURCES = \
-        test-poppler-glib.c
+@@ -335,10 +334,10 @@
+        test-poppler-glib.cc
  
  test_poppler_glib_LDADD = \
 -      $(top_builddir)/poppler/libpoppler.la   \
-+      $(prefix)/lib/libpoppler.la     \
++      $(prefix)/lib/libpoppler.la \
++      $(FREETYPE_LIBS)                        \
        libpoppler-glib.la                      \
--      $(POPPLER_GLIB_LIBS)                    \
-       $(FREETYPE_LIBS)                        \
--      $(cairo_libs)
-+      $(cairo_libs) \
-+      $(POPPLER_GLIB_LIBS)
+       $(POPPLER_GLIB_LIBS)                    \
+-      $(FREETYPE_LIBS)                        \
+       $(cairo_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
+diff -uNr poppler-0.6.3/glib/demo/Makefile.in 
poppler-0.6.3-new/glib/demo/Makefile.in
+--- poppler-0.6.3/glib/demo/Makefile.in        2007-12-12 13:51:42.000000000 
-0500
++++ poppler-0.6.3-new/glib/demo/Makefile.in    2007-12-12 22:52:51.000000000 
-0500
 @@ -58,7 +58,7 @@
  am__DEPENDENCIES_1 =
  poppler_glib_demo_DEPENDENCIES =  \
@@ -73,7 +71,7 @@
  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 @@
+@@ -263,7 +263,7 @@
  
  LDADD = \
        $(top_builddir)/glib/libpoppler-glib.la \
@@ -82,9 +80,10 @@
        $(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 @@
+diff -uNr poppler-0.6.3/glib/reference/Makefile.in 
poppler-0.6.3-new/glib/reference/Makefile.in
+--- poppler-0.6.3/glib/reference/Makefile.in   2007-12-12 13:51:43.000000000 
-0500
++++ poppler-0.6.3-new/glib/reference/Makefile.in       2007-12-12 
22:52:51.000000000 -0500
+@@ -294,7 +294,7 @@
        $(POPPLER_GLIB_CFLAGS)                          \
        $(FREETYPE_CFLAGS)
  

Index: poppler2-qt3.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/poppler2-qt3.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- poppler2-qt3.info   26 Sep 2007 21:03:44 -0000      1.1.2.1
+++ poppler2-qt3.info   13 Dec 2007 04:00:30 -0000      1.1.2.2
@@ -1,6 +1,6 @@
 Package: poppler2-qt3
-Version: 0.6
-Revision: 1021
+Version: 0.6.3
+Revision: 1
 Description: PDF rendering library (Qt Interface)
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -21,14 +21,14 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 96883867572aa1e55e979ec75369c562
+Source-MD5: a585677188cd56a090c4dc3357e03a95
 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
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 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"

Index: poppler-data.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler-data.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- poppler-data.info   18 Sep 2007 00:27:32 -0000      1.1.2.2
+++ poppler-data.info   13 Dec 2007 04:00:29 -0000      1.1.2.3
@@ -1,7 +1,7 @@
 Package: poppler-data
-Epoch: 1
-Version: 0.1
+Version: 0.2.0
 Revision: 1
+Epoch: 1
 Description: Character-encoding files for poppler
 License: Restrictive/Distributable
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -14,10 +14,12 @@
 <<
 
 Source: http://poppler.freedesktop.org/%n-%v.tar.gz
-Source-MD5: 5c700eb06dda9dafec09cd85225e34d4
+Source-MD5: b7f98e84a4d2a2c794271d746ec7ee0b
 
 CompileScript: #
-InstallScript: make install DESTDIR=%d prefix=%p
+
+InstallScript: make -j1 install DESTDIR=%d prefix=%p
 DocFiles: COPYING README
 
 Homepage: http://poppler.freedesktop.org/
+

Index: poppler2.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/poppler2.info,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- poppler2.info       5 Nov 2007 23:59:48 -0000       1.1.2.4
+++ poppler2.info       13 Dec 2007 04:00:31 -0000      1.1.2.5
@@ -1,6 +1,6 @@
 Package: poppler2
-Version: 0.6
-Revision: 1021
+Version: 0.6.3
+Revision: 1
 Distribution: 10.4, 10.5
 Description: PDF rendering library
 License: GPL
@@ -8,7 +8,7 @@
 
 Depends: <<
        %N-shlibs (= %v-%r),
-       poppler-data (>= 1:0.1-1)
+       poppler-data (>= 1:0.2-1)
 <<
 BuildDepends: <<
        cairo (>= 1.2-1),
@@ -39,13 +39,13 @@
 GCC: 4.0
 
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 96883867572aa1e55e979ec75369c562
+Source-MD5: a585677188cd56a090c4dc3357e03a95
 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
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 SetLIBS: -L%p/lib -lexpat
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
@@ -79,9 +79,9 @@
 SplitOff: <<
        Package: %N-shlibs
        Depends: <<
-               poppler-data (>= 1:0.1-1),
+               poppler-data (>= 1:0.2-1),
                fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs,
+               freetype219-shlibs (>= 2.3.5-1),
                libgettext3-shlibs,
                libiconv,
                libxml2-shlibs,
@@ -101,10 +101,7 @@
 <<
 SplitOff2: <<
        Package: poppler-bin
-       Depends: <<
-               %N-shlibs (>= %v-%r),
-               libjpeg-shlibs
-       <<
+       Depends: %N-shlibs (>= %v-%r)
        Conflicts: xpdf
        Replaces: <<
                poppler (<< %v-%r),


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to