diff --git a/common/shlibs b/common/shlibs index aa1123c414b..a71c44bd168 100644 --- a/common/shlibs +++ b/common/shlibs @@ -346,7 +346,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.84 libpoppler84-0.73.0_1 +libpoppler.so.85 libpoppler85-0.74.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/libpoppler84 b/srcpkgs/libpoppler85 similarity index 100% rename from srcpkgs/libpoppler84 rename to srcpkgs/libpoppler85 diff --git a/srcpkgs/poppler/patches/fix-gir-cross.patch b/srcpkgs/poppler/patches/fix-gir-cross.patch new file mode 100644 index 00000000000..b9e1420049a --- /dev/null +++ b/srcpkgs/poppler/patches/fix-gir-cross.patch @@ -0,0 +1,14 @@ +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 6f91669..ca5021f 100644 +--- glib/CMakeLists.txt ++++ glib/CMakeLists.txt +@@ -135,7 +135,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) + _list_prefix(_includes _tmp_includes "-I") + set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR}) +- set(Poppler_0_18_gir_LIBS poppler-glib) ++ set(Poppler_0_18_gir_LIBS poppler-glib poppler) + _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") + list(APPEND _abs_introspection_files + ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c + diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 32aca579596..d3e742f03db 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,34 +3,33 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.73.0 -revision=2 +version=0.74.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" hostmakedepends="pkg-config glib-devel" makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel - libcurl-devel libopenjpeg2-devel $(vopt_if gir gobject-introspection)" + libcurl-devel libopenjpeg2-devel" short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/${pkgname}-${version}.tar.xz" -checksum=e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03 - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DTHREADS_PTHREAD_ARG=2" -fi +checksum=92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f # Package build options build_options="gir" -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi -libpoppler84_package() { +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) build_options_default+=" gir" ;; + *-musl) ;; + *) build_options_default+=" gir" ;; +esac + +libpoppler85_package() { depends="poppler-data" short_desc+=" - poppler runtime library" pkg_install() { @@ -56,7 +55,7 @@ poppler-cpp_package() { } poppler-devel_package() { - depends="libglib-devel libpoppler84-${version}_${revision}" + depends="libglib-devel libpoppler85-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/include/poppler/*.h"