Update to poppler-20.09.0.
This commit is contained in:
kili
parent
3b2b9cb34d
commit
f51006bedc
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.160 2020/07/09 18:35:41 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.161 2020/09/09 20:16:44 kili Exp $
|
||||
|
||||
COMMENT-main= PDF rendering library
|
||||
COMMENT-qt5= Qt5 interface to PDF rendering library
|
||||
COMMENT-utils= PDF conversion tools and utilities
|
||||
|
||||
V= 0.90.0
|
||||
V= 20.09.0
|
||||
DISTNAME= poppler-$V
|
||||
CATEGORIES= print
|
||||
PKGNAME-main= poppler-$V
|
||||
@ -13,8 +13,8 @@ PKGNAME-qt5= poppler-qt5-$V
|
||||
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
SHARED_LIBS += poppler 65.0 # 101.0
|
||||
SHARED_LIBS += poppler-glib 19.7 # 8.18
|
||||
SHARED_LIBS += poppler 66.0 # 101.0
|
||||
SHARED_LIBS += poppler-glib 19.8 # 8.19
|
||||
SHARED_LIBS += poppler-qt5 8.5 # 1.25
|
||||
SHARED_LIBS += poppler-cpp 16.2 # 0.9
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (poppler-0.90.0.tar.xz) = lO2wrTMwt00iyqyAeqUB6cxhy/RagBBiVnBCi1GYloU=
|
||||
SIZE (poppler-0.90.0.tar.xz) = 1619960
|
||||
SHA256 (poppler-20.09.0.tar.xz) = TtbrXdxMN/JDXJ14/5x8QDZFWuo1B9HOhAAHCqt0U2M=
|
||||
SIZE (poppler-20.09.0.tar.xz) = 1642932
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-glib_CMakeLists_txt,v 1.7 2020/07/09 18:35:41 kili Exp $
|
||||
$OpenBSD: patch-glib_CMakeLists_txt,v 1.8 2020/09/09 20:16:44 kili Exp $
|
||||
|
||||
- Remove hardcoded SOVERSION
|
||||
|
||||
@ -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.18.0 SOVERSION 8)
|
||||
-set_target_properties(poppler-glib PROPERTIES VERSION 8.19.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)
|
||||
|
||||
@ -1,62 +1,69 @@
|
||||
$OpenBSD: patch-poppler_XRef_cc,v 1.23 2020/03/21 22:42:42 kili Exp $
|
||||
$OpenBSD: patch-poppler_XRef_cc,v 1.24 2020/09/09 20:16:44 kili Exp $
|
||||
Index: poppler/XRef.cc
|
||||
--- poppler/XRef.cc.orig
|
||||
+++ poppler/XRef.cc
|
||||
@@ -1042,49 +1042,38 @@ bool XRef::isRefEncrypted(Ref r)
|
||||
}
|
||||
@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
|
||||
|
||||
bool XRef::okToPrint(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
|
||||
+ return true;
|
||||
bool XRef::okToPrint(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
// we can print at high res if we are only doing security handler revision
|
||||
// 2 (and we are allowed to print at all), or with security handler rev
|
||||
@@ -1052,48 +1052,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 {
|
||||
- if (encrypted) {
|
||||
- if (2 == encRevision) {
|
||||
- return (okToPrint(ignoreOwnerPW));
|
||||
- } else if (encRevision >= 3) {
|
||||
- return (okToPrint(ignoreOwnerPW) && (permFlags & permHighResPrint));
|
||||
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
|
||||
{
|
||||
- if (encrypted) {
|
||||
- if (2 == encRevision) {
|
||||
- return (okToPrint(ignoreOwnerPW));
|
||||
- } else if (encRevision >= 3) {
|
||||
- return (okToPrint(ignoreOwnerPW) && (permFlags & permHighResPrint));
|
||||
- } else {
|
||||
- // something weird - unknown security handler version
|
||||
- return false;
|
||||
- }
|
||||
- } else {
|
||||
- // something weird - unknown security handler version
|
||||
- return false;
|
||||
- return true;
|
||||
- }
|
||||
- } else {
|
||||
- return true;
|
||||
- }
|
||||
+ return true;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToChange(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
|
||||
+ return true;
|
||||
bool XRef::okToChange(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToCopy(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
|
||||
+ return true;
|
||||
bool XRef::okToCopy(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToAddNotes(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
|
||||
+ return true;
|
||||
bool XRef::okToAddNotes(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToFillForm(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permFillForm);
|
||||
+ return true;
|
||||
bool XRef::okToFillForm(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permFillForm);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToAccessibility(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAccessibility);
|
||||
+ return true;
|
||||
bool XRef::okToAccessibility(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAccessibility);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
bool XRef::okToAssemble(bool ignoreOwnerPW) const {
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAssemble);
|
||||
+ return true;
|
||||
bool XRef::okToAssemble(bool ignoreOwnerPW) const
|
||||
{
|
||||
- return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAssemble);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
Object XRef::getCatalog() {
|
||||
Object XRef::getCatalog()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-utils_CMakeLists_txt,v 1.3 2020/07/09 18:35:41 kili Exp $
|
||||
$OpenBSD: patch-utils_CMakeLists_txt,v 1.4 2020/09/09 20:16:44 kili Exp $
|
||||
|
||||
For utils/pdftocairo, move common_libs to the front to avoid picking
|
||||
up any already installed older version of libpoppler.so.
|
||||
@ -12,6 +12,6 @@ Index: utils/CMakeLists.txt
|
||||
add_executable(pdftocairo ${pdftocairo_SOURCES})
|
||||
- target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES} ${common_libs})
|
||||
+ target_link_libraries(pdftocairo ${common_libs} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
|
||||
if(LCMS_FOUND)
|
||||
target_link_libraries(pdftocairo ${LCMS_LIBRARIES})
|
||||
if(CMAKE_USE_PTHREADS_INIT)
|
||||
target_link_libraries(pdftocairo Threads::Threads)
|
||||
endif()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user