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

Modified Files:
      Tag: pangocairo-branch
        gdal.info poppler-qt3.info poppler.info poppler.patch 
        poppler1.info 
Log Message:
merges from HEAD, forgot to commit these before

Index: poppler-qt3.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler-qt3.info,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- poppler-qt3.info    24 Jan 2007 17:12:47 -0000      1.8.2.2
+++ poppler-qt3.info    28 Jan 2007 18:22:20 -0000      1.8.2.3
@@ -1,18 +1,24 @@
 Package: poppler-qt3
 Version: 0.5.4
-Revision: 1023
+Revision: 1024
 Description: PDF rendering library (Qt Interface)
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs (>= %v-%r)
 BuildDepends: <<
+       atk1 (>= 1.12.3-1),
+       cairo (>= 1.2-1),
+       expat1,
+       fontconfig2-dev (>= 2.3.2-13),
        freetype219,
        libjpeg,
+       pango1-xft2-ft219-dev (>= 1.14.9-1),
        pkgconfig (>= 0.21-1),
        poppler1 (>= %v-%r),
        qt3 (>= 3.3.6-1027),
-       x11-dev
+       x11-dev,
+       xft2-dev
 <<
 BuildDependsOnly: True
 GCC: 4.0
@@ -21,6 +27,14 @@
 Source-MD5: 053fdfd70533ecce1a06353fa945f061
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
 
+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
+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
 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
 SetLIBS: -L%p/lib
@@ -46,7 +60,7 @@
 #!/bin/sh -ev
 
        pushd qt
-       make install DESTDIR=%d
+       make -j1 install DESTDIR="%d"
        popd
        install -d -m 755 %i/lib/pkgconfig
        install -c -m 644 poppler-qt.pc %i/lib/pkgconfig/

Index: poppler.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler.info,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- poppler.info        22 Jan 2007 21:49:16 -0000      1.8.2.3
+++ poppler.info        28 Jan 2007 18:22:20 -0000      1.8.2.4
@@ -6,22 +6,28 @@
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: <<
-  glitz, cairo (>= 1.2-1), xft2-dev,
-  expat1, fontconfig2-dev, freetype219, glib2-dev (>= 2.12.0-1), gettext-bin,
+  atk1 (>= 1.12.3-1), cairo (>= 1.2-1), glitz,
+  expat1, fontconfig2-dev (>= 2.3.2-13), freetype219, glib2-dev (>= 2.12.0-1), 
gettext-bin,
   gettext-tools, gtk+2-dev (>= 2.10.0-1), libgettext3-dev, libiconv-dev,
-  libjpeg, pango1-xft2-ft219-dev (>= 1.14.9-1), pkgconfig (>= 0.21-1), x11-dev
+  libjpeg, pango1-xft2-ft219-dev (>= 1.14.9-1), pkgconfig (>= 0.21-1), 
x11-dev, xft2-dev
 <<
 Conflicts: poppler1
 Replaces: poppler1
 BuildDependsOnly: True
 Source: http://poppler.freedesktop.org/%n-%v.tar.gz
 Source-MD5: c84c1be19f43e4a84872ff08234c1960
-ConfigureParams: --mandir=%p/share/man --disable-cairo-output 
SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler --disable-dependency-tracking --enable-zlib 
--disable-poppler-qt --disable-poppler-qt4 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
-PatchScript: sed '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
+SetCXXFLAGS: -Os
+ConfigureParams: --mandir=%p/share/man --disable-cairo-output 
SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler --disable-dependency-tracking --enable-zlib 
--disable-poppler-qt --disable-poppler-qt4 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 GCC: 3.3
 InstallScript: <<
-  make install DESTDIR=%d
+  make -j1 install DESTDIR=%d
   install -d %i/etc
   install -m 644 xpdfrc.poppler %i/etc/
 <<
@@ -29,7 +35,7 @@
 SplitOff: <<
   Package: %N-shlibs
   Depends: <<
