Hi,

here's an update to poppler-0.89.0. Survived a bulk build on amd64,
but I coould'nt yet test it (because of flaky internet, and I'm
doing the builds on a remote machine, not at home).

According to check_sym, library bumps are fine.

I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded
SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work
around spurious build failures.

Any tests are appreciated.

Ciao,
        Kil

Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile
--- Makefile    16 May 2020 18:41:15 -0000      1.158
+++ Makefile    14 Jun 2020 22:07:37 -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=             0.88.0
+V=             0.89.0
 DISTNAME=      poppler-$V
 CATEGORIES=    print
 PKGNAME-main=  poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=        poppler-qt5-$V
 
 EXTRACT_SUFX=  .tar.xz
 
-SHARED_LIBS += poppler              63.0     # 99.0
-SHARED_LIBS += poppler-glib         19.5     # 8.16
+SHARED_LIBS += poppler              64.0     # 100.0
+SHARED_LIBS += poppler-glib         19.6     # 8.17
 SHARED_LIBS += poppler-qt5          8.4      # 1.24
-SHARED_LIBS += poppler-cpp          16.1     # 0.8
+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.83
diff -u -p -r1.83 distinfo
--- distinfo    16 May 2020 18:41:15 -0000      1.83
+++ distinfo    14 Jun 2020 22:07:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.88.0.tar.xz) = tEU4BOmlpRnmzu4KyPXvwinjsL9wQZJjwjkSRHTSVsc=
-SIZE (poppler-0.88.0.tar.xz) = 1604348
+SHA256 (poppler-0.89.0.tar.xz) = +6IwNkU3eCzF1DsI1pPvacNlhihjSWg8exJxVqjvm1w=
+SIZE (poppler-0.89.0.tar.xz) = 1612156
Index: patches/patch-glib_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt   17 May 2020 18:29:37 -0000      1.5
+++ patches/patch-glib_CMakeLists_txt   14 Jun 2020 22:07:37 -0000
@@ -9,7 +9,7 @@ Index: glib/CMakeLists.txt
    ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
  )
  add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
--set_target_properties(poppler-glib PROPERTIES VERSION 8.16.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.17.0 SOVERSION 8)
  set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
  set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
  set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
Index: patches/patch-poppler_Form_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc       17 Feb 2020 20:33:00 -0000      1.6
+++ patches/patch-poppler_Form_cc       14 Jun 2020 22:07:37 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.6 20
 Index: poppler/Form.cc
 --- poppler/Form.cc.orig
 +++ poppler/Form.cc
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
  #include <config.h>
  
  #include <set>
Index: patches/patch-qt5_src_CMakeLists_txt
===================================================================
RCS file: patches/patch-qt5_src_CMakeLists_txt
diff -N patches/patch-qt5_src_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt5_src_CMakeLists_txt        14 Jun 2020 22:07:37 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+- Remove hardcoded SOVERSION
+
+Index: qt5/src/CMakeLists.txt
+--- qt5/src/CMakeLists.txt.orig
++++ qt5/src/CMakeLists.txt
+@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+   poppler-version.cpp
+ )
+ add_library(poppler-qt5 ${poppler_qt5_SRCS})
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.24.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: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST-main
--- pkg/PLIST-main      16 May 2020 18:41:15 -0000      1.36
+++ pkg/PLIST-main      14 Jun 2020 22:07:37 -0000
@@ -82,6 +82,7 @@ include/poppler/cpp/
 include/poppler/cpp/poppler-destination.h
 include/poppler/cpp/poppler-document.h
 include/poppler/cpp/poppler-embedded-file.h
+include/poppler/cpp/poppler-font-private.h
 include/poppler/cpp/poppler-font.h
 include/poppler/cpp/poppler-global.h
 include/poppler/cpp/poppler-image.h

Reply via email to