diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /kde-apps/kitinerary/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'kde-apps/kitinerary/files')
| -rw-r--r-- | kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch | 32 |
1 files changed, 32 insertions, 0 deletions
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 000000000000..768cf5dc5097 --- /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@kde.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 + |