On Sun, Nov 13, 2011 at 07:38:49PM +0100, Marc Espie wrote:
> Well, I'll have a look and see if they really dropped poppler-qt3 for a real
> reason rather than "hey it's old, let's switch to the shiny new shit"...
> as soon as kili gives me his work...
Thanks for *your* work on it ;-)
Here's the current diff to poppler. Diffs for unbreaking four
existing ports (graphics/gimp/stable, print/apvlv, textproc/calibre,
print/texlive/base) will follow.
I did *not* yet test wether it breaks libreoffice or not, nor did
I any exhaustive tests of functionality. So please test if you're
using any of the ports depending on poppler.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 12 Nov 2011 10:50:53 -0000 1.56
+++ Makefile 16 Nov 2011 19:12:41 -0000
@@ -4,22 +4,20 @@ COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
-V= 0.16.7
+V= 0.18.1
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
FULLPKGNAME-qt= poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V
+OLDSHIT = poppler-0.16.7
-REVISION-main= 2
-REVISION-qt = 0
-REVISION-qt4 = 1
-
-SHARED_LIBS += poppler 10.0
-SHARED_LIBS += poppler-cpp 0.0
-SHARED_LIBS += poppler-glib 8.0
+SHARED_LIBS += poppler 11.0
+SHARED_LIBS += poppler-cpp 1.0
+SHARED_LIBS += poppler-glib 9.0
SHARED_LIBS += poppler-qt 8.0
-SHARED_LIBS += poppler-qt4 7.0
+SHARED_LIBS += poppler-qt4 8.0
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
HOMEPAGE= http://poppler.freedesktop.org/
@@ -43,8 +41,7 @@ MULTI_PACKAGES=-main -qt -qt4
.include <bsd.port.arch.mk>
-cWANTLIB= expat freetype fontconfig jpeg m z stdc++
-
+cWANTLIB= expat freetype fontconfig jpeg m tiff z stdc++
.if ${BUILD_PACKAGES:M-qt}
MODULES+= x11/qt3
@@ -52,6 +49,7 @@ MODULES+= x11/qt3
CONFIGURE_ARGS+= --disable-poppler-qt
.endif
+
.if ${BUILD_PACKAGES:M-qt4}
MODULES+= x11/qt4
.else
@@ -73,30 +71,38 @@ MODULES+= devel/gettext converters/libic
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
x11/gtk+2 \
+ devel/libffi \
+ graphics/cairo \
graphics/lcms \
graphics/openjpeg \
- textproc/libxml
+ graphics/png \
+ graphics/tiff
+
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
- print/poppler
+ print/poppler \
+ graphics/png \
+ graphics/tiff
+
LIB_DEPENDS-qt4=x11/qt4 \
${MODGETTEXT_LIB_DEPENDS} \
print/poppler
-WANTLIB-main= ${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr c ffi
gio-2.0 \
- glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 xml2 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 gdk_pixbuf-2.0 openjpeg \
- X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo pcre png \
- pthread pthread-stubs xcb xcb-render gdk-x11-2.0 lcms GL
Xxf86vm \
+WANTLIB-main= ${cWANTLIB} Xext Xfixes c ffi \
+ glib-2.0 gobject-2.0 gthread-2.0 \
+ pixman-1 openjpeg \
+ X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
+ pthread pthread-stubs xcb xcb-render lcms GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
WANTLIB-qt= ${cWANTLIB} lcms openjpeg xml2 poppler png ${MODQT3_WANTLIB} \
${MODLIBICONV_WANTLIB}
-WANTLIB-qt4= ${cWANTLIB} ICE QtCore QtGui QtXml SM X11 Xau Xdmcp Xext Xi \
- Xinerama Xrender ffi glib-2.0 gobject-2.0 gthread-2.0 lcms \
- openjpeg pcre png poppler pthread-stubs xcb xml2 \
- QtCore QtGui QtXml ${MODGETTEXT_WANTLIB}
+WANTLIB-qt4= ${cWANTLIB} ICE QtCore QtGui QtXml SM X11 Xext Xi \
+ Xinerama Xrender lcms \
+ openjpeg png poppler \
+ QtCore QtGui QtXml
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=gnu autoconf
+AUTOCONF_VERSION=2.68
CONFIGURE_ARGS+= --enable-xpdf-headers \
--enable-poppler-cpp \
--enable-utils \
@@ -107,5 +113,14 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
USE_LIBTOOL= Yes
USE_GMAKE= Yes
+
+post-extract:
+ cd ${WRKDIST} && \
+ for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
+ poppler-qt.pc.in; do \
+ ln -sf ../${OLDSHIT}/$$i $$i; \
+ done; \
+ ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
+ cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 7 Jul 2011 15:30:49 -0000 1.17
+++ distinfo 16 Nov 2011 19:12:41 -0000
@@ -1,5 +1,10 @@
MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
+MD5 (poppler-0.18.1.tar.gz) = 0w6IOidCPJNu8zjOHZZ+LQ==
RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
+RMD160 (poppler-0.18.1.tar.gz) = YslGGzRVk3xqvQdpAjPbwqsp2ws=
SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
+SHA1 (poppler-0.18.1.tar.gz) = AiSQfj7FLNwlyV3MRaCfAgIYB34=
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
+SHA256 (poppler-0.18.1.tar.gz) = 0CRUCl/+OGI1GgrKSlMEwU/fOwcdOsOEJFAjohX6qKM=
SIZE (poppler-0.16.7.tar.gz) = 1952179
+SIZE (poppler-0.18.1.tar.gz) = 1949210
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 16 Nov 2011 19:12:41 -0000
@@ -0,0 +1,56 @@
+$OpenBSD$
+--- Makefile.in.orig Wed Oct 26 14:40:05 2011
++++ Makefile.in Wed Nov 16 17:20:00 2011
+@@ -273,6 +273,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+ POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
+ POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
+ POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
++POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
++POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
+ POPPLER_VERSION = @POPPLER_VERSION@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -328,6 +330,8 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++libqt3_CFLAGS = @libqt3_CFLAGS@
++libqt3_LIBS = @libqt3_LIBS@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+@@ -353,12 +357,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ @BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
+ @BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
+ @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
++@BUILD_POPPLER_QT_TRUE@qt_subdir = qt
++@BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+ @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
+ @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
+ @BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
+ @BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
+ @BUILD_UTILS_TRUE@utils_subdir = utils
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(qt4_subdir) $(cpp_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
$(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
+
+ # Add CMake buildsystem files here so they get added on make dist
+ EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
+@@ -396,6 +402,7 @@ pkgconfig_DATA = \
+ $(cairo_pc_file) \
+ $(splash_pc_file) \
+ $(glib_pc_file) \
++ $(qt_pc_file) \
+ $(qt4_pc_file) \
+ $(cpp_pc_file)
+
+@@ -469,6 +476,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+ poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
++poppler-qt.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt.pc.in
++ cd $(top_builddir) && $(SHELL) ./config.status $@
++poppler-qt-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-qt-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ poppler-qt4.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt4.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
Index: patches/patch-aclocal_m4
===================================================================
RCS file: patches/patch-aclocal_m4
diff -N patches/patch-aclocal_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-aclocal_m4 16 Nov 2011 19:12:41 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- aclocal.m4.orig Wed Nov 16 17:26:14 2011
++++ aclocal.m4 Wed Nov 16 17:26:30 2011
+@@ -2153,6 +2153,7 @@ m4_include([m4/define-dir.m4])
+ m4_include([m4/gtk-doc.m4])
+ m4_include([m4/iconv.m4])
+ m4_include([m4/introspection.m4])
++m4_include([m4/qt.m4])
+ m4_include([m4/libjpeg.m4])
+ m4_include([m4/libtool.m4])
+ m4_include([m4/ltoptions.m4])
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 4 Jun 2011 19:03:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2011/06/04 19:03:19 kili Exp $
---- configure.orig Mon Mar 28 23:33:11 2011
-+++ configure Mon Apr 25 13:00:42 2011
-@@ -21731,7 +21731,7 @@ fi
- if test x$enable_poppler_qt4 = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
- $as_echo_n "checking for Qt4 moc... " >&6; }
-- MOCQT4=`which moc`
-+ MOCQT4=`which moc4`
- mocversion=`$MOCQT4 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 4"`
- if test x"$mocversiongrep" != x"$mocversion"; then
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 16 Nov 2011 19:12:41 -0000
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- configure.ac.orig Wed Oct 26 14:34:22 2011
++++ configure.ac Wed Nov 16 18:07:32 2011
+@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+
+ GLIB_REQUIRED=2.18
++ AC_SUBST(GLIB_REQUIRED)
+ AC_ARG_ENABLE(poppler-glib,
+ AC_HELP_STRING([--disable-poppler-glib],
+ [Don't compile poppler glib wrapper.]),
+@@ -443,6 +444,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+
+ GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+
++AC_ARG_ENABLE(poppler-qt,
++ AC_HELP_STRING([--disable-poppler-qt],
++ [Don't compile poppler qt wrapper.]),
++ enable_poppler_qt=$enableval,
++ enable_poppler_qt="try")
++
++if test x$enable_poppler_qt = xyes; then
++ POPPLER_FIND_QT(POPPLER_QT,,)
++elif test x$enable_poppler_qt = xtry; then
++ POPPLER_FIND_QT(POPPLER_QT,
++ [enable_poppler_qt="yes"],
++ [enable_poppler_qt="no"])
++fi
++AC_SUBST(POPPLER_QT_CXXFLAGS)
++AC_SUBST(POPPLER_QT_LIBS)
++
++AM_CONDITIONAL(BUILD_POPPLER_QT, test "x$enable_poppler_qt" = "xyes")
++
+ dnl
+ dnl Try Qt4
+ dnl
+@@ -476,7 +495,7 @@ AC_SUBST(POPPLER_QT4_TEST_LIBS)
+
+ if test x$enable_poppler_qt4 = xyes; then
+ AC_MSG_CHECKING([for Qt4 moc])
+- MOCQT4=`which moc`
++ MOCQT4=`which moc4`
+ mocversion=`$MOCQT4 -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 4"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+@@ -605,6 +624,9 @@ glib/reference/Makefile
+ glib/reference/version.xml
+ glib/demo/Makefile
+ test/Makefile
++poppler-qt.pc
++poppler-qt-uninstalled.pc
++qt/Makefile
+ qt4/Makefile
+ qt4/src/Makefile
+ qt4/tests/Makefile
+@@ -631,6 +653,7 @@ echo "Building poppler with support for:"
+ echo " font configuration: $with_font_configuration"
+ echo " splash output: $enable_splash_output"
+ echo " cairo output: $enable_cairo_output"
++echo " qt wrapper: $enable_poppler_qt"
+ echo " qt4 wrapper: $enable_poppler_qt4"
+ echo " glib wrapper: $enable_poppler_glib"
+ echo " introspection: $found_introspection"
Index: patches/patch-poppler-glib_pc_in
===================================================================
RCS file: patches/patch-poppler-glib_pc_in
diff -N patches/patch-poppler-glib_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-poppler-glib_pc_in 16 Nov 2011 19:12:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- poppler-glib.pc.in.orig Mon Oct 17 13:42:29 2011
++++ poppler-glib.pc.in Tue Nov 15 17:44:13 2011
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >=
$CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >=
@CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+
+ Libs: -L${libdir} -lpoppler-glib
Index: patches/patch-qt_poppler-page_cc
===================================================================
RCS file: patches/patch-qt_poppler-page_cc
diff -N patches/patch-qt_poppler-page_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt_poppler-page_cc 16 Nov 2011 19:12:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qt/poppler-page.cc.orig Wed Nov 16 17:58:07 2011
++++ qt/poppler-page.cc Wed Nov 16 18:10:35 2011
+@@ -239,7 +239,7 @@ QValueList<Link*> Page::links() const
+ Links *xpdfLinks = data->doc->data->doc.getLinks(data->index + 1);
+ for (int i = 0; i < xpdfLinks->getNumLinks(); ++i)
+ {
+- ::Link *xpdfLink = xpdfLinks->getLink(i);
++ ::AnnotLink *xpdfLink = xpdfLinks->getLink(i);
+
+ double left, top, right, bottom;
+ int leftAux, topAux, rightAux, bottomAux;
Index: pkg/PFRAG.GCC4-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PFRAG.GCC4-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.GCC4-main
--- pkg/PFRAG.GCC4-main 8 Jul 2011 17:41:46 -0000 1.1
+++ pkg/PFRAG.GCC4-main 16 Nov 2011 19:12:41 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.GCC4-main,v 1.1 2011/07/08 17:41:46 jasper Exp $
lib/girepository-1.0/
-lib/girepository-1.0/Poppler-0.16.typelib
+lib/girepository-1.0/Poppler-0.18.typelib
share/gir-1.0/
-share/gir-1.0/Poppler-0.16.gir
+share/gir-1.0/Poppler-0.18.gir
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 12 Nov 2011 10:50:54 -0000 1.11
+++ pkg/PLIST-main 16 Nov 2011 19:12:41 -0000
@@ -6,11 +6,13 @@
@comment @bin bin/pdffonts
@comment @bin bin/pdfimages
@comment @bin bin/pdfinfo
-@bin bin/pdftoabw
+@bin bin/pdfseparate
+@bin bin/pdftocairo
@bin bin/pdftohtml
@comment @bin bin/pdftoppm
@comment @bin bin/pdftops
@comment @bin bin/pdftotext
+@bin bin/pdfunite
@comment @bin bin/poppler-glib-demo
include/poppler/
include/poppler/Annot.h
@@ -80,6 +82,7 @@ include/poppler/UnicodeDecompTables.h
include/poppler/UnicodeMap.h
include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
+include/poppler/ViewerPreferences.h
include/poppler/XRef.h
include/poppler/XpdfPluginAPI.h
include/poppler/cpp/
@@ -125,6 +128,7 @@ include/poppler/goo/GooTimer.h
include/poppler/goo/ImgWriter.h
include/poppler/goo/JpegWriter.h
include/poppler/goo/PNGWriter.h
+include/poppler/goo/TiffWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
include/poppler/goo/gstrtod.h
@@ -169,10 +173,13 @@ lib/pkgconfig/poppler.pc
@comment @man man/man1/pdffonts.1
@comment @man man/man1/pdfimages.1
@comment @man man/man1/pdfinfo.1
+@man man/man1/pdfseparate.1
+@man man/man1/pdftocairo.1
@man man/man1/pdftohtml.1
@comment @man man/man1/pdftoppm.1
@comment @man man/man1/pdftops.1
@comment @man man/man1/pdftotext.1
+@man man/man1/pdfunite.1
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/poppler/
@@ -198,7 +205,6 @@ share/gtk-doc/html/poppler/left.png
share/gtk-doc/html/poppler/poppler-PopplerAction.html
share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
share/gtk-doc/html/poppler/poppler-poppler.html
-share/gtk-doc/html/poppler/poppler.devhelp
share/gtk-doc/html/poppler/poppler.devhelp2
share/gtk-doc/html/poppler/right.png
share/gtk-doc/html/poppler/style.css
