1 |
commit: e962c62ea9d93dd3e2f0850206d5894b66d45f0b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 6 15:12:47 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 6 20:13:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e962c62e |
7 |
|
8 |
kde-apps/kitinerary: Fix build against poppler-20.08 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735800 |
11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/kitinerary-20.04.3-poppler-20.08.patch | 32 ++++++++++++++++++++++ |
15 |
kde-apps/kitinerary/kitinerary-20.04.3.ebuild | 2 ++ |
16 |
2 files changed, 34 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..768cf5dc509 |
21 |
--- /dev/null |
22 |
+++ b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch |
23 |
@@ -0,0 +1,32 @@ |
24 |
+From 7098c8be9a5e7fabf74543308bfaf11a2ebe5484 Mon Sep 17 00:00:00 2001 |
25 |
+From: Volker Krause <vkrause@×××.org> |
26 |
+Date: Wed, 5 Aug 2020 17:18:13 +0200 |
27 |
+Subject: [PATCH] Fix build with latest Poppler |
28 |
+ |
29 |
+That now has a leading 0 in its minor version number. |
30 |
+--- |
31 |
+ CMakeLists.txt | 8 ++++---- |
32 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
33 |
+ |
34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
35 |
+index e4d40f2..37787d8 100644 |
36 |
+--- a/CMakeLists.txt |
37 |
++++ b/CMakeLists.txt |
38 |
+@@ -71,10 +71,10 @@ if(TARGET Poppler::Core) |
39 |
+ endif() |
40 |
+ endif() |
41 |
+ if (HAVE_POPPLER) |
42 |
+- string(REPLACE "." ";" _poppler_version_components ${Poppler_VERSION}) |
43 |
+- list(GET _poppler_version_components 0 POPPLER_VERSION_MAJOR) |
44 |
+- list(GET _poppler_version_components 1 POPPLER_VERSION_MINOR) |
45 |
+- list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH) |
46 |
++ string(REGEX MATCH "([0-9]+)\.0*([0-9]+)\.0*([0-9]+)" _match ${Poppler_VERSION}) |
47 |
++ set(POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1}) |
48 |
++ set(POPPLER_VERSION_MINOR ${CMAKE_MATCH_2}) |
49 |
++ set(POPPLER_VERSION_PATCH ${CMAKE_MATCH_3}) |
50 |
+ endif() |
51 |
+ |
52 |
+ if (TARGET ZXing::ZXing OR TARGET ZXing::Core) |
53 |
+-- |
54 |
+GitLab |
55 |
+ |
56 |
|
57 |
diff --git a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild |
58 |
index c4ff13c3714..2026a8ac89f 100644 |
59 |
--- a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild |
60 |
+++ b/kde-apps/kitinerary/kitinerary-20.04.3.ebuild |
61 |
@@ -35,6 +35,8 @@ RDEPEND="${DEPEND} |
62 |
!<kde-apps/kdepim-addons-18.07.80 |
63 |
" |
64 |
|
65 |
+PATCHES=( "${FILESDIR}/${P}-poppler-20.08.patch" ) # bug 735800 |
66 |
+ |
67 |
src_configure() { |
68 |
local mycmakeargs=( |
69 |
$(cmake_use_find_package barcode ZXing) |