Update to poppler-21.09.0.

This commit is contained in:
kili 2021-09-08 17:50:37 +00:00
parent 79f56cbeff
commit 47fa48783c
7 changed files with 18 additions and 21 deletions

View File

@ -1,27 +1,24 @@
# $OpenBSD: Makefile,v 1.167 2021/05/19 19:57:03 kili Exp $
# $OpenBSD: Makefile,v 1.168 2021/09/08 17:50:37 kili Exp $
COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
V= 21.05.0
V= 21.09.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 # 113.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 # 3.0
SHARED_LIBS += poppler-cpp 17.0 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/

View File

@ -1,2 +1,2 @@
SHA256 (poppler-21.05.0.tar.xz) = 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
SIZE (poppler-21.05.0.tar.xz) = 1700632
SHA256 (poppler-21.09.0.tar.xz) = Wkf+9zjCuZRx+bRZqL+LQK77fu2SyqSGHDeYsuEm0Fs=
SIZE (poppler-21.09.0.tar.xz) = 1722828

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-poppler_Form_cc,v 1.8 2021/03/09 20:33:48 kili Exp $
$OpenBSD: patch-poppler_Form_cc,v 1.9 2021/09/08 17:50:37 kili Exp $
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
@@ -36,6 +36,7 @@
@@ -37,6 +37,7 @@
#include <config.h>
#include <set>

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.25 2021/03/09 20:33:48 kili Exp $
$OpenBSD: patch-poppler_XRef_cc,v 1.26 2021/09/08 17:50:37 kili Exp $
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
@@ -1075,7 +1075,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
@@ -1083,48 +1083,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
{

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-qt5_src_CMakeLists_txt,v 1.5 2021/05/19 19:57:03 kili Exp $
$OpenBSD: patch-qt5_src_CMakeLists_txt,v 1.6 2021/09/08 17:50:37 kili Exp $
- Remove hardcoded SOVERSION
@ -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}")

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-qt6_src_CMakeLists_txt,v 1.2 2021/05/19 19:57:03 kili Exp $
$OpenBSD: patch-qt6_src_CMakeLists_txt,v 1.3 2021/09/08 17:50:37 kili Exp $
- Remove hardcoded SOVERSION
@ -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 3.0.0 SOVERSION 3)
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}")

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-utils_CMakeLists_txt,v 1.5 2021/03/09 20:33:48 kili Exp $
$OpenBSD: patch-utils_CMakeLists_txt,v 1.6 2021/09/08 17:50:37 kili Exp $
For utils/pdftocairo, move common_libs to the front to avoid picking
up any already installed older version of libpoppler.so.
@ -6,7 +6,7 @@ up any already installed older version of libpoppler.so.
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})