Matthias Kilian <k...@outback.escape.de> writes: > Hi, > > this updates poppler to 21.03.0. Tested on amd64. If noone complains or > wants me to wait longer, I'll commit this (together with a fix for > scribus) on wednesday.
This looks good to me. I'm not sure how to decide which SHARED_LIBS should be bumped. Do we have some tools for helping notice when a bump is needed or just follow the upstream bumps? Somehow I managed to not have touched a single port that needed an bump of this kind. Thanks Greg > > Ciao, > Kili > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/print/poppler/Makefile,v > retrieving revision 1.164 > diff -u -p -r1.164 Makefile > --- Makefile 7 Dec 2020 21:31:24 -0000 1.164 > +++ Makefile 7 Mar 2021 17:54:35 -0000 > @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library > COMMENT-qt5= Qt5 interface to PDF rendering library > COMMENT-utils= PDF conversion tools and utilities > > -V= 20.12.0 > +V= 21.03.0 > DISTNAME= poppler-$V > CATEGORIES= print > PKGNAME-main= poppler-$V > @@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V > > EXTRACT_SUFX= .tar.xz > > -SHARED_LIBS += poppler 68.0 # 105.0 > +SHARED_LIBS += poppler 69.0 # 108.0 > SHARED_LIBS += poppler-glib 19.8 # 8.19 > -SHARED_LIBS += poppler-qt5 8.6 # 1.26 > +SHARED_LIBS += poppler-qt5 8.7 # 1.27 > SHARED_LIBS += poppler-cpp 16.2 # 0.9 > > HOMEPAGE= https://poppler.freedesktop.org/ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/print/poppler/distinfo,v > retrieving revision 1.88 > diff -u -p -r1.88 distinfo > --- distinfo 7 Dec 2020 21:31:24 -0000 1.88 > +++ distinfo 7 Mar 2021 17:54:35 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (poppler-20.12.0.tar.xz) = > o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ= > -SIZE (poppler-20.12.0.tar.xz) = 1659844 > +SHA256 (poppler-21.03.0.tar.xz) = > /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc= > +SIZE (poppler-21.03.0.tar.xz) = 1690848 > Index: patches/patch-poppler_Form_cc > =================================================================== > RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-poppler_Form_cc > --- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 -0000 1.7 > +++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -0000 > @@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20 > Index: poppler/Form.cc > --- poppler/Form.cc.orig > +++ poppler/Form.cc > -@@ -34,6 +34,7 @@ > +@@ -36,6 +36,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.24 > diff -u -p -r1.24 patch-poppler_XRef_cc > --- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 -0000 1.24 > +++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -0000 > @@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2 > Index: poppler/XRef.cc > --- poppler/XRef.cc.orig > +++ poppler/XRef.cc > -@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r) > +@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r) > > bool XRef::okToPrint(bool ignoreOwnerPW) const > { > @@ -11,7 +11,7 @@ Index: poppler/XRef.cc > } > > // we can print at high res if we are only doing security handler revision > -@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const > +@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const > // 3 and we are allowed to print, and bit 12 is set. > bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const > { > Index: patches/patch-qt5_src_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt > --- patches/patch-qt5_src_CMakeLists_txt 7 Dec 2020 21:31:24 -0000 > 1.3 > +++ patches/patch-qt5_src_CMakeLists_txt 7 Mar 2021 17:54:35 -0000 > @@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v > Index: qt5/src/CMakeLists.txt > --- qt5/src/CMakeLists.txt.orig > +++ qt5/src/CMakeLists.txt > -@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS > +@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS > poppler-version.cpp > ) > add_library(poppler-qt5 ${poppler_qt5_SRCS}) > --set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1) > +-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1) > if(MINGW AND BUILD_SHARED_LIBS) > get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION) > set_target_properties(poppler-qt5 PROPERTIES SUFFIX > "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") > Index: patches/patch-utils_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-utils_CMakeLists_txt > --- patches/patch-utils_CMakeLists_txt 9 Sep 2020 20:16:44 -0000 > 1.4 > +++ patches/patch-utils_CMakeLists_txt 7 Mar 2021 17:54:35 -0000 > @@ -6,7 +6,7 @@ up any already installed older version o > Index: utils/CMakeLists.txt > --- utils/CMakeLists.txt.orig > +++ utils/CMakeLists.txt > -@@ -38,7 +38,7 @@ if (HAVE_CAIRO) > +@@ -39,7 +39,7 @@ if (HAVE_CAIRO) > ) > add_definitions(${CAIRO_CFLAGS}) > add_executable(pdftocairo ${pdftocairo_SOURCES})
