2016-07-31 0:24 GMT+03:00 Matthias Kilian <[email protected]>:
> [cc'd zhuk because of the qt5 changes]
>
> Hi,
>
> here's an update to poppler-0.46.0, in case anyone wants do some
> early tests.
>
> In addition to the update, this also simplfies configure.ac patch
> for Qt5. It looks like you can just set MOCQT52 (where the '2' has
> nothing to do with any version of qt) to our moc-qt5 (after fixing
> the grep command in configure.ac). The only difference I can see
> in the build log is that moc-qt5 is now run with an absolute path
> (i.e./usr/local/bin/moc-qt5 instead of qt5).
>
> As usual, I'll build everything depending on poppler and run some
> tests, but this will take some time.
The ac_cv_MOCQT52 in CONFIGURE_ENV isn't needed, the configure script
picks up moc-qt5 from /usr/local/bin, which is correct thing.
Also, I've had a failure with building Qt3 backend; I didn't look in
thoroughly yet, though, so it could be PEBKAC.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.108
> diff -u -p -r1.108 Makefile
> --- Makefile 9 Jul 2016 15:37:46 -0000 1.108
> +++ Makefile 30 Jul 2016 20:58:28 -0000
> @@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.45.0
> +V= 0.46.0
> DISTNAME= poppler-$V
> CATEGORIES= print
> PKGNAME-main= poppler-$V
> @@ -16,14 +16,12 @@ PKGNAME-qt4= poppler-qt4-$V
> PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT = poppler-0.16.7
>
> -REVISION= 0
> -
> -SHARED_LIBS += poppler 39.0 # 62.0
> -SHARED_LIBS += poppler-glib 15.0 # 15.0
> +SHARED_LIBS += poppler 40.0 # 63.0
> +SHARED_LIBS += poppler-glib 16.0 # 16.0
> SHARED_LIBS += poppler-qt 12.0 # 3.0
> -SHARED_LIBS += poppler-qt4 18.0 # 13.0
> -SHARED_LIBS += poppler-qt5 0.0 # 7.0
> -SHARED_LIBS += poppler-cpp 7.0 # 2.1
> +SHARED_LIBS += poppler-qt4 19.0 # 14.0
> +SHARED_LIBS += poppler-qt5 1.0 # 8.0
> +SHARED_LIBS += poppler-cpp 8.0 # 3.0
>
> DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
>
> @@ -130,7 +128,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
> LDFLAGS="-L${LOCALBASE}/lib" \
> LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
> ac_cv_prog_MOCQT4=${MODQT4_MOC} \
> - ac_cv_prog_MOCQT5=${MODQT5_MOC}
> + ac_cv_prog_MOCQT52=${MODQT5_MOC}
>
> USE_GMAKE= Yes
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.55
> diff -u -p -r1.55 distinfo
> --- distinfo 19 Jun 2016 19:42:26 -0000 1.55
> +++ distinfo 30 Jul 2016 20:12:16 -0000
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
> +SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.45.0.tar.xz) = 1674464
> +SIZE (poppler-0.46.0.tar.xz) = 1680940
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
> retrieving revision 1.19
> diff -u -p -r1.19 patch-configure_ac
> --- patches/patch-configure_ac 19 Jun 2016 19:42:26 -0000 1.19
> +++ patches/patch-configure_ac 30 Jul 2016 20:48:58 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-configure_ac,v 1.19 2016/06/19 19:42:26 kili Exp $
> ---- configure.ac.orig Fri Jun 17 00:12:16 2016
> -+++ configure.ac Fri Jun 17 21:01:05 2016
> +--- configure.ac.orig Mon Jul 25 00:03:53 2016
> ++++ configure.ac Sat Jul 30 22:48:42 2016
> @@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
>
> GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
> @@ -26,56 +26,16 @@ $OpenBSD: patch-configure_ac,v 1.19 2016
> dnl
> dnl Try Qt4
> dnl
> -@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
> - AC_CHECK_TOOL(MOCQT5, moc)
> - AC_MSG_CHECKING([for Qt5 moc])
> - mocversion=`$MOCQT5 -v 2>&1`
> -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
> -- if test x"$mocversiongrep" != x"$mocversion"; then
> -+ case $mocversion in
> -+ *Qt\ 5*|*moc\ 5*)
> -+ ;;
> -+ *)
> - AC_MSG_RESULT([no])
> - # moc was not the qt5 one, try with moc-qt5
> +@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then
> AC_CHECK_TOOL(MOCQT52, moc-qt5)
> AC_MSG_CHECKING([for Qt5 moc-qt5])
> mocversion=`$MOCQT52 -v 2>&1`
> - mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
> -- if test x"$mocversiongrep" != x"$mocversion"; then
> -+ case $mocversion in
> -+ *Qt\ 5*|*moc\ 5*|*moc-qt5\ 5*)
> -+ MOCQT5=$MOCQT52
> -+ ;;
> -+ *)
> ++ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
> + if test x"$mocversiongrep" != x"$mocversion"; then
> AC_CHECK_TOOL(QTCHOOSER, qtchooser)
> AC_MSG_CHECKING([for qtchooser])
> - qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut
> -d '=' -f 2 | cut -d \" -f 2`
> - mocversion=`$qt5tooldir/moc -v 2>&1`
> -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
> -- if test x"$mocversiongrep" != x"$mocversion"; then
> -+ case $mocversion in
> -+ *Qt\ 5*|*moc\ 5*)
> -+ MOCQT5=$qt5tooldir/moc
> -+ ;;
> -+ *)
> - # no valid moc found
> - enable_poppler_qt5=no;
> - MOCQT5="not found"
> -- else
> -- MOCQT5=$qt5tooldir/moc
> -- fi
> -- else
> -- MOCQT5=$MOCQT52
> -- fi
> -- fi
> -+ esac
> -+ esac
> -+ esac
> - AC_SUBST(MOCQT5)
> - AC_MSG_RESULT([$MOCQT5])
> - fi
> -@@ -997,6 +1019,9 @@ glib/reference/Makefile
> +@@ -997,6 +1015,9 @@ glib/reference/Makefile
> glib/reference/version.xml
> glib/demo/Makefile
> test/Makefile
> @@ -85,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.19 2016
> qt4/Makefile
> qt4/src/Makefile
> qt4/tests/Makefile
> -@@ -1032,6 +1057,7 @@ if test x$enable_cmyk = xyes;then
> +@@ -1032,6 +1053,7 @@ if test x$enable_cmyk = xyes;then
> echo " with CMYK support"
> fi
> echo " cairo output: $use_cairo"
> Index: patches/patch-poppler_XRef_cc
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
> retrieving revision 1.15
> diff -u -p -r1.15 patch-poppler_XRef_cc
> --- patches/patch-poppler_XRef_cc 1 May 2016 12:33:24 -0000 1.15
> +++ patches/patch-poppler_XRef_cc 30 Jul 2016 20:32:52 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-poppler_XRef_cc,v 1.15 2016/05/01 12:33:24 kili Exp $
> ---- poppler/XRef.cc.orig Thu Apr 28 09:51:41 2016
> -+++ poppler/XRef.cc Fri Apr 29 20:48:29 2016
> -@@ -1087,49 +1087,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
> +--- poppler/XRef.cc.orig Tue Jul 5 23:37:01 2016
> ++++ poppler/XRef.cc Sat Jul 30 22:32:39 2016
> +@@ -1089,49 +1089,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
> }
>
> GBool XRef::okToPrint(GBool ignoreOwnerPW) {
> Index: patches/patch-qt5_src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-qt5_src_Makefile_in
> --- patches/patch-qt5_src_Makefile_in 23 Mar 2016 20:09:34 -0000 1.2
> +++ patches/patch-qt5_src_Makefile_in 30 Jul 2016 20:32:52 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-qt5_src_Makefile_in,v 1.2 2016/03/23 20:09:34 kili Exp $
> Reorder linking to make sure libestdc++ is picked up earlier than libstdc++.
> ---- qt5/src/Makefile.in.orig Wed Mar 16 23:22:13 2016
> -+++ qt5/src/Makefile.in Mon Mar 21 11:04:17 2016
> +--- qt5/src/Makefile.in.orig Mon Jul 25 00:14:30 2016
> ++++ qt5/src/Makefile.in Sat Jul 30 22:32:40 2016
> @@ -520,8 +520,8 @@ libpoppler_qt5_la_CXXFLAGS = \
> -Dpoppler_qt5_EXPORTS
>
> @@ -12,4 +12,4 @@ Reorder linking to make sure libestdc++
> + $(top_builddir)/poppler/libpoppler.la
>
> libpoppler_qt5_la_LDFLAGS = \
> - -version-info 7:0:6 \
> + -version-info 8:0:7 \
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
> retrieving revision 1.26
> diff -u -p -r1.26 PLIST-main
> --- pkg/PLIST-main 9 Jul 2016 15:37:46 -0000 1.26
> +++ pkg/PLIST-main 30 Jul 2016 21:01:09 -0000
> @@ -191,6 +191,7 @@ share/gtk-doc/html/poppler/api-index-0-2
> share/gtk-doc/html/poppler/api-index-0-22.html
> share/gtk-doc/html/poppler/api-index-0-26.html
> share/gtk-doc/html/poppler/api-index-0-33.html
> +share/gtk-doc/html/poppler/api-index-0-46.html
> share/gtk-doc/html/poppler/api-index-deprecated.html
> share/gtk-doc/html/poppler/api-index-full.html
> share/gtk-doc/html/poppler/ch01.html
