[gentoo-commits] repo/proj/guru:dev commit in: app-text/katarakt/, app-text/katarakt/files/

[Kurt Kanzenbach]

commit:     bd5f6f8013510b33160bc158f93aeaf856ff6850
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Aug 30 15:27:32 2021 +0000
Commit:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
CommitDate: Mon Aug 30 15:27:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd5f6f80

app-text/katarakt: Fix poppler detection

Closes: https://bugs.gentoo.org/810976
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 app-text/katarakt/files/katarakt-0.2-poppler.patch | 29 ++++++++++++++++++++++
 app-text/katarakt/katarakt-0.2.ebuild              |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app-text/katarakt/files/katarakt-0.2-poppler.patch b/app-text/katarakt/files/katarakt-0.2-poppler.patch
new file mode 100644
index 000000000..7979bf6a5
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-poppler.patch
@@ -0,0 +1,29 @@
+From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001
+From: Philipp Erhardt <Philipp.Erhardt@××××××××××××××××××××××××××××.de>
+Date: Mon, 19 Oct 2020 20:42:37 +0200
+Subject: [PATCH] Fix compilation if the version number contains a leading zero
+
+---
+ katarakt.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..84cd59797d0a 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -17,9 +17,9 @@ unix {
+ 
+     isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config    # same as in link_pkgconfig.prf
+     POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+-    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+-    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+-    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'")
++    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'")
++    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'")
+ 
+     DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+     DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
+-- 
+2.33.0
+

diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild
index 45195c514..d5ce38d08 100644
--- a/app-text/katarakt/katarakt-0.2.ebuild
+++ b/app-text/katarakt/katarakt-0.2.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-v${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-install.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+	"${FILESDIR}/${P}-poppler.patch"
+)
 
 src_configure() {
 	eqmake5 PREFIX="${EPREFIX}/usr"