From ffb8ed7f591eb00bd785eacefb865a5609d442ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 25 Jul 2021 00:17:30 -0300 Subject: [PATCH] poppler: update to 21.07.0. - stop versioning the libpoppler subpackage, we always rebuild dependants anyway - add boost since it makes the splash backend much faster [1], but make it a build option so disabling is easy and any eventual Boost API breaks are easily overcome [1] https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080 --- common/shlibs | 2 +- srcpkgs/{libpoppler110 => libpoppler} | 0 srcpkgs/poppler/template | 19 +++++++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) rename srcpkgs/{libpoppler110 => libpoppler} (100%) diff --git a/common/shlibs b/common/shlibs index 14c9e6a84e2..7f0560d2bad 100644 --- a/common/shlibs +++ b/common/shlibs @@ -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 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.110 libpoppler110-21.05.0_1 +libpoppler.so.111 libpoppler-21.07.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 diff --git a/srcpkgs/libpoppler110 b/srcpkgs/libpoppler similarity index 100% rename from srcpkgs/libpoppler110 rename to srcpkgs/libpoppler diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index e78dc76cfaa..0aa4edf20b5 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,32 +3,31 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=21.05.0 +version=21.07.0 revision=1 build_style=cmake build_helper="gir" configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON -DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF) - -DENABLE_QT5=OFF -DENABLE_UTILS=ON" + -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)" hostmakedepends="pkg-config glib-devel" makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel - libcurl-devel libopenjpeg2-devel" +libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)" short_desc="PDF rendering library" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://poppler.freedesktop.org" distfiles="${homepage}/${pkgname}-${version}.tar.xz" -checksum=dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c +checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4 -# Package build options -build_options="gir" -build_options_default="gir" +build_options="gir boost" +build_options_default="gir boost" -libpoppler110_package() { +libpoppler_package() { depends="poppler-data" short_desc+=" - poppler runtime library" pkg_install() { - vmove usr/lib/libpoppler.so.${pkgname/libpoppler/}* + vmove "usr/lib/libpoppler.so.*" } } @@ -50,7 +49,7 @@ poppler-cpp_package() { } poppler-devel_package() { - depends="libglib-devel libpoppler110>=${version}_${revision}" + depends="libglib-devel libpoppler>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/include/poppler/*.h"