Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4372
Modified Files:
poppler34-shlibs.info poppler34-shlibs.patch
poppler8-glib-shlibs.info
Log Message:
more dep cleanups, linking fixes, etc.
Index: poppler34-shlibs.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/poppler34-shlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler34-shlibs.patch 22 Feb 2013 14:50:50 -0000 1.2
+++ poppler34-shlibs.patch 4 Mar 2013 13:59:42 -0000 1.3
@@ -9,28 +9,41 @@
+@@ -23953,14 +23954,6 @@
+ -fno-common $CXXFLAGS" ;;
+ esac
+
+-case `$PKG_CONFIG --version` in
+- 0.?|0.10-7)
+- PC_REQUIRES_PRIVATE="";
+- PC_REQUIRES="poppler = $VERSION";;
+- *)
+- PC_REQUIRES_PRIVATE="Requires.private: poppler = $VERSION";
+- PC_REQUIRES="";;
+-esac
+
+
+
diff -Nurd -x'*~' poppler-0.22.1.orig/glib/Makefile.in
poppler-0.22.1/glib/Makefile.in
--- poppler-0.22.1.orig/glib/Makefile.in 2013-02-10 05:48:37.000000000
-0500
+++ poppler-0.22.1/glib/Makefile.in 2013-02-22 01:42:38.000000000 -0500
-@@ -107,8 +107,6 @@
+@@ -107,7 +107,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_glib_la_DEPENDENCIES = \
- $(top_builddir)/poppler/libpoppler.la \
-- $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 = poppler-enums.lo
- am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
-@@ -475,8 +473,7 @@
+@@ -475,7 +474,7 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-- $(top_builddir)/poppler/libpoppler-cairo.la \
+ -lpoppler \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS)
-
diff -Nurd -x'*~' poppler-0.22.1.orig/glib/demo/Makefile.in
poppler-0.22.1/glib/demo/Makefile.in
--- poppler-0.22.1.orig/glib/demo/Makefile.in 2013-02-10 05:48:37.000000000
-0500
+++ poppler-0.22.1/glib/demo/Makefile.in 2013-02-22 01:40:28.000000000
-0500
@@ -73,17 +86,6 @@
Version: @VERSION@
-Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@
+Requires: poppler = @VERSION@
-diff -Nurd -x'*~' poppler-0.22.1.orig/poppler-cpp.pc.in
poppler-0.22.1/poppler-cpp.pc.in
---- poppler-0.22.1.orig/poppler-cpp.pc.in 2012-12-30 17:43:26.000000000
-0500
-+++ poppler-0.22.1/poppler-cpp.pc.in 2013-02-22 01:49:38.000000000 -0500
-@@ -7,7 +7,6 @@
- Description: cpp backend for Poppler PDF rendering library
- Version: @VERSION@
- Requires: @PC_REQUIRES@
--@PC_REQUIRES_PRIVATE@
-
- Libs: -L${libdir} -lpoppler-cpp
- Cflags: -I${includedir}/poppler/cpp
diff -Nurd -x'*~' poppler-0.22.1.orig/qt4/demos/Makefile.in
poppler-0.22.1/qt4/demos/Makefile.in
--- poppler-0.22.1.orig/qt4/demos/Makefile.in 2013-02-10 05:48:38.000000000
-0500
+++ poppler-0.22.1/qt4/demos/Makefile.in 2013-02-22 01:40:28.000000000
-0500
Index: poppler8-glib-shlibs.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/poppler8-glib-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poppler8-glib-shlibs.info 4 Mar 2013 13:58:50 -0000 1.1
+++ poppler8-glib-shlibs.info 4 Mar 2013 13:59:42 -0000 1.2
@@ -9,7 +9,6 @@
Depends: <<
cairo-shlibs (>= 1.12.8-1),
- fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.4.11-1),
glib2-shlibs (>= 0.22.0-1),
poppler34-shlibs (>= %v)
@@ -18,7 +17,7 @@
cairo (>= 1.12.8-1),
fink (>= 0.28.0-1),
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
+ fontconfig2-dev (>= 2.10.0-1),
freetype219 (>= 2.4.11-1),
glib2-dev (>= 2.22.0-1),
gtk-doc (>= 1.13-5),
@@ -28,8 +27,6 @@
libopenjpeg1,
libpng15,
libtiff,
- libxml2,
- pixman (>= 0.28.2-1),
pkgconfig (>= 0.23),
poppler34 (>= %v),
x11-dev
@@ -39,11 +36,8 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 50c259fdda538c1ba94b62aa25f7ec87
PatchFile: poppler34-shlibs.patch
-PatchFile-MD5: 5553b8cce4b5ac12fbb27a5b63ebfaf1
+PatchFile-MD5: 9fd0ebe69634d30340c3523f8739d1ab
-SetCFLAGS: -I%p/include
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
ConfigureParams: <<
--mandir=%p/share/man \
--enable-dependency-tracking \
@@ -57,9 +51,7 @@
--disable-poppler-qt4 \
--disable-splash-output \
--enable-poppler-cpp \
-
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
\
- LIBJPEG_CFLAGS=-I%p/include
-
+ PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
<<
CompileScript: <<
./configure %c
@@ -78,7 +70,7 @@
Shlibs: %p/lib/libpoppler-glib.8.dylib 15.0.0 %n (>= 0.22.1-1)
SplitOff: <<
- Package:poppler8-glib
+ Package: poppler8-glib
Depends: <<
%N (>= %v-%r),
pkgconfig (>= 0.23)
@@ -119,4 +111,7 @@
requires additional gnomish dependencies.
Match --enable/--disable features to the poppler34 package.
+
+dmacks: poppler core not exposed by bindings' public API and libs are
+fully-resolved dynamic-only, so not need .pc:Requires.private:poppler
<<
Index: poppler34-shlibs.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/poppler34-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler34-shlibs.info 22 Feb 2013 17:08:49 -0000 1.3
+++ poppler34-shlibs.info 4 Mar 2013 13:59:42 -0000 1.4
@@ -29,7 +29,6 @@
libopenjpeg1,
libpng15,
libtiff,
- pixman (>= 0.28.2-1),
pkgconfig (>= 0.23),
x11-dev
<<
@@ -38,7 +37,7 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 50c259fdda538c1ba94b62aa25f7ec87
PatchFile: %n.patch
-PatchFile-MD5: a249f369237f81bb593a7f68b4e72ffb
+PatchFile-MD5: 9fd0ebe69634d30340c3523f8739d1ab
SetCFLAGS: -Os
SetCXXFLAGS: -Os
@@ -78,6 +77,7 @@
poppler1,
poppler2,
poppler4,
+ poppler8,
poppler34
<<
Replaces: <<
@@ -85,6 +85,7 @@
poppler1,
poppler2,
poppler4,
+ poppler8,
poppler34
<<
BuildDependsOnly: True
@@ -155,6 +156,6 @@
dmacks: cairo back-end is not exposed at link-time, so no need
to .pc:Requires:cairo.
-dmacks: poppler core not exposed by poppler-cpp public API and lib is
+dmacks: poppler core not exposed by bindings' public API and libs are
fully-resolved dynamic-only, so not need .pc:Requires.private:poppler
<<
------------------------------------------------------------------------------
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_feb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
