diff --git a/common/shlibs b/common/shlibs index 7629d868216..ed76ac8f470 100644 --- a/common/shlibs +++ b/common/shlibs @@ -353,7 +353,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.87 libpoppler87-0.76.0_1 +libpoppler.so.89 libpoppler89-0.78.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/libpoppler87 b/srcpkgs/libpoppler87 deleted file mode 120000 index 5d4379bfb79..00000000000 --- a/srcpkgs/libpoppler87 +++ /dev/null @@ -1 +0,0 @@ -poppler \ No newline at end of file diff --git a/srcpkgs/poppler/patches/fix-gir-cross.patch b/srcpkgs/poppler/patches/fix-gir-cross.patch deleted file mode 100644 index b9e1420049a..00000000000 --- a/srcpkgs/poppler/patches/fix-gir-cross.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 12e1d4522b3..46e8bcd86b7 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.76.0 -revision=2 +version=0.78.0 +revision=1 build_style=cmake build_helper="gir" configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON @@ -18,13 +18,13 @@ 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=370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63 +checksum=622fdd3187a7339c3b78b861b7cd820ea41ebce0609839ba28ee52c3387938c2 # Package build options build_options="gir" build_options_default="gir" -libpoppler87_package() { +libpoppler89_package() { depends="poppler-data" short_desc+=" - poppler runtime library" pkg_install() {