From 93d0bbd7df69c2081c2b2347ea6c88b8e967d537 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Apr 2023 23:56:27 +0100 Subject: gentoo auto-resync : 18:04:2023 - 23:56:26 --- sci-visualization/Manifest.gz | Bin 4863 -> 4859 bytes sci-visualization/labplot/Manifest | 3 +- .../labplot/files/labplot-2.9.0-discount-3.patch | 98 +++++++++++++++++++++ sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 2 + 4 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch (limited to 'sci-visualization') diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz index c4dcea13c7a2..d824a1c28c79 100644 Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index 1fff18f82dd3..adacb70f3492 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,4 +1,5 @@ +AUX labplot-2.9.0-discount-3.patch 3386 BLAKE2B 8b9fba76ca24665279bf96e8875a22d7a841cadd84f0a154ee010d2aa0078520403331589b94528b3816cb6cda8c7b1a369374971e08b9756436c827dbc80702 SHA512 43fa587c33ec12346535cfb8ce6ce2a5faa303ffa9cf574cb6bcd4764142bbb76a04f1f9ea73e82c9a0ade14c6d6cba1644f5a4551ea34a3d3d69fedef481d96 DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 -EBUILD labplot-2.9.0-r1.ebuild 2637 BLAKE2B d8c77c21eefdbb37279497934706cdcebd5042265ea17fed65f50cad02a3a6a34ab033f9a9fe520d58c6c31952eb870a881e7c908bef2f91b2186bca12850eb0 SHA512 ba9f08569c72ad6be1952583a41f2d3e04831d96c45f641ded28183636091b5056afaed614603ac37a8bb3027bb4e406e532a7f93051fe8a76e844a63ece5838 +EBUILD labplot-2.9.0-r1.ebuild 2686 BLAKE2B 5abbe320bcbcb9252f6e1dc4d0ff2f1571f207c42a1cf5a8bc98d4e4eaa0b848df71120a50b51d96e60f2ebba50d65502db0b813ea0b4b4d75d5de12bfa44431 SHA512 84e2d132876bf0cabdc9835847200e4ea296abb3a3fb10c61c30e3d3b0c9656b882d9cd6acb790b0db237e23327dd382aa366b034a08aa48b50cf29e20f61caa EBUILD labplot-9999.ebuild 2637 BLAKE2B d8c77c21eefdbb37279497934706cdcebd5042265ea17fed65f50cad02a3a6a34ab033f9a9fe520d58c6c31952eb870a881e7c908bef2f91b2186bca12850eb0 SHA512 ba9f08569c72ad6be1952583a41f2d3e04831d96c45f641ded28183636091b5056afaed614603ac37a8bb3027bb4e406e532a7f93051fe8a76e844a63ece5838 MISC metadata.xml 1328 BLAKE2B 7c5afcd644eb98a6afdaba264e24e225e44075e223c47e10922f2aa7ea4658ad34b6f3a55e82a72109413da8bd41df55c2aeb02d93db12ae154acf116d300706 SHA512 ac715b846c70cf31d8a3f92c291848fb9f6c3e571f3cdadc9670c2eb3211ebf2e96dae4263232544506f2cf4db2bb408beeea2cb322f1ac56c179048bd77ba20 diff --git a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch new file mode 100644 index 000000000000..e59c1309888d --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch @@ -0,0 +1,98 @@ +From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001 +From: Stefan Gerlach +Date: Mon, 17 Apr 2023 23:15:19 +0200 +Subject: [PATCH] support discount version 3 + +cherry-picked (and merged) commits from git master: +80340872e0fd3780065b847000882cd2c6faaf09 +22c553af43ff2afc42a32f8b9f04c6b426f49300 +--- + CMakeLists.txt | 4 ++++ + cmake/FindDiscount.cmake | 9 ++++++++- + src/backend/worksheet/TextLabel.cpp | 17 +++++++++++++++-- + 3 files changed, 27 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed478d024..2e28a1aff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -493,6 +493,10 @@ IF (ENABLE_DISCOUNT) + TYPE OPTIONAL) + IF (Discount_FOUND) + add_definitions (-DHAVE_DISCOUNT) ++ MESSAGE (STATUS "Found Markdown Library Discount ${Discount_VERSION}") ++ IF (${Discount_VERSION} VERSION_GREATER "2.99") ++ add_definitions (-DHAVE_DISCOUNT3) ++ ENDIF () + ELSE () + MESSAGE (STATUS "Discount library NOT FOUND.") + ENDIF () +diff --git a/cmake/FindDiscount.cmake b/cmake/FindDiscount.cmake +index 4919ad6e1..9dd348649 100644 +--- a/cmake/FindDiscount.cmake ++++ b/cmake/FindDiscount.cmake +@@ -10,6 +10,11 @@ + # SPDX-FileCopyrightText: 2018 Sune Vuorela + # SPDX-License-Identifier: BSD-3-Clause + ++find_package(PkgConfig QUIET) ++pkg_check_modules(PC_LIBMARKDOWN libmarkdown QUIET) ++ ++set(Discount_VERSION ${PC_LIBMARKDOWN_VERSION}) ++ + if (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + # Already in cache +@@ -19,10 +24,12 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + find_library (Discount_LIBRARIES + NAMES markdown libmarkdown ++ HINTS ${PC_LIBMARKDOWN_LIBRARY_DIRS} + ) + + find_path (Discount_INCLUDE_DIR + NAMES mkdio.h ++ HINTS ${PC_LIBMARKDOWN_INCLUDE_DIRS} + ) + + include (FindPackageHandleStandardArgs) +@@ -30,7 +37,7 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + + endif (Discount_INCLUDE_DIR AND Discount_LIBRARIES) + +-mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES) ++mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES Discount_VERSION) + + if (Discount_FOUND) + add_library(Discount::Lib UNKNOWN IMPORTED) +diff --git a/src/backend/worksheet/TextLabel.cpp b/src/backend/worksheet/TextLabel.cpp +index 815dcb785..1c85c0e9e 100644 +--- a/src/backend/worksheet/TextLabel.cpp ++++ b/src/backend/worksheet/TextLabel.cpp +@@ -576,8 +576,21 @@ void TextLabelPrivate::updateText() { + case TextLabel::Mode::Markdown: { + #ifdef HAVE_DISCOUNT + auto mdCharArray = textWrapper.text.toUtf8(); +- MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size()+1, 0); +- if(!mkd_compile(mdHandle, MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS)) { ++#ifdef HAVE_DISCOUNT3 ++ MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, nullptr); ++ ++ mkd_flag_t* v3flags = mkd_flags(); ++ mkd_set_flag_num(v3flags, MKD_LATEX); ++ mkd_set_flag_num(v3flags, MKD_FENCEDCODE); ++ mkd_set_flag_num(v3flags, MKD_GITHUBTAGS); ++ ++ if (!mkd_compile(mdHandle, v3flags)) { ++#else ++ MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, 0); ++ ++ unsigned int flags = MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS; ++ if (!mkd_compile(mdHandle, flags)) { ++#endif + DEBUG(Q_FUNC_INFO << ", Failed to compile the markdown document"); + mkd_cleanup(mdHandle); + return; +-- +2.40.0 + diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild index c45f80b7f620..30d2be63d7c4 100644 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild @@ -72,6 +72,8 @@ BDEPEND=" sys-devel/gettext " +PATCHES=( "${FILESDIR}/${P}-discount-3.patch" ) + src_configure() { local mycmakeargs=( -DENABLE_MQTT=OFF # not packaged -- cgit v1.2.3