[gentoo-commits] proj/kde:master commit in: kde-apps/kitinerary/, kde-apps/kitinerary/files/

[Andreas Sturmlechner]

commit:     3f184f52495f3f7ffb33b69aa2ae7530810d82ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 15:12:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 21:45:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f184f52

kde-apps/kitinerary: Fix build against poppler-20.08

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kitinerary-20.04.3-poppler-20.08.patch   | 32 ++++++++++++++++++++++
 kde-apps/kitinerary/kitinerary-20.07.90.ebuild     |  4 +++
 2 files changed, 36 insertions(+)

diff --git a/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch
new file mode 100644
index 0000000000..768cf5dc50
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch
@@ -0,0 +1,32 @@
+From 7098c8be9a5e7fabf74543308bfaf11a2ebe5484 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@×××.org>
+Date: Wed, 5 Aug 2020 17:18:13 +0200
+Subject: [PATCH] Fix build with latest Poppler
+
+That now has a leading 0 in its minor version number.
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4d40f2..37787d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,10 +71,10 @@ if(TARGET Poppler::Core)
+     endif()
+ endif()
+ if (HAVE_POPPLER)
+-    string(REPLACE "." ";" _poppler_version_components ${Poppler_VERSION})
+-    list(GET _poppler_version_components 0 POPPLER_VERSION_MAJOR)
+-    list(GET _poppler_version_components 1 POPPLER_VERSION_MINOR)
+-    list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH)
++    string(REGEX MATCH "([0-9]+)\.0*([0-9]+)\.0*([0-9]+)" _match ${Poppler_VERSION})
++    set(POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1})
++    set(POPPLER_VERSION_MINOR ${CMAKE_MATCH_2})
++    set(POPPLER_VERSION_PATCH ${CMAKE_MATCH_3})
+ endif()
+ 
+ if (TARGET ZXing::ZXing OR TARGET ZXing::Core)
+-- 
+GitLab
+

diff --git a/kde-apps/kitinerary/kitinerary-20.07.90.ebuild b/kde-apps/kitinerary/kitinerary-20.07.90.ebuild
index 092a4e4d18..a9fb37254e 100644
--- a/kde-apps/kitinerary/kitinerary-20.07.90.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.07.90.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-18.07.80
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20.04.3-poppler-20.08.patch" # bug 735800, in 20.08.0
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package barcode ZXing)