summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-05-16 14:57:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-05-16 16:00:18 +0200
commitceff5f1dd56de1b5a1ae444fdfbad4ed69d7c7c8 (patch)
treeae7212f3eb47b4ce2b8937b47e56eaa835429e3f /kde-frameworks/kxmlgui
parentwww-apps/nextcloud: 16.0.1, 15.0.8, 14.0.11 bumps (diff)
downloadgentoo-ceff5f1dd56de1b5a1ae444fdfbad4ed69d7c7c8.tar.gz
gentoo-ceff5f1dd56de1b5a1ae444fdfbad4ed69d7c7c8.tar.bz2
gentoo-ceff5f1dd56de1b5a1ae444fdfbad4ed69d7c7c8.zip
kde-frameworks: Drop KDE Frameworks 5.54.0
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'kde-frameworks/kxmlgui')
-rw-r--r--kde-frameworks/kxmlgui/Manifest1
-rw-r--r--kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch79
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild54
3 files changed, 0 insertions, 134 deletions
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 3a60569f75bc..0666d04df74f 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,3 +1,2 @@
-DIST kxmlgui-5.54.0.tar.xz 869308 BLAKE2B f9f19452444074e2ce78f7a8c902b9703e0532974659ac5a34898debe52cd6dd05752c4923a9d1afe9606e628cb696ff59f0a5b78ad6d13f75c077b9bbde35e9 SHA512 bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5
DIST kxmlgui-5.57.0.tar.xz 870632 BLAKE2B 27e16e66f3bb1eb82863b470a6635aef79f6e131af3f3dd74f06346dd5e5c8a471da9c081fa4b56428a37691728a26bffd129d17ad11df16d931078addb81ac3 SHA512 30ab6e8734a03d387880e7e9b4f33f4dda2d3b778d7689093575c03ddeee1e640d1b0ffc17cc8eb82c3fb49eaeca422bc7e05b28838e9ebe5f725e08e4fb625b
DIST kxmlgui-5.58.0.tar.xz 869828 BLAKE2B 93ccca5b0fa12e37f86ef3ca3dc52f2955ece71583ac32db7ee077160c95d095170bc1ee3ebd9bade730112eec807259bb1ee9e9849040f4f1ac4300d267cfda SHA512 22d718f49b5d9b4caca4fc38be4fac42c21d2ff481d0fa0d821df0223b255a79ac27dfd83773a8c0d24b9db79bbc0d486ada7c73d44ce1aeae35792ab4551be6
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
deleted file mode 100644
index 0882d5f09f9c..000000000000
--- a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 02b523bad09aab062355e46771889b0f3709692f Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 12 Jan 2019 18:39:33 +0100
-Subject: Make KCheckAccelerators less invasive for apps that don't directly
- link to KXmlGui
-
-Summary: BUGS: 337491
-
-Test Plan:
-Ran qtcreator and it no longer has the & in Details
-Added some debug and checked that okular still gets the code called
-
-Reviewers: anthonyfieroni
-
-Reviewed By: anthonyfieroni
-
-Subscribers: davidedmundson, anthonyfieroni, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D18204
----
- src/kcheckaccelerators.cpp | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/kcheckaccelerators.cpp b/src/kcheckaccelerators.cpp
-index 13fc012..e08447d 100644
---- a/src/kcheckaccelerators.cpp
-+++ b/src/kcheckaccelerators.cpp
-@@ -80,10 +80,44 @@ public Q_SLOTS:
-
- static void startupFunc()
- {
-- // Call initiateIfNeeded once we're in the event loop
-- // This is to prevent using KSharedConfig before main() can set the app name
-+ // Static because in some cases this is called multiple times
-+ // but if an application had any of the bad cases we always want
-+ // to skip the check
-+ static bool doCheckAccelerators = true;
-+
-+ if (!doCheckAccelerators) {
-+ return;
-+ }
-+
- QCoreApplication *app = QCoreApplication::instance();
-+ if (!app) {
-+ // We're being loaded by something that doesn't have a QCoreApplication
-+ // this would probably crash at some later point since we do use qApp->
-+ // quite a lot, so skip the magic
-+ doCheckAccelerators = false;
-+ return;
-+ }
-+
-+ if (!QCoreApplication::startingUp()) {
-+ // If the app has already started, this means we're not being run as part of
-+ // qt_call_pre_routines, which most probably means that we're being run as part
-+ // of KXmlGui being loaded as part of some plugin of the app, so don't
-+ // do any magic
-+ doCheckAccelerators = false;
-+ return;
-+ }
-+
-+ if (!QCoreApplication::eventDispatcher()) {
-+ // We are called with event dispatcher being null when KXmlGui is being loaded
-+ // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular)
-+ // For apps that don't link directly to KXmlGui do not do the accelerator magic
-+ doCheckAccelerators = false;
-+ return;
-+ }
-+
- KCheckAcceleratorsInitializer *initializer = new KCheckAcceleratorsInitializer(app);
-+ // Call initiateIfNeeded once we're in the event loop
-+ // This is to prevent using KSharedConfig before main() can set the app name
- QMetaObject::invokeMethod(initializer, "initiateIfNeeded", Qt::QueuedConnection);
- }
-
---
-cgit v1.1
-
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
deleted file mode 100644
index 81ce23d344dc..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-# slot op: includes QtCore/private/qlocale_p.h
-RDEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_qt_dep qtcore '' '' '5=')
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork 'ssl')
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- attica? ( $(add_frameworks_dep attica) )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kcheckaccelerators.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package attica KF5Attica)
- )
-
- kde5_src_configure
-}
-
-src_test() {
- # Files are missing; whatever. Bugs 650290, 668198
- local myctestargs=(
- -E "(ktoolbar_unittest|kxmlgui_unittest)"
- )
-
- kde5_src_test
-}