cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to poppler-21.12.0.

Browse Source
This commit is contained in:
kili 2021-12-24 10:09:02 +00:00
parent 8e57a7a740
commit 3c494bfb24
7 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/poppler/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.169 2021/11/01 18:33:24 kili Exp $
# $OpenBSD: Makefile,v 1.170 2021/12/24 10:09:02 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.10.0
V= 21.12.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@ -15,8 +15,8 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += poppler 72.0 # 113.0
SHARED_LIBS += poppler-glib 19.9 # 8.21
SHARED_LIBS += poppler 73.0 # 116.0
SHARED_LIBS += poppler-glib 19.10 # 8.22
SHARED_LIBS += poppler-qt5 8.10 # 1.30
SHARED_LIBS += poppler-qt6 1.1 # 3.1
SHARED_LIBS += poppler-cpp 17.0 # 0.9

4
print/poppler/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (poppler-21.10.0.tar.xz) = lktbFikPvsP65XwqW83qSbsHNr11DDo3EcR5lcnvw5Q=
SIZE (poppler-21.10.0.tar.xz) = 1779668
SHA256 (poppler-21.12.0.tar.xz) = rLhAwsHsB9B+U8V8Szof8+PuLYiNROHp8vAarxaBTec=
SIZE (poppler-21.12.0.tar.xz) = 1798780

16
print/poppler/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2021/12/24 10:09:02 kili Exp $
Allow to build against qt-6.0.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -191,7 +191,7 @@ endif()
if (ENABLE_QT6)
SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
- find_package(Qt6 6.1 COMPONENTS Core Gui Widgets Test QUIET)
+ find_package(Qt6 COMPONENTS Core Gui Widgets Test QUIET)
if (NOT (Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND Qt6Test_FOUND))
message("-- Package Qt6Core or Qt6Gui or Qt6Widgets or Qt6Test not found")
set(ENABLE_QT6 OFF)

4
print/poppler/patches/patch-glib_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-glib_CMakeLists_txt,v 1.10 2021/05/19 19:57:03 kili Exp $
$OpenBSD: patch-glib_CMakeLists_txt,v 1.11 2021/12/24 10:09:02 kili Exp $
- Remove hardcoded SOVERSION
@ -9,7 +9,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.21.0 SOVERSION 8)
-set_target_properties(poppler-glib PROPERTIES VERSION 8.22.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}")

4
print/poppler/patches/patch-poppler_Form_cc
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-poppler_Form_cc,v 1.10 2021/11/01 18:33:25 kili Exp $
$OpenBSD: patch-poppler_Form_cc,v 1.11 2021/12/24 10:09:02 kili Exp $
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
@@ -38,6 +38,7 @@
@@ -39,6 +39,7 @@
#include <config.h>
#include <set>

6
print/poppler/patches/patch-poppler_XRef_cc
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.26 2021/09/08 17:50:37 kili Exp $
$OpenBSD: patch-poppler_XRef_cc,v 1.27 2021/12/24 10:09:02 kili Exp $
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
@@ -1075,7 +1075,7 @@ bool XRef::isRefEncrypted(Ref r)
@@ -1076,7 +1076,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
@@ -1083,48 +1083,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
@@ -1084,48 +1084,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
{

6
print/poppler/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.41 2021/11/01 18:33:25 kili Exp $
@comment $OpenBSD: PLIST-main,v 1.42 2021/12/24 10:09:02 kili Exp $
@conflict poppler-qt-<0.5.4p0
@pkgpath print/poppler
include/poppler/
@ -20,6 +20,8 @@ include/poppler/Decrypt.h
include/poppler/Dict.h
include/poppler/Error.h
include/poppler/ErrorCodes.h
include/poppler/FDPDFDocBuilder.h
include/poppler/FILECacheLoader.h
include/poppler/FileSpec.h
include/poppler/FontEncodingTables.h
include/poppler/FontInfo.h
@ -63,8 +65,6 @@ include/poppler/Rendition.h
include/poppler/SecurityHandler.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
include/poppler/StdinCachedFile.h
include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/StructElement.h