gentoo auto-resync : 19:02:2023 - 14:14:15

3 files changed, 131 insertions, 1 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 40a92f5abd20..19572e49fab7 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,7 +1,8 @@
 AUX kdepim-addons-22.08.3-spamassassin-4.patch 2287 BLAKE2B 378da71f00f434ad8b6689063289f4f3a54f283c0e5a825ecc024d796be2339a5006530c32ffba13000cc46a70b2a9239113770a673087d937137d290f4d9612 SHA512 c1c795fc22f09a8cea95e776634c5bcc8966bc8ccee5af7736fe011412c9bf1694b17473f640ba29b39dd8e0a6cc79a700b6faa9a7ad532cbe8f18934e0e2111
+AUX kdepim-addons-22.12.2-discount-3.patch 5352 BLAKE2B 662111dc9eea63e3436c2434e723d8fb41277cca558d2baa1d3632ce204da7da4c0dc67c5809ca8e0780291dcbf71a4cdcc1098b7fe2edcab8bdf7d8edc8ddc4 SHA512 14afe36d35b49c6e323e8004271fc6953fb499fbb06ee06f864598df72c5ee18b2897ed209ce2613f9d3991a980f5c9ecc361ae9d0dd96e9c76b563920046e18
 DIST kdepim-addons-22.08.3.tar.xz 2301376 BLAKE2B 9e7cc90f8962b963e240cdf705301e399f409547396a77e3d5f506332c9897d9e89743f57bf725a21f348fe23f0b9d51e09552dbf5db88aaf7b2307a1d307671 SHA512 6e05806a5e1810c41e5af54cbf5aeef9345f4a168f520f0ed2a91552b4b786e0cfe9be98c127869640d2ed5f342a03da189fc60913c313517de4ff19ff66f1fb
 DIST kdepim-addons-22.12.2.tar.xz 2665648 BLAKE2B 4c2099f19305ec5519f974e0d037b02a7f3e03eb0e99e31ac29ab6b3545a0c5883b425ba27ac4894cec6b06cb243d11984ff44d7af51cb3c1f9f206c28e67fff SHA512 cb63b7df5694db4a898dda642a2d4e7e05c36ed1529a88c828b21d2a2ad24d16bee16a33f0df9f5a38c19dd6fa22892aff03dbbf1bc986ab1017e08b07b2312e
 EBUILD kdepim-addons-22.08.3-r1.ebuild 2438 BLAKE2B 1b1179b98f172fd4042e4da5b9209f1c0fad933cd255cacb1c4e9365e725d6f8811669b0ef894126ca53ce8a74bf6cfb5e7f89242bc97ae5f08cfdac4ea4916f SHA512 0be19375b85af830586165e6962476333505a2524f60f3a005739431795b0171f53bd7ed0cffe728e8bac530250a46e942e82f88bfcab9e390ea7a04b1012195
 EBUILD kdepim-addons-22.08.3-r2.ebuild 2493 BLAKE2B 5b90ad0f6fdc85a8558ca90149f3fbf4e9ece8932c99406cc253f3bad58ee01d5d3bb5f4a56fb50ca6f82c503f781a3d909bc5340c67d2ee851d2797f4e8bf37 SHA512 5cba1cf9d292ba3b7787485912fa55a04c9e07b96a77581ace2283605fa054c927b5a16c617b734407bba8921140fbfbf9ec438bf491d3b5b4fa9e55907c4994
-EBUILD kdepim-addons-22.12.2.ebuild 2441 BLAKE2B 89f0a17561d3a8e987b65a4cf2dc8311dcde91a30937f89fcdbf370d6e38a7c641145e0768f65d0d1b4f7754026342800549a5a739ab5e111b05138d7e89af74 SHA512 d99625c594828ddcf7a2a8e9fd9d3cc107b17eabd6d109352569334d6c8a6800e63c6ced62bfac8cab53f53024ac8121501ed655503bc8a1a33df3ab7edc8687
+EBUILD kdepim-addons-22.12.2.ebuild 2490 BLAKE2B 89c93a0b01dce94a30e4ee5fcbdb8ce5c4e5396cb8918962caec93ac00b887cdcf1885e87e107f9311e6acf9e19e1281b86fe87a9b7fb477690b5c4a8608ac85 SHA512 6d53c5878497338c185e8697bc37aecbb7a927a8e08a8b3799ee12a393d7c38b994b6990da8a1fcde51c4f2bfa4d7dba7fb7e7b247f29aa0b2cda9d45b839bca
 MISC metadata.xml 535 BLAKE2B 372b4b81f73cab00c89c12fb43fbb4edeea2521a7f443c70bdd68269780b82ed98e71d5a1b16cab55827f11fefbd70c65fbf860e3d6b73b39647bc02256edaf1 SHA512 a4a82c962488e785ecc5b36711c5730955f0352d7fcc184facfc351668dd22ba82247b9608ca39fac48f6260f29283b3c95e967ab0d887421f5849b425aa7b4d
