diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-11-06 17:34:22 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2025-11-06 17:50:40 +0100 |
| commit | 592dd62b9af3db7077ee7ad25b2619729fa9de6c (patch) | |
| tree | a1a8be831652010d61a9e0adee741883af0c1602 | |
| parent | 38644e606df06c1326bcfe495119f4a52f526b1d (diff) | |
| download | kde-592dd62b9af3db7077ee7ad25b2619729fa9de6c.tar.gz kde-592dd62b9af3db7077ee7ad25b2619729fa9de6c.tar.bz2 kde-592dd62b9af3db7077ee7ad25b2619729fa9de6c.zip | |
kde-apps/okular: drop 25.08.49.9999
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-apps/okular/files/okular-25.08.1-obsolete-activities.patch | 90 | ||||
| -rw-r--r-- | kde-apps/okular/okular-25.08.49.9999.ebuild | 99 |
2 files changed, 0 insertions, 189 deletions
diff --git a/kde-apps/okular/files/okular-25.08.1-obsolete-activities.patch b/kde-apps/okular/files/okular-25.08.1-obsolete-activities.patch deleted file mode 100644 index bad33bf8f25..00000000000 --- a/kde-apps/okular/files/okular-25.08.1-obsolete-activities.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0af5f24b742d35e65264fc483584c6980069a5d2 Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <christoph@cullmann.dev> -Date: Thu, 11 Sep 2025 14:32:57 +0200 -Subject: [PATCH] remove activities API call as KRecentFiles::add handles it - internally - ---- - CMakeLists.txt | 6 ------ - autotests/CMakeLists.txt | 4 ++-- - shell/CMakeLists.txt | 5 ----- - shell/shell.cpp | 6 ------ - 4 files changed, 2 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03e1b9d199..a822103796 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -206,12 +206,6 @@ if(NOT WIN32 AND NOT ANDROID AND NOT APPLE AND NOT HAIKU) - else() - find_package(Qt6Gui REQUIRED COMPONENTS Private) - endif() -- find_package(PlasmaActivities REQUIRED) -- set_package_properties("PlasmaActivities" PROPERTIES -- DESCRIPTION "Activities interface library" -- URL "https://invent.kde.org/plasma/plasma-activities" -- PURPOSE "Required for Activities integration." -- ) - set(HAVE_X11 TRUE) - else() - set(HAVE_X11 FALSE) -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index 5736f6009a..9da8c38f08 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -118,10 +118,10 @@ ecm_add_test(check_distinguished_name_parser.cpp - TEST_NAME "distinguishednameparser" - LINK_LIBRARIES Qt6::Test) - --if(PlasmaActivities_FOUND AND BUILD_DESKTOP) -+if(BUILD_DESKTOP) - ecm_add_test(mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp ../shell/welcomescreen.cpp ../shell/recentitemsmodel.cpp closedialoghelper.cpp - TEST_NAME "mainshelltest" -- LINK_LIBRARIES Qt6::Test Plasma::Activities okularpart okularcore -+ LINK_LIBRARIES Qt6::Test okularpart okularcore - ) - target_compile_definitions(mainshelltest PRIVATE OKULAR_BINARY="$<TARGET_FILE:okular>") - -diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt -index 7fe88349cc..3a1abe7ffc 100644 ---- a/shell/CMakeLists.txt -+++ b/shell/CMakeLists.txt -@@ -30,11 +30,6 @@ target_link_libraries(okular KF6::I18n KF6::Parts KF6::WindowSystem KF6::Crash K - if (TARGET Qt6::DBus) - target_link_libraries(okular Qt6::DBus) - endif() --if(TARGET Plasma::Activities) -- target_compile_definitions(okular PUBLIC -DWITH_KACTIVITIES=1) -- target_link_libraries(okular Plasma::Activities) --endif() -- - if (HAVE_X11) - target_link_libraries(okular Qt6::GuiPrivate) - endif() -diff --git a/shell/shell.cpp b/shell/shell.cpp -index 72240737e7..55d9ccc0a3 100644 ---- a/shell/shell.cpp -+++ b/shell/shell.cpp -@@ -53,9 +53,6 @@ - #include <QTabBar> - #include <QTabWidget> - #include <QTimer> --#ifdef WITH_KACTIVITIES --#include <PlasmaActivities/ResourceInstance> --#endif - - #include <kio_version.h> - #include <kxmlgui_version.h> -@@ -489,9 +486,6 @@ void Shell::openUrl(const QUrl &url, const QString &serializedOptions) - const bool isstdin = url.fileName() == QLatin1String("-") || url.scheme() == QLatin1String("fd"); - if (!isstdin) { - if (openOk) { --#ifdef WITH_KACTIVITIES -- KActivities::ResourceInstance::notifyAccessed(url); --#endif - m_recent->addUrl(url); - } else { - m_recent->removeUrl(url); --- -GitLab - diff --git a/kde-apps/okular/okular-25.08.49.9999.ebuild b/kde-apps/okular/okular-25.08.49.9999.ebuild deleted file mode 100644 index 8b6f8bc6923..00000000000 --- a/kde-apps/okular/okular-25.08.49.9999.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2025 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=6.16.0 -QTMIN=6.9.1 -inherit ecm gear.kde.org xdg - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="" -IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff" - -# slot op: Uses Qt6::CorePrivate -DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-apps/libkexiv2-${PVCUT}:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kcolorscheme-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kpty-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/threadweaver-${KFMIN}:6 - media-libs/freetype - virtual/zlib:= - crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - markdown? ( >=app-text/discount-2.2.7-r1:= ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 ) - pdf? ( >=app-text/poppler-24.10.0[nss,qt6] ) - phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) - postscript? ( app-text/libspectre ) - share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) - speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) - tiff? ( media-libs/tiff:= ) -" -RDEPEND="${DEPEND} - >=kde-frameworks/kimageformats-${KFMIN}:6 - qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # downstream; avoid same-name entry - "${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream - "${FILESDIR}/${PN}-25.08.1-obsolete-activities.patch" # bug 824546; in git master -) - -src_configure() { - local mycmakeargs=( - -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;" - -DOKULAR_UI=$(usex qml "both" "desktop") - $(cmake_use_find_package crypt KF6Wallet) - $(cmake_use_find_package djvu DjVuLibre) - $(cmake_use_find_package epub EPub) - $(cmake_use_find_package markdown Discount) - $(cmake_use_find_package mobi QMobipocket6) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package phonon Phonon4Qt6) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package share KF6Purpose) - $(cmake_use_find_package speech Qt6TextToSpeech) - $(cmake_use_find_package tiff TIFF) - ) - ecm_src_configure -} - -src_test() { - # mainshelltest hangs, bug #603116 - # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 - # signunsignedfieldtest fails, whatever. bug #852749 - local myctestargs=( - -E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)" - ) - - ecm_src_test -} |
