Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv13780/unstable/main/finkinfo/libs
Added Files:
poppler-shlibs.info poppler-shlibs.patch
Removed Files:
poppler.info poppler.patch
Log Message:
shuffle .info layout to put -shlibs as main package
--- poppler.info DELETED ---
--- NEW FILE: poppler-shlibs.patch ---
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-new/configure 2007-01-25 10:46:09.000000000 -0500
@@ -24865,7 +24865,7 @@
fi
-jpeg_incdirs="$includedir /usr/include /usr/local/include "
+jpeg_incdirs="$includedir /usr/include /usr/local/include @PREFIX@/include"
jpeg_incdir=NO
for i in $jpeg_incdirs;
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-new/xpdfrc.poppler 2007-01-25 10:46:09.000000000 -0500
@@ -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)'"
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"
--- poppler.patch DELETED ---
--- NEW FILE: poppler-shlibs.info ---
Package: poppler-shlibs
Version: 0.5.0
Revision: 1127
Description: PDF rendering library
License: GPL
Maintainer: None <[email protected]>
Depends: <<
cairo-shlibs (>= 1.8.8-3),
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
glib2-shlibs (>= 2.22.0-1),
gtk+2-shlibs (>= 2.18.0-1),
libgettext8-shlibs,
libjpeg8-shlibs,
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
x11-shlibs
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.8.8-3),
fink (>= 0.24.12),
fink-package-precedence,
fontconfig2-dev (>= 2.8.0-4),
freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.22.0-1),
glitz,
gtk+2-dev (>= 2.18.0-1),
libgettext8-dev,
libiconv-dev,
libjpeg8,
pango1-xft2-ft219-dev (>= 1.24.5-4),
pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
x11-dev
<<
Replaces: poppler (<< %v-%r)
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: c84c1be19f43e4a84872ff08234c1960
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
SetCFLAGS: -Os
SetCXXFLAGS: -Os
ConfigureParams: --mandir=%p/share/man --disable-cairo-output
SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler --enable-dependency-tracking --enable-zlib
--disable-poppler-qt --disable-poppler-qt4
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig --disable-static
PatchFile: %n.patch
PatchFile-MD5: 4c3b7091749506c9ad6e977be21ffe39
PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
GCC: 4.0
CompileScript: <<
%{default_script}
fink-package-precedence --prohibit-bdep=poppler .
<<
InstallScript: <<
make -j1 install DESTDIR=%d
install -d %i/etc
install -m 644 xpdfrc.poppler %i/etc/
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Shlibs: <<
%p/lib/libpoppler.0.dylib 1.0.0 poppler-shlibs (>= 0.5.0-1125)
%p/lib/libpoppler-glib.0.dylib 1.0.0 poppler-shlibs (>= 0.5.0-1125)
<<
SplitOff: <<
Package: poppler
Depends: poppler-shlibs (= %v-%r)
Conflicts: poppler1, poppler2, poppler4
Replaces: poppler1, poppler2, poppler4
BuildDependsOnly: True
Files: <<
include
lib/libpoppler.{la,dylib}
lib/libpoppler-glib.{la,dylib}
lib/pkgconfig
share/gtk-doc
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
<<
SplitOff2: <<
Package: poppler-bin
Depends: <<
poppler-shlibs (>= %v-%r),
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
libjpeg8-shlibs
<<
Files: bin share/man
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
Conflicts: xpdf
Replaces: poppler (<< %v-%r), xpdf
<<
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.poppler to avoid
a conflict with xpdf. Cairo output is disabled because it makes poppler
crash.
Patched Makefile.in to get freetype linker flags. See:
https://bugs.freedesktop.org/show_bug.cgi?id=4154
<<
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