-    expat1-shlibs, fontconfig2-shlibs, freetype219-shlibs,
+    expat1-shlibs, fontconfig2-shlibs (>= 2.3.2-13), freetype219-shlibs,
     glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs (>= 2.10.0-1), 
libgettext3-shlibs, libiconv,
     libjpeg-shlibs, pango1-xft2-ft219-shlibs (>= 1.14.9-1), x11-shlibs
   <<

Index: poppler1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.info,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- poppler1.info       24 Jan 2007 17:04:22 -0000      1.5.2.4
+++ poppler1.info       28 Jan 2007 18:22:20 -0000      1.5.2.5
@@ -1,6 +1,6 @@
 Package: poppler1
 Version: 0.5.4
-Revision: 1023
+Revision: 1024
 Description: PDF rendering library
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -10,9 +10,10 @@
        %N-data (>= %v-%r)
 <<
 BuildDepends: <<
+       atk1 (>= 1.12.3-1),
        cairo (>= 1.2-1),
        expat1,
-       fontconfig2-dev,
+       fontconfig2-dev (>= 2.3.2-13),
        freetype219,
        glib2-dev (>= 2.12.0-1),
        glitz,
@@ -38,10 +39,14 @@
 Source2-MD5: 5c700eb06dda9dafec09cd85225e34d4
 PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
+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
-ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler1 
--disable-dependency-tracking --enable-zlib --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/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+SetCFLAGS: -Os
+SetCXXFLAGS: -Os
+ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler1 
--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
 CompileScript: <<
 #!/bin/sh -ev
 

Index: poppler.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- poppler.patch       1 Jan 2007 17:39:09 -0000       1.2.2.1
+++ poppler.patch       28 Jan 2007 18:22:20 -0000      1.2.2.2
@@ -1,6 +1,6 @@
-diff -ruN -x '*~' poppler-0.5.0/configure poppler-0.5.0.patched/configure
+diff -uNr poppler-0.5.0/configure poppler-0.5.0-new/configure
 --- poppler-0.5.0/configure    2006-01-03 08:47:36.000000000 -0500
-+++ poppler-0.5.0.patched/configure    2006-01-25 20:47:53.000000000 -0500
++++ poppler-0.5.0-new/configure        2007-01-25 10:46:09.000000000 -0500
 @@ -24865,7 +24865,7 @@
  fi
  
@@ -10,9 +10,22 @@
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;
-diff -ruN -x '*~' poppler-0.5.0/xpdfrc.poppler 
poppler-0.5.0.patched/xpdfrc.poppler
+diff -uNr poppler-0.5.0/splash/SplashFTFont.cc 
poppler-0.5.0-new/splash/SplashFTFont.cc
+--- poppler-0.5.0/splash/SplashFTFont.cc       2005-11-20 16:40:28.000000000 
-0500
++++ poppler-0.5.0-new/splash/SplashFTFont.cc   2007-01-25 10:46:37.000000000 
-0500
+@@ -19,7 +19,8 @@
+ 
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#include FT_SIZES_H // needed for FT_New_Size decl
++#include FT_GLYPH_H
+ #include "goo/gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"
+diff -uNr poppler-0.5.0/xpdfrc.poppler poppler-0.5.0-new/xpdfrc.poppler
 --- poppler-0.5.0/xpdfrc.poppler       1969-12-31 19:00:00.000000000 -0500
-+++ poppler-0.5.0.patched/xpdfrc.poppler       2006-01-25 19:43:11.000000000 
-0500
++++ poppler-0.5.0-new/xpdfrc.poppler   2007-01-25 10:46:09.000000000 -0500
 @@ -0,0 +1,91 @@
 +#========================================================================
 +#

Index: gdal.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/gdal.info,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- gdal.info   16 Jan 2007 16:02:51 -0000      1.7.2.1
+++ gdal.info   28 Jan 2007 18:22:20 -0000      1.7.2.2
@@ -1,7 +1,7 @@
 Info2: <<
 Package: gdal
 Version: 1.4.0
-Revision: 1000
+Revision: 1002
 Description: Raster/Vector Geospatial Format Translator
 License: BSD
 Homepage: http://www.gdal.org


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to