From: Matthias Kilian <kili@outback.escape.de>
Subject: Update print/poppler
To: ports@openbsd.org
Date: Sun, 15 Jun 2025 20:59:56 +0200

Hi,

this updates poppler to 25.06.0.

Breakage this time:

print/scribus
graphics/inkscape

I'll send diffs for them in a minute.

Ciao,
	Kili

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.196 Makefile
--- Makefile	14 May 2025 19:28:59 -0000	1.196
+++ Makefile	15 Jun 2025 18:55:55 -0000
@@ -3,7 +3,7 @@ COMMENT-qt5=	Qt5 interface to PDF render
 COMMENT-qt6=	Qt6 interface to PDF rendering library
 COMMENT-utils=	PDF conversion tools and utilities
 
-V=		25.05.0
+V=		25.06.0
 DISTNAME=	poppler-$V
 CATEGORIES=	print
 PKGNAME-main=	poppler-$V
@@ -13,8 +13,8 @@ PKGNAME-qt6=	poppler-qt6-$V
 
 EXTRACT_SUFX=	.tar.xz
 
-SHARED_LIBS +=	poppler              91.0     # 148.0
-SHARED_LIBS +=	poppler-glib         19.15    # 8.29
+SHARED_LIBS +=	poppler              92.0     # 150.0
+SHARED_LIBS +=	poppler-glib         19.16    # 8.30
 SHARED_LIBS +=	poppler-qt5          9.1      # 1.38
 SHARED_LIBS +=	poppler-qt6          2.1      # 3.10
 SHARED_LIBS +=	poppler-cpp          19.1     # 2.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.113 distinfo
--- distinfo	14 May 2025 19:28:59 -0000	1.113
+++ distinfo	15 Jun 2025 18:55:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-25.05.0.tar.xz) = mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=
-SIZE (poppler-25.05.0.tar.xz) = 1959908
+SHA256 (poppler-25.06.0.tar.xz) = gZlTLTiYT6tG29ACDsnEDyDpKOM+m0zGBDVyYDqCHYM=
+SIZE (poppler-25.06.0.tar.xz) = 1967376
Index: patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
diff -u -p -r1.17 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt	21 Feb 2025 20:55:03 -0000	1.17
+++ patches/patch-glib_CMakeLists_txt	15 Jun 2025 18:55:55 -0000
@@ -7,7 +7,7 @@ Index: glib/CMakeLists.txt
  )
  add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
  generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
--set_target_properties(poppler-glib PROPERTIES VERSION 8.29.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.30.0 SOVERSION 8)
  if(MINGW AND BUILD_SHARED_LIBS)
      get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
      set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
diff -u -p -r1.34 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc	23 Mar 2025 22:04:27 -0000	1.34
+++ patches/patch-poppler_XRef_cc	15 Jun 2025 18:55:55 -0000
@@ -1,7 +1,7 @@
 Index: poppler/XRef.cc
 --- poppler/XRef.cc.orig
 +++ poppler/XRef.cc
-@@ -1120,7 +1120,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1126,7 +1126,7 @@ bool XRef::isRefEncrypted(Ref r)
  
  bool XRef::okToPrint(bool ignoreOwnerPW) const
  {
@@ -10,7 +10,7 @@ Index: poppler/XRef.cc
  }
  
  // we can print at high res if we are only doing security handler revision
-@@ -1128,48 +1128,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1134,48 +1134,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
  {