gentoo auto-resync : 18:02:2023 - 14:11:13

4 files changed, 50 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 9b17d7f9a57f..d40d014a3e06 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 52778959a964..696238a1e531 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,8 +1,9 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5
 AUX okular-22.08.3-drop-broken-kf-version-check.patch 1116 BLAKE2B 6a136da55db35ac83416d5dffacd22e3f6468fa829eb5a4d31d2c90fde9d7d4cfd11b9d90dc63539565b16311daa4a18a0c2deea3e4988d92638f89569c034b0 SHA512 a9db6f222a2ed64ac82f3c3967340bde40784c0b1e76cdd87d23dce535d1c2b8772a86e65f871739c623f690f363bf394234b8a0adb5b0bbb954206e03e97208
+AUX okular-22.12.2-discount-3.patch 1628 BLAKE2B 394e6845b32bd76778cf76b5dda6bc20bc7885970a0cbbb73747970c20fb4ea5d8c56cb2ab1cef68f52266bf51b74c156116ef6b9bdf4b6625fcf8cefeacbaeb SHA512 f6bdceeea77086b264fdfee6a5e1d977e19c4196637d0145292ac4a17ad70c3720c0785640d13c8e3f4ef52b3207e82097a52c51b8d2060f0bd936e67823d184
 DIST okular-22.08.3.tar.xz 8225824 BLAKE2B 1a8a9bd669173a941ef337ecdaeded4fd9df30e2df693afb012f85fda8d06e588385264ca7134dcf39466f0f2730a1ce70c0434e292033b8a67585eb9a386a1f SHA512 c2d8384e6b0eba4a477e5b0bb1e8046ed10b28162fee9e902e0cc1409a982187244e46a51f0e79e5ba292ea57440ac55005984d31148462787a040308571b69a
 DIST okular-22.12.2.tar.xz 8381020 BLAKE2B 136f3d253ecb8588286fb596f9568d3a835e1c3ff7d78a7cd4975f0981f5ad6afe48dcc036099a2bab278246ec22c67a5f5ae37385d205b2ae889b195b0da4bf SHA512 f6c542a67321d12da54edf131783ab525c1f92332476d4ad4b33341403a8f652437253ff2227cae42cd14ac7af2fa4d924c9d59223fed5d15c62723532049bc7
 EBUILD okular-22.08.3-r2.ebuild 3571 BLAKE2B 1188a13f701fbbfc7b0b2be3a780330752a87690735c832e2696e3f64946c221ff3af84b7e3daf0445e90d4b729e354eeaa7cc20da779c4cfd455015f46a77ea SHA512 bcbcd466e967c416d942455131538e030488b689c23708b2bdffc7a4327ada21c78daca1d17912d018433d0d298cc04e096c30ddfbccbfcfca89a0c388873115
-EBUILD okular-22.12.2.ebuild 3582 BLAKE2B 4f57fe8b12133eefd0127769c8dbda309107933687e689afb6fc9edeace0004e676223d9a06a12fb4b4129da2d25eebedc653d9d1bf7c14935d389177868ad3f SHA512 b488465e3591efdb11e6d2056b047381710aa21f61ff7e9a6fde5fe4d7d9136ddc025d51f62eee33a020b9d1e6affa56cffe7713b62a28f88829305a3f8909fb
+EBUILD okular-22.12.2.ebuild 3641 BLAKE2B 4d70a4542394c0ec1f10d9cee87d5738fc53340b4851b8ff6ddfcac5743ef890104a2299ddee22cd368caa249ee151675c5a4565fb7ce038734dc42b1dff88c0 SHA512 7c270994c3b019fc469a250b4ea762be45c46ff16e43d9590c9abf593b302a62a354e079470c132763869dd33641d70be4c19ba14698c7abff3c8542e2f60ce1
 MISC metadata.xml 1134 BLAKE2B d2bf9a6b378094bfd999f9e4bc3f1ca40d0c9014e247d2df308ddd413999e7a9ffd2dbca3cecff50f696435b16e8be83a3167ed51e5bac737f1720f4502f02f0 SHA512 8dabf09a40eb2cf7c2e0be18d33020b6ccf777115e7c047bfc4791ad0e23554ac25e6ed8da8528281e067b71567dad3407634562273aedae419759bab4e0d416
diff --git a/kde-apps/okular/files/okular-22.12.2-discount-3.patch b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
new file mode 100644
index 000000000000..e9fef2679adb
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
@@ -0,0 +1,47 @@
+From f1f638c2c51a6ef699dee22f6e90aff67beff8ec Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 1 Feb 2023 22:01:52 +0100
+Subject: [PATCH] Compile with discount 3
+
+---
+ generators/markdown/converter.cpp | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/generators/markdown/converter.cpp b/generators/markdown/converter.cpp
+index 20d3c725f..3c8546b32 100644
+--- a/generators/markdown/converter.cpp
++++ b/generators/markdown/converter.cpp
+@@ -93,6 +93,8 @@ QTextDocument *Converter::convertOpenFile()
+ {
+     rewind(m_markdownFile);
+ 
++#if defined(MKD_NOLINKS)
++    // on discount 2 MKD_NOLINKS is a define
+     MMIOT *markdownHandle = mkd_in(m_markdownFile, 0);
+ 
+     int flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR;
+@@ -103,6 +105,21 @@ QTextDocument *Converter::convertOpenFile()
+         Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
+         return nullptr;
+     }
++#else
++    // on discount 3 MKD_NOLINKS is an enum value
++    MMIOT *markdownHandle = mkd_in(m_markdownFile, nullptr);
++
++    mkd_flag_t *flags = mkd_flags();
++    mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR);
++    if (!m_isFancyPantsEnabled) {
++        mkd_set_flag_num(flags, MKD_NOPANTS);
++    }
++    if (!mkd_compile(markdownHandle, flags)) {
++        Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
++        return nullptr;
++    }
++    mkd_free_flags(flags);
++#endif
+ 
+     char *htmlDocument;
+     const int size = mkd_document(markdownHandle, &htmlDocument);
+-- 
+GitLab
+
diff --git a/kde-apps/okular/okular-22.12.2.ebuild b/kde-apps/okular/okular-22.12.2.ebuild
index b53a5f62b2fd..02e1c3eb56af 100644
--- a/kde-apps/okular/okular-22.12.2.ebuild
+++ b/kde-apps/okular/okular-22.12.2.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${PN}-22.12.2-discount-3.patch" # bug 892633
 )
 
 src_configure() {