snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

poppler: update to 22.07.0

This commit is contained in:
oreo639 2022-03-25 18:28:08 -07:00 committed by Michal Vasilek
parent d5b187f360
commit cbdad1e54c
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -350,7 +350,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
libltdl.so.7 libltdl-2.2.6_1 libltdl.so.7 libltdl-2.2.6_1
libpoppler.so.111 libpoppler-21.07.0_1 libpoppler.so.122 libpoppler-22.06.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1

13
srcpkgs/poppler/patches/cmake-build-type-none.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index 2aed0284..ea8d7e57 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -80,7 +80,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE_UPPER)
-set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
+set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE;NONE)
# We override CMAKE_CXX_FLAGS_${_CMAKE_BUILD_TYPE_UPPER} below. If the user
# selects a CMAKE_BUILD_TYPE that is not handled by the logic below, we will
# end up dropping the previous flags (e.g. those set in a cross-compilation

21
srcpkgs/poppler/patches/fix-cflags.patch
View File

@ -1,21 +0,0 @@
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index fe1182d..6013bd2 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
set(_save_cflags "${CMAKE_C_FLAGS}")
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")

13
srcpkgs/poppler/template
View File

@ -3,13 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
# #
pkgname=poppler pkgname=poppler
version=21.07.0 version=22.07.0
revision=1 revision=1
_testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
build_style=cmake build_style=cmake
build_helper="gir" build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
-DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF) -DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF)
-DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)" -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)
-DTESTDATADIR='${XBPS_BUILDDIR}/test-${_testVersion}'"
hostmakedepends="pkg-config glib-devel" hostmakedepends="pkg-config glib-devel"
makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)" libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)"
@ -17,8 +19,11 @@ short_desc="PDF rendering library"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later" license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://poppler.freedesktop.org" homepage="https://poppler.freedesktop.org"
distfiles="${homepage}/${pkgname}-${version}.tar.xz" changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4 distfiles="${homepage}/${pkgname}-${version}.tar.xz
https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
checksum="420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428
ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
build_options="gir boost" build_options="gir boost"
build_options_default="gir boost" build_options_default="gir boost"