Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv9326
Modified Files:
poppler2-qt4.info poppler4-qt4.info
Log Message:
upgrade qt4 deps (and general cleanups)
Index: poppler4-qt4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler4-qt4.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- poppler4-qt4.info 5 Jan 2011 22:50:41 -0000 1.7
+++ poppler4-qt4.info 18 May 2011 03:11:17 -0000 1.8
@@ -1,7 +1,7 @@
Info3: <<
Package: poppler4-qt4-%type_pkg[qt]
Version: 0.10.7
-Revision: 3
+Revision: 4
Description: PDF rendering library (Qt4 binding)
Type: qt (x11 mac)
License: GPL
@@ -20,7 +20,7 @@
libxml2,
pkgconfig (>= 0.23),
poppler4 (>= %v-2),
- qt4-%type_pkg[qt] (>= 4.5.1-1),
+ qt4-base-%type_pkg[qt] (>= 4.7.3-1),
(%type_pkg[qt] = x11) x11-dev
<<
Conflicts: <<
@@ -82,11 +82,13 @@
Package: %N-shlibs
Depends: <<
poppler4-shlibs (>= %v-2),
- qt4-%type_pkg[qt]-core-shlibs (>= 4.5.1-1),
- qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.1-1)
+ qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1)
<<
Files: opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.3*.dylib
Shlibs: %p/opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.3.dylib 5.0.0 %n
(>= 0.10.5-2)
+ DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
<<
Homepage: http://poppler.freedesktop.org/
Index: poppler2-qt4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler2-qt4.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- poppler2-qt4.info 21 Aug 2010 22:38:56 -0000 1.6
+++ poppler2-qt4.info 18 May 2011 03:11:17 -0000 1.7
@@ -1,7 +1,7 @@
Info3: <<
Package: poppler2-qt4-%type_pkg[qt]
Version: 0.6.4
-Revision: 5
+Revision: 6
Description: PDF rendering library (Qt4 binding)
Type: qt (x11 mac)
License: GPL
@@ -9,12 +9,16 @@
Depends: %N-shlibs (>= %v-1)
BuildDepends: <<
- cairo,
+ cairo (>= 1.8.8-3),
fink (>= 0.29.7-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
glitz,
kde4-buildenv (>= 4.2.4-2),
+ libxml2,
pkgconfig,
- qt4-%type_pkg[qt] (>= 4.5.1-1),
+ qt4-base-%type_pkg[qt] (>= 4.7.3-1),
poppler2 (>= %v-1)
<<
Conflicts: <<
@@ -50,7 +54,7 @@
./configure \
--prefix=$KDE4_INSTALL_PREFIX \
--mandir=%p/share/man \
- --disable-dependency-tracking --disable-static \
+ --enable-dependency-tracking --disable-static \
--enable-zlib --enable-libopenjpeg --enable-cairo-output \
--disable-poppler-glib --disable-gdk --disable-gtk-test \
--disable-poppler-qt --enable-poppler-qt4 \
@@ -59,6 +63,7 @@
make -j1
popd
make -j1 poppler-qt4.pc
+ fink-package-precedence --prohibit-bdep=%n .
<<
InstallScript: <<
@@ -74,12 +79,15 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- cairo-shlibs,
+ fontconfig2-shlibs (>= 2.8.0-4),
poppler2-shlibs (>= %v-1),
- qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.1-1)
+ qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1)
<<
Files: opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.2*.dylib
Shlibs: %p/opt/kde4/%type_pkg[qt]/lib/libpoppler-qt4.2.dylib 3.0.0 %n
(>= 0.6.4-4)
+ DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
<<
Homepage: http://poppler.freedesktop.org/
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
