commit: 281f676e87afb3bbe312fb59c84663bb8b75a01e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri May 31 05:44:54 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri May 31 05:46:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281f676e
kde-apps/kitinerary: Fix build with >=app-text/poppler-24.05 Closes: https://bugs.gentoo.org/933219 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kitinerary-23.08.5-poppler-24.05.patch | 37 ++++++++++++++++++++++ kde-apps/kitinerary/kitinerary-23.08.5.ebuild | 2 ++ 2 files changed, 39 insertions(+) diff --git a/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch b/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch new file mode 100644 index 000000000000..969e19e79df2 --- /dev/null +++ b/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch @@ -0,0 +1,37 @@ +From 6a0a4f455d58b96b8965667a7eb057abd244d87e Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <[email protected]> +Date: Sun, 21 Apr 2024 11:14:42 +0200 +Subject: [PATCH] Compile with newer poppler + +And remove ancient poppler ifdefs +--- + src/lib/pdf/pdfdocument.cpp | 5 +++++ + 1 file changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp +index 417a0b85..f829e645 100644 +--- a/src/lib/pdf/pdfdocument.cpp ++++ b/src/lib/pdf/pdfdocument.cpp +@@ -22,6 +22,7 @@ + #include <PDFDoc.h> + #include <PDFDocEncoding.h> + #include <Stream.h> ++#include <UTF.h> + + #include <cmath> + +@@ -330,7 +307,11 @@ QString gooStringToUnicode(const std::unique_ptr<GooString> &s) + return {}; + } + ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(24, 5, 0) ++ if (hasUnicodeByteOrderMark(s->toStr()) || hasUnicodeByteOrderMarkLE(s->toStr())) { ++#else + if (s->hasUnicodeMarker() || s->hasUnicodeMarkerLE()) { ++#endif + return QString::fromUtf16(reinterpret_cast<const char16_t*>(s->toStr().c_str()), s->toStr().size() / 2); + } else { + int len = 0; +-- +GitLab + diff --git a/kde-apps/kitinerary/kitinerary-23.08.5.ebuild b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild index 0f5a2ef14317..f67e43bb771f 100644 --- a/kde-apps/kitinerary/kitinerary-23.08.5.ebuild +++ b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild @@ -39,6 +39,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="x11-misc/shared-mime-info" +PATCHES=( "${FILESDIR}/${P}-poppler-24.05.patch" ) # bug 933219 + src_configure() { local mycmakeargs=( # sci-geosciences/osmctools; TODO: useful at all?
