On Fri, Jul 30, 2021 at 11:36:47PM +0200, Matthias Kilian wrote:
> FWIW, I've poppler-21.07.0 in my tree, an update to 21.08.0 will
> probably available in two days. I can disable poppler-qt{5,6} for
> sparc64.
>
> > Note that the NOT_FOR_ARCHS-arm for qt5 looks suspect.
>
> Well, this entry is more than 5 years old. Should I remove it (there
> seems to be a qt5 package available for arm)?
>
> > This builds on qt6, really ?
>
> I don't see a qt6 package for arm on the mirrors.
Maybe something like this?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.167
diff -u -p -r1.167 Makefile
--- Makefile 19 May 2021 19:57:03 -0000 1.167
+++ Makefile 30 Jul 2021 21:39:34 -0000
@@ -5,23 +5,20 @@ COMMENT-qt5= Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 21.05.0
+V= 21.07.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt5= poppler-qt5-$V
PKGNAME-qt6= poppler-qt6-$V
-REVISION-main= 0
-REVISION-qt5= 0
-REVISION-utils= 0
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 70.0 # 110.0
+SHARED_LIBS += poppler 71.0 # 111.0
SHARED_LIBS += poppler-glib 19.9 # 8.21
-SHARED_LIBS += poppler-qt5 8.8 # 1.28
-SHARED_LIBS += poppler-qt6 0.1 # 1.2
+SHARED_LIBS += poppler-qt5 8.9 # 1.29
+SHARED_LIBS += poppler-qt6 1.0 # 2.0
SHARED_LIBS += poppler-cpp 17.0 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
@@ -35,7 +32,8 @@ MASTER_SITES= ${HOMEPAGE}
DEBUG_PACKAGES= ${BUILD_PACKAGES}
-NOT_FOR_ARCHS-qt5 = arm
+NOT_FOR_ARCHS-qt5 = sparc64
+NOT_FOR_ARCHS-qt6 = arm sparc64
MULTI_PACKAGES=-main -qt5 -qt6 -utils
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.90
diff -u -p -r1.90 distinfo
--- distinfo 19 May 2021 19:57:03 -0000 1.90
+++ distinfo 3 Jul 2021 19:30:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.05.0.tar.xz) = 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
-SIZE (poppler-21.05.0.tar.xz) = 1700632
+SHA256 (poppler-21.07.0.tar.xz) = 4mqyn2gGXeTWVi8KPitUNag8qSvlc7maHIGZj6KGpNQ=
+SIZE (poppler-21.07.0.tar.xz) = 1709664
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.25
diff -u -p -r1.25 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 9 Mar 2021 20:33:48 -0000 1.25
+++ patches/patch-poppler_XRef_cc 16 Jun 2021 18:24:32 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.25 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1068,7 +1068,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
-@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1076,48 +1076,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.5
diff -u -p -r1.5 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt 19 May 2021 19:57:03 -0000
1.5
+++ patches/patch-qt5_src_CMakeLists_txt 16 Jun 2021 18:24:32 -0000
@@ -9,7 +9,7 @@ Index: qt5/src/CMakeLists.txt
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.28.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.29.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-qt6_src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt6_src_CMakeLists_txt
--- patches/patch-qt6_src_CMakeLists_txt 19 May 2021 19:57:03 -0000
1.2
+++ patches/patch-qt6_src_CMakeLists_txt 16 Jun 2021 18:24:32 -0000
@@ -9,7 +9,7 @@ Index: qt6/src/CMakeLists.txt
)
add_library(poppler-qt6 ${poppler_qt6_SRCS})
generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt6 PROPERTIES VERSION 1.2.0 SOVERSION 1)
+-set_target_properties(poppler-qt6 PROPERTIES VERSION 2.0.0 SOVERSION 2)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION)
set_target_properties(poppler-qt6 PROPERTIES SUFFIX
"-${POPPLER_QT6_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.5
diff -u -p -r1.5 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 9 Mar 2021 20:33:48 -0000 1.5
+++ patches/patch-utils_CMakeLists_txt 3 Jul 2021 19:30:29 -0000
@@ -6,7 +6,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@ -39,7 +39,7 @@ if (HAVE_CAIRO)
+@@ -37,7 +37,7 @@ if (HAVE_CAIRO)
)
add_definitions(${CAIRO_CFLAGS})
add_executable(pdftocairo ${pdftocairo_SOURCES})
