Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19409
Modified Files:
poppler2-qt3.info poppler4-glib.info poppler4-qt4.info
poppler4.info poppler4.patch
Removed Files:
poppler2-qt3.patch
Log Message:
new %v poppler2-qt3 (latest for which qt3 bindings exist) but it's part of the
poppler4 main lib suite. Also, break the useless .pc:Requires internal lib
Index: poppler4-glib.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler4-glib.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- poppler4-glib.info 18 Mar 2013 10:24:22 -0000 1.7
+++ poppler4-glib.info 18 Mar 2013 11:15:25 -0000 1.8
@@ -43,7 +43,7 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: ba120e49a82567d85d00e159011ebe67
PatchFile: poppler4.patch
-PatchFile-MD5: 825c748f61b052467a1a1dc9645e48c3
+PatchFile-MD5: a8c4d9c56e9272956853e637d178ddbd
SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
ConfigureParams: <<
Index: poppler4-qt4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler4-qt4.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- poppler4-qt4.info 18 Mar 2013 10:24:22 -0000 1.6
+++ poppler4-qt4.info 18 Mar 2013 11:15:25 -0000 1.7
@@ -47,7 +47,7 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: ba120e49a82567d85d00e159011ebe67
PatchFile: poppler4.patch
-PatchFile-MD5: 825c748f61b052467a1a1dc9645e48c3
+PatchFile-MD5: a8c4d9c56e9272956853e637d178ddbd
CompileScript: <<
#!/bin/sh -ev
Index: poppler2-qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler2-qt3.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- poppler2-qt3.info 18 Mar 2013 10:23:22 -0000 1.6
+++ poppler2-qt3.info 18 Mar 2013 11:15:25 -0000 1.7
@@ -1,20 +1,25 @@
Package: poppler2-qt3
-# NOTE: Must keep %v in sync among all poppler2* packages!
-Version: 0.6.4
-Revision: 2
+# NOTE: Must keep %v in sync with poppler4* packages!
+Version: 0.10.7
+Revision: 1
Description: PDF rendering library (Qt Interface)
License: GPL
Maintainer: Benjamin Reed <poppler2-...@fink.racoonfink.com>
-Depends: %N-shlibs (>= %v-%r)
+Depends: <<
+ %N-shlibs (>= %v-%r)
+<<
BuildDepends: <<
+ cairo (>= 1.12.8-1),
fink (>= 0.28.0-1),
fink-package-precedence,
fontconfig2-dev (>= 2.10.0-1),
freetype219 (>= 2.4.11-1),
libjpeg8,
+ libopenjpeg,
+ libxml2,
pkgconfig (>= 0.23),
- poppler2 (>= %v-1),
+ poppler4 (>= %v-1),
qt3 (>= 3.3.8-1021),
x11-dev
<<
@@ -24,22 +29,23 @@
GCC: 4.0
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
-PatchFile: %n.patch
-PatchFile-MD5: 930cc8ea85e105834dd9f14d67d7c92e
-PatchScript: <<
- %{default_script}
- perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
-<<
+Source-MD5: ba120e49a82567d85d00e159011ebe67
+PatchFile: poppler4.patch
+PatchFile-MD5: a8c4d9c56e9272956853e637d178ddbd
SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
ConfigureParams: <<
--mandir=%p/share/man \
- SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 \
--enable-dependency-tracking \
+ --disable-static \
--enable-zlib \
+ --enable-libopenjpeg \
+ --enable-cairo-output \
--disable-poppler-glib \
- --disable-poppler-qt4
+ --disable-gdk \
+ --disable-gtk-test \
+ --disable-poppler-qt4 \
+ --disable-splash-output
<<
CompileScript: <<
#!/bin/sh -ev
@@ -47,7 +53,6 @@
unset QTDIR
export QTINC=%p/lib/qt3/include
export QTLIB=%p/lib/qt3/lib
- export jpeg_incdir="%p/include"
./configure %c
pushd qt
make
@@ -69,9 +74,10 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- poppler2-shlibs (>= %v-1),
fontconfig2-shlibs (>= 2.10.0-1),
freetype219-shlibs (>= 2.4.11-1),
+ libopenjpeg-shlibs,
+ poppler4-shlibs (>= %v-1),
qt3-shlibs (>= 3.3.8-1021)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
@@ -85,4 +91,7 @@
This is the Qt3 bindings/wrapper-library for Poppler.
<<
-
+DescPackaging: <<
+ dmacks: cairo back-end is not exposed at link-time, so no need
+ to .pc:Requires:cairo.
+<<
Index: poppler4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler4.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- poppler4.patch 18 Mar 2013 10:24:22 -0000 1.6
+++ poppler4.patch 18 Mar 2013 11:15:25 -0000 1.7
@@ -9,6 +9,51 @@
+@@ -23889,7 +23890,7 @@
+
+ qt_test_include="qstyle.h"
+ qt_test_la_library="libqt-mt.la"
+-qt_test_library="libqt-mt.so"
++qt_test_library="libqt-mt.dylib"
+
+ { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5
+ $as_echo_n "checking for Qt headers... " >&6; }
+@@ -23939,7 +23940,7 @@
+ save_CXXFLAGS=$CXXFLAGS
+ save_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir"
+- LIBS="$LIBS $qt_libdir/$qt_test_library"
++ LIBS="$LIBS -L$qt_libdir -lqt-mt"
+ { $as_echo "$as_me:$LINENO: checking if Qt needs -pthread" >&5
+ $as_echo_n "checking if Qt needs -pthread... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24058,7 +24059,7 @@
+ fi
+
+ POPPLER_QT_CXXFLAGS="-I$qt_incdir"
+- POPPLER_QT_LIBS="$qtpthread $qt_libdir/$qt_test_library"
++ POPPLER_QT_LIBS="$qtpthread -L$qt_libdir -lqt-mt"
+ :
+ else
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+@@ -24140,7 +24141,7 @@
+ save_CXXFLAGS=$CXXFLAGS
+ save_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir"
+- LIBS="$LIBS $qt_libdir/$qt_test_library"
++ LIBS="$LIBS -L$qt_libdir -lqt-mt"
+ { $as_echo "$as_me:$LINENO: checking if Qt needs -pthread" >&5
+ $as_echo_n "checking if Qt needs -pthread... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24259,7 +24260,7 @@
+ fi
+
+ POPPLER_QT_CXXFLAGS="-I$qt_incdir"
+- POPPLER_QT_LIBS="$qtpthread $qt_libdir/$qt_test_library"
++ POPPLER_QT_LIBS="$qtpthread -L$qt_libdir -lqt-mt"
+ enable_poppler_qt="yes"
+ else
+ enable_poppler_qt="no"
@@ -25140,14 +25141,6 @@
-fno-common $CXXFLAGS" ;;
esac
@@ -152,7 +197,7 @@
libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -294,7 +294,7 @@
+@@ -294,17 +294,17 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
@@ -161,7 +206,10 @@
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
-@@ -304,7 +304,7 @@
+
+-libpoppler_qt_la_LDFLAGS = -version-info 2:0:0
++libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
+ test_poppler_qt_SOURCES = \
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
--- poppler2-qt3.patch DELETED ---
Index: poppler4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler4.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- poppler4.info 18 Mar 2013 10:24:22 -0000 1.9
+++ poppler4.info 18 Mar 2013 11:15:25 -0000 1.10
@@ -1,5 +1,6 @@
Package: poppler4
# NOTE: Must keep %v in sync among all poppler4* packages!
+# poppler2-qt3 goes with poppler4
Version: 0.10.7
Revision: 5
Description: PDF rendering library
@@ -42,7 +43,7 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: ba120e49a82567d85d00e159011ebe67
PatchFile: %n.patch
-PatchFile-MD5: 825c748f61b052467a1a1dc9645e48c3
+PatchFile-MD5: a8c4d9c56e9272956853e637d178ddbd
SetCFLAGS: -Os
SetCXXFLAGS: -Os
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
