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

Modified Files:
      Tag: pangocairo-branch
        poppler.patch poppler1.info 
Log Message:
build fixes

Index: poppler1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler1.info,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- poppler1.info       19 Dec 2006 06:13:58 -0000      1.5.2.2
+++ poppler1.info       1 Jan 2007 17:39:09 -0000       1.5.2.3
@@ -17,7 +17,7 @@
 PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 
 SetLIBS: -L%p/lib -lexpat
-ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler1 
--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
+ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler1 
--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/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 InstallScript: <<
        make install DESTDIR=%d

Index: poppler.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- poppler.patch       9 Feb 2006 08:24:04 -0000       1.2
+++ poppler.patch       1 Jan 2007 17:39:09 -0000       1.2.2.1
@@ -105,3 +105,21 @@
 +# clicked.
 +
 +urlCommand    "open 'openURL(%s)'"
+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   2006-12-30 16:43:21.000000000 
-0500
+@@ -19,7 +19,13 @@
+ 
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#if ( FREETYPE_VERSION >= MAKE_VERSION(2,2,0) )
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_SIZES_H
++#else
++#include FT_INTERNAL_OBJECTS_H
++#endif
+ #include "goo/gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"


-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to