moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

poppler: update to 21.05.0.

Browse source
This commit is contained in:
Érico Nogueira 2021-05-10 22:55:23 -03:00 • committed by Érico Nogueira Rolim
parent f5006dde2d
commit 8c144a196c
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -340,7 +340,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.102 libpoppler102-20.09.0_1 libpoppler.so.110 libpoppler110-21.05.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

0
srcpkgs/libpoppler102 → srcpkgs/libpoppler110
View file

14
srcpkgs/poppler/patches/fix-cflags.patch
View file

@ -1,13 +1,13 @@
Index: cmake/modules/PopplerMacros.cmake diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
=================================================================== index fe1182d..6013bd2 100644
--- cmake/modules/PopplerMacros.cmake.orig --- a/cmake/modules/PopplerMacros.cmake
+++ cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake
@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) @@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
set(_save_cxxflags "${CMAKE_CXX_FLAGS}") set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") - 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 -D_DEFAULT_SOURCE ${_save_cxxflags}") + 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_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_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_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")

13
srcpkgs/poppler/template
View file

@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
# #
pkgname=poppler pkgname=poppler
version=20.09.0 version=21.05.0
revision=3 revision=1
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
@ -18,13 +18,14 @@ 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" distfiles="${homepage}/${pkgname}-${version}.tar.xz"
checksum=4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363 checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c
patch_args=-Np1
# Package build options # Package build options
build_options="gir" build_options="gir"
build_options_default="gir" build_options_default="gir"
libpoppler102_package() { libpoppler110_package() {
depends="poppler-data" depends="poppler-data"
short_desc+=" - poppler runtime library" short_desc+=" - poppler runtime library"
pkg_install() { pkg_install() {
@ -50,7 +51,7 @@ poppler-cpp_package() {
} }
poppler-devel_package() { poppler-devel_package() {
depends="libglib-devel libpoppler102>=${version}_${revision}" depends="libglib-devel libpoppler110>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove "usr/include/poppler/*.h" vmove "usr/include/poppler/*.h"
@ -59,7 +60,6 @@ poppler-devel_package() {
vmove usr/include/poppler/goo vmove usr/include/poppler/goo
vmove usr/lib/libpoppler.so vmove usr/lib/libpoppler.so
vmove usr/lib/pkgconfig/poppler.pc vmove usr/lib/pkgconfig/poppler.pc
vmove usr/lib/pkgconfig/poppler-splash.pc
} }
} }
@ -72,7 +72,6 @@ poppler-glib-devel_package() {
if [ "$build_option_gir" ]; then if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0 vmove usr/share/gir-1.0
fi fi
vmove usr/lib/pkgconfig/poppler-cairo.pc
vmove usr/lib/pkgconfig/poppler-glib.pc vmove usr/lib/pkgconfig/poppler-glib.pc
} }
} }