diff --git a/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch b/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch
new file mode 100644
index 000000000000..32ab88710097
--- /dev/null
+++ b/kde-apps/kdepim-addons/files/kdepim-addons-22.12.2-discount-3.patch
@@ -0,0 +1,127 @@
+From 81134b0dff93ecc9da4ae60cd4b0aeb0be95ab1e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 18 Feb 2023 17:39:37 +0100
+Subject: [PATCH 1/2] Make it compile against discount 3
+
+---
+ cmake/modules/FindDiscount.cmake                  |  2 +-
+ .../bodypartformatter/markdown/CMakeLists.txt     |  1 -
+ .../markdown/markdowndiscount.cpp                 | 15 +++++++++++++++
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindDiscount.cmake b/cmake/modules/FindDiscount.cmake
+index 27acf46ed..8bb4e6d09 100644
+--- a/cmake/modules/FindDiscount.cmake
++++ b/cmake/modules/FindDiscount.cmake
+@@ -21,7 +21,7 @@ else ()
+       find_package(PkgConfig QUIET)
+       PKG_CHECK_MODULES(PC_LIBMARKDOWN QUIET libmarkdown)
+       set(PC_LIBMARKDOWN_VERSION_STRING ${PC_LIBMARKDOWN_VERSION})
+-      #MESSAGE(STATUS "VERSION ${PC_LIBMARKDOWN_VERSION_STRING}")
++      MESSAGE(STATUS "VERSION ${PC_LIBMARKDOWN_VERSION_STRING}")
+   endif ()	
+   find_library (discount_LIBRARY
+     NAMES markdown libmarkdown
+diff --git a/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
+index 244810b2b..8e096b75b 100644
+--- a/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
++++ b/plugins/messageviewer/bodypartformatter/markdown/CMakeLists.txt
+@@ -23,5 +23,4 @@ target_link_libraries(messageviewer_bodypartformatter_text_markdown
+     KF5::MessageViewer
+     ${TEMPLATES_LIB}
+ )
+-
+ install(TARGETS messageviewer_bodypartformatter_text_markdown DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/messageviewer/bodypartformatter)
+diff --git a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
+index 8132b7b34..3ba689695 100644
+--- a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
++++ b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
+@@ -20,6 +20,8 @@ QString MarkdownDiscount::toHtml() const
+         return {};
+     }
+     const QByteArray textArray = mText.toUtf8();
++#if defined(MKD_NOLINKS)
++    // on discount 2 MKD_NOLINKS is a define
+     MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.count(), 0);
+     mkd_flag_t flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK;
+     if (!mkd_compile(markdownHandle, flags)) {
+@@ -27,6 +29,19 @@ QString MarkdownDiscount::toHtml() const
+         mkd_cleanup(markdownHandle);
+         return {};
+     }
++#else
++    // on discount 3 MKD_NOLINKS is an enum value
++    MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
++    mkd_flag_t *flags = mkd_flags();
++    mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR);
++    if (!mkd_compile(markdownHandle, flags)) {
++        qWarning() << "Failed to compile the Markdown document.";
++        mkd_cleanup(markdownHandle);
++        mkd_free_flags(flags);
++        return {};
++    }
++    mkd_free_flags(flags);
++#endif
+ 
+     char *htmlDocument;
+     const int size = mkd_document(markdownHandle, &htmlDocument);
+-- 
+2.39.2
+
+
+From dab416ac2e2ec17bf5a7a9a83064f19a3b04a08c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 19 Feb 2023 12:30:14 +0100
+Subject: [PATCH 2/2] Add missing push it
+
+---
+ .../markdownlib/markdownconverter.cpp         | 25 ++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
+index 204628656..34530dd11 100644
+--- a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
++++ b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
+@@ -52,7 +52,8 @@ QString MarkdownConverter::convertTextToMarkdown(const QString &str)
+         return {};
+     }
+     const QByteArray textArray = str.toUtf8();
+-
++#if defined(MKD_NOLINKS)
++    // on discount 2 MKD_NOLINKS is a define
+     MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.count(), 0);
+     mkd_flag_t flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK;
+     if (mEnableEmbeddedLabel) {
+@@ -69,7 +70,29 @@ QString MarkdownConverter::convertTextToMarkdown(const QString &str)
+         mkd_cleanup(markdownHandle);
+         return {};
+     }
++#else
++    // on discount 2 MKD_NOLINKS is a define
+ 
++    MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
++    mkd_flag_t *flags = mkd_flags();
++    mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK);
++    if (mEnableEmbeddedLabel) {
++        mkd_set_flag_num(flags, MKD_LATEX);
++    }
++    if (mEnableExtraDefinitionLists) {
++        mkd_set_flag_num(flags, MKD_DLEXTRA);
++    }
++#if DISCOUNT_HAS_HIGHLIGHTING_SUPPORT
++    mkd_e_code_format(markdownHandle, external_codefmt);
++#endif
++    if (!mkd_compile(markdownHandle, flags)) {
++        Q_EMIT failed(i18n("Failed to compile the Markdown document."));
++        mkd_cleanup(markdownHandle);
++        mkd_free_flags(flags);
++        return {};
++    }
++    mkd_free_flags(flags);
++#endif
+     char *htmlDocument;
+     const int size = mkd_document(markdownHandle, &htmlDocument);
+ 
+-- 
+2.39.2
+
diff --git a/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
index 4689d7c29cbf..f8034c584541 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-22.12.2.ebuild
@@ -68,6 +68,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-discount-3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package importwizard KPimImportWizard)