commit: ba96c67b4b65ef8054350cead2c4394474e4df2f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 13 14:17:43 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 13 14:24:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba96c67b
sci-visualization/labplot: drop 2.9.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-visualization/labplot/Manifest | 1 - .../labplot/files/labplot-2.9.0-discount-3.patch | 98 ---------------------- sci-visualization/labplot/labplot-2.9.0-r1.ebuild | 97 --------------------- 3 files changed, 196 deletions(-) diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest index dce5e0b4765d..6f951d4a3987 100644 --- a/sci-visualization/labplot/Manifest +++ b/sci-visualization/labplot/Manifest @@ -1,2 +1 @@ DIST labplot-2.10.1.tar.xz 23193988 BLAKE2B dbea843dcf0761eb40d9a386f8df13b45a889bf41ff1a40434b521f591fb2c776de4c474f553776f43ad3ee85224e919521efdabd853f8d0cc1c0c9ad32a4df8 SHA512 12c8b62519861255dd8cb4ecc3ad4ff34f1862b8e386a9aa97e4f3a2dd0b8989cf14b9dafcea41da2575bd57c0ef9803a15ac9347365cdeea6309dcfda4cd7da -DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 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 deleted file mode 100644 index e59c1309888d..000000000000 --- a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001 -From: Stefan Gerlach <[email protected]> -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 <[email protected]> - # 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 deleted file mode 100644 index 0b0ac52a1aad..000000000000 --- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks" -HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"; -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry" - -DEPEND=" - app-text/poppler - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=sci-libs/gsl-1.15:= - cantor? ( - >=kde-apps/cantor-19.12.0:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - hdf5? ( sci-libs/hdf5:= ) - libcerf? ( sci-libs/libcerf ) - markdown? ( app-text/discount:= ) - matio? ( sci-libs/matio:= ) - netcdf? ( sci-libs/netcdf:= ) - origin? ( sci-libs/liborigin:2 ) - root? ( - app-arch/lz4 - sys-libs/zlib - ) - serial? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - telemetry? ( kde-frameworks/kuserfeedback:5 ) -" -RDEPEND="${DEPEND}" -# not packaged: dev-qt/qtmqtt, bug 683994 -BDEPEND=" - app-alternatives/yacc - sys-devel/gettext -" - -PATCHES=( "${FILESDIR}/${P}-discount-3.patch" ) - -src_configure() { - local mycmakeargs=( - -DENABLE_MQTT=OFF # not packaged - -DENABLE_READSTAT=OFF # not packaged - -DENABLE_CANTOR=$(usex cantor) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_FITS=$(usex fits) - -DENABLE_HDF5=$(usex hdf5) - -DENABLE_LIBCERF=$(usex libcerf) - -DENABLE_DISCOUNT=$(usex markdown) - -DENABLE_MATIO=$(usex matio) - -DENABLE_NETCDF=$(usex netcdf) - -DENABLE_LIBORIGIN=$(usex origin) - -DENABLE_ROOT=$(usex root) - -DENABLE_QTSERIALPORT=$(usex serial) - $(cmake_use_find_package telemetry KUserFeedback) - -DENABLE_TESTS=$(usex test) - ) - - ecm_src_configure -}
