diff --git a/common/shlibs b/common/shlibs index 7fa4c1d99c5..7e467571639 100644 --- a/common/shlibs +++ b/common/shlibs @@ -343,7 +343,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.82 poppler-0.71.0_1 +libpoppler.so.83 libpoppler83-0.72.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/libpoppler83 b/srcpkgs/libpoppler83 new file mode 120000 index 00000000000..5d4379bfb79 --- /dev/null +++ b/srcpkgs/libpoppler83 @@ -0,0 +1 @@ +poppler \ No newline at end of file diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index b9950c90f1b..5b4be172d40 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.71.0 +version=0.72.0 revision=1 build_style=cmake configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) @@ -11,13 +11,12 @@ configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=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)" -depends="poppler-data" 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=badbecd2dddf63352fd85ec08a9c2ed122fdadacf2a34fcb4cc227c4d01f2cf9 +checksum=c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=2" @@ -30,6 +29,14 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi +libpoppler83_package() { + depends="poppler-data" + short_desc+=" - poppler runtime library" + pkg_install() { + vmove usr/lib/libpoppler.so.* + } +} + poppler-cpp-devel_package() { depends="libstdc++-devel zlib-devel poppler-devel-${version}_${revision} poppler-cpp-${version}_${revision}" short_desc+=" - C++ bindings (development files)" @@ -48,7 +55,7 @@ poppler-cpp_package() { } poppler-devel_package() { - depends="libglib-devel poppler-${version}_${revision}" + depends="libglib-devel libpoppler83-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/include/poppler/*.h" @@ -86,9 +93,7 @@ poppler-glib_package() { } poppler-utils_package() { - short_desc+=" - utilities" - pkg_install() { - vmove usr/bin - vmove usr/share/man - } + short_desc+=" - utilities (transitional package)" + build_style=meta + depends="poppler-${version}_${revision}" }