Re: [PR PATCH] [Updated] poppler: fix libpoppler version 89 -> 90

[svenper <svenper@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

There is an updated pull request by svenper against master on the void-packages repository

https://github.com/svenper/void-packages poppler
https://github.com/void-linux/void-packages/pull/20650

poppler: fix libpoppler version 89 -> 90
see #20342

A patch file from https://github.com/void-linux/void-packages/pull/20650.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-poppler-20650.patch --]
[-- Type: text/x-diff, Size: 1885 bytes --]

From 9d6fa6538bbc91a6b5339006e4cd07bb3331fe3b Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Sat, 4 Apr 2020 17:43:54 +0200
Subject: [PATCH] poppler: fix libpoppler version 89 -> 90

---
 common/shlibs            | 2 +-
 srcpkgs/poppler/template | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c7dc4eafc98..3bdc419d920 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -359,7 +359,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.90 libpoppler89-0.80.0_1
+libpoppler.so.90 libpoppler90-0.80.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/poppler/template b/srcpkgs/poppler/template
index 3670cc19bc9..aa4d3e63463 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -4,7 +4,7 @@
 #
 pkgname=poppler
 version=0.80.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -24,9 +24,11 @@ checksum=4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f
 build_options="gir"
 build_options_default="gir"
 
-libpoppler89_package() {
+libpoppler90_package() {
 	depends="poppler-data"
 	short_desc+=" - poppler runtime library"
+	provides="libpoppler89-${version}_${revision}"
+	replaces="libpoppler89>=0"
 	pkg_install() {
 		vmove usr/lib/libpoppler.so.*
 	}
@@ -50,7 +52,7 @@ poppler-cpp_package() {
 }
 
 poppler-devel_package() {
-	depends="libglib-devel libpoppler89-${version}_${revision}"
+	depends="libglib-devel libpoppler90-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/include/poppler/*.h"