Hi,
this updates poppler to 0.77.0.
While here, drop the no_qt5 and bootstrap pseudo flavors.
They are confusing and make it difficult to track down weird problems
with the SOVERSION of the to be installed libpoppler-glib.so happening
sometimes during fake, but only for print/poppler,,-qt5.
Major bump to libpoppler.so, following upstream, allthough
/usr/src/lib/check_sym didn't report any dynamic export changes
(nor for the other shared libs).
I'll also clean up the dependencies to print/poppler,,-qt5 (now with
only one comma) in the following ports:
devel/kf5/kfilemetadata
editors/calligra
editors/kile
editors/ktikz
editors/texworks
emulators/gr-lida
graphics/krita
textproc/calibre
x11/kde-applications/okular
x11/lumina
x11/tellico
Already tested on amd64. If anyone wants do do some own tests, please
let me know. Otherwise, I'll commit the update tomorrow evening.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.142
diff -u -p -r1.142 Makefile
--- Makefile 20 May 2019 22:15:21 -0000 1.142
+++ Makefile 18 Jun 2019 15:30:31 -0000
@@ -4,17 +4,16 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.76.1
+V= 0.77.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt5= poppler-qt5-$V
-REVISION= 1
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 51.0 # 87.0
+SHARED_LIBS += poppler 52.0 # 88.0
SHARED_LIBS += poppler-glib 19.1 # 8.12
SHARED_LIBS += poppler-qt5 7.1 # 1.19
SHARED_LIBS += poppler-cpp 11.0 # 0.7
@@ -28,10 +27,6 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}
-PSEUDO_FLAVORS=no_qt5 bootstrap
-# XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt5 bootstrap
-
NOT_FOR_ARCHS-qt5 = arm
MULTI_PACKAGES=-main -qt5 -utils
@@ -45,11 +40,7 @@ cWANTLIB= expat freetype fontconfig jpeg
MODULES= devel/cmake
-.if ${BUILD_PACKAGES:M-qt5}
MODULES+= x11/qt5
-.else
-CONFIGURE_ARGS+= --disable-poppler-qt5
-.endif
BUILD_DEPENDS+= devel/gobject-introspection
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.72
diff -u -p -r1.72 distinfo
--- distinfo 9 May 2019 11:23:04 -0000 1.72
+++ distinfo 18 Jun 2019 15:30:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.76.1.tar.xz) = 5izUBT+FHuzEpqorgdc5+6sdZ7PGCzHrrHBJSDzGF7E=
-SIZE (poppler-0.76.1.tar.xz) = 1531548
+SHA256 (poppler-0.77.0.tar.xz) = cmfrTLzNZKWCRLghFgPBwba/Msf2pM7SZChlNGEC82s=
+SIZE (poppler-0.77.0.tar.xz) = 1533068
Index: patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 4 Jan 2019 21:05:34 -0000 1.3
+++ patches/patch-poppler_Form_cc 18 Jun 2019 15:30:31 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.3 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -30,6 +30,7 @@
+@@ -32,6 +32,7 @@
#include <config.h>
#include <set>
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.21
diff -u -p -r1.21 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 11 Jan 2019 21:31:52 -0000 1.21
+++ patches/patch-poppler_XRef_cc 18 Jun 2019 15:30:31 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.21 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1015,49 +1015,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
+@@ -1013,49 +1013,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
}
bool XRef::okToPrint(bool ignoreOwnerPW) const {
