diff options
author | 2023-07-24 13:26:42 +0200 | |
---|---|---|
committer | 2023-07-24 15:27:14 +0200 | |
commit | aa1694c85cd4388d11c000d852ec509a6c5e8a08 (patch) | |
tree | ffe0a03eca6ae4e6905ebf76aa4632aa5f489453 /kde-apps/okular | |
parent | kde-apps/libksane: drop 22.12.3 (diff) | |
download | gentoo-aa1694c85cd4388d11c000d852ec509a6c5e8a08.tar.gz gentoo-aa1694c85cd4388d11c000d852ec509a6c5e8a08.tar.bz2 gentoo-aa1694c85cd4388d11c000d852ec509a6c5e8a08.zip |
kde-apps/okular: drop 22.12.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/okular')
-rw-r--r-- | kde-apps/okular/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-22.12.2-discount-3.patch | 47 | ||||
-rw-r--r-- | kde-apps/okular/okular-22.12.3.ebuild | 110 |
3 files changed, 0 insertions, 158 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index e0a7903d6dc9..2fd776a2d2cc 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,3 +1,2 @@ -DIST okular-22.12.3.tar.xz 8382200 BLAKE2B fa452128e23cc63dc937016be4bb07ee99ab8bb3d73c4708e093a049bf796348036ecafc02036534a22df0386ac6dc25d01c462418d0f2b762d62e770021f368 SHA512 5aefab20912e91996ca971f147a46aafbdab766f2efb7dfa60c70f7d3ff7ac79daf53f9c0f695d8125ff028114cfe5332fc14c75f1d989745a24457d24ded04a DIST okular-23.04.2.tar.xz 8478352 BLAKE2B 37b145703827704f197af3393250aee8d4b8784365ea299e94a437a82de822b31d68447a2bb1ced0deb04cad6391183a4989864db3f36e3feedbfd6ded2076d3 SHA512 8140617dc04d1dfafc50de6598e73b977c47f82abcd7d6a275a8de716b54028d6fddfb45c306e2a239b128a475ab3467229742a346b61fa3ce932ba6f1657591 DIST okular-23.04.3.tar.xz 8480932 BLAKE2B 9aa13206c11b985abdfa2f56d6d6308161fd9351cc0ea550b3084327a15537c9bff2fd7d2c8b9d2fb432cb1c68ae972581faa33007834498cd8ed6092e6de052 SHA512 154b95875cee592ac75fb35e1f2df196897491e9ec96442be259e0e81954ac07edc6ae264e6d283afb3206e0d1938814589d7dfe7cc9e1252b06aadca33690a3 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 deleted file mode 100644 index e9fef2679adb..000000000000 --- a/kde-apps/okular/files/okular-22.12.2-discount-3.patch +++ /dev/null @@ -1,47 +0,0 @@ -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.3.ebuild b/kde-apps/okular/okular-22.12.3.ebuild deleted file mode 100644 index ae58524bbf64..000000000000 --- a/kde-apps/okular/okular-22.12.3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.101.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm gear.kde.org - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" - -# slot op: Uses Qt5::CorePrivate -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjs-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - media-libs/freetype - >=media-libs/phonon-4.11.0 - sys-libs/zlib - crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] - >=kde-apps/libkexiv2-${PVCUT}:5 - ) - markdown? ( >=app-text/discount-2.2.7-r1:= ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) - plucker? ( media-libs/libjpeg-turbo:= ) - postscript? ( app-text/libspectre ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - tiff? ( media-libs/tiff:= ) -" -RDEPEND="${DEPEND} - image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - qml? ( - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -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() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON - -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON - -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;" - -DOKULAR_UI=$(usex qml "both" "desktop") - $(cmake_use_find_package crypt KF5Wallet) - $(cmake_use_find_package djvu DjVuLibre) - $(cmake_use_find_package epub EPub) - $(cmake_use_find_package image-backend KF5KExiv2) - $(cmake_use_find_package markdown Discount) - $(cmake_use_find_package mobi QMobipocket) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package plucker JPEG) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package speech Qt5TextToSpeech) - $(cmake_use_find_package tiff TIFF) - ) - ecm_src_configure -} - -src_test() { - # mainshelltest hangs, chmgeneratortest fails, bug #603116 - # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 - # signunsignedfieldtest fails, whatever. bug #852749 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)" - ) - - ecm_src_test -} |