# HG changeset patch # User gabriel # Date 1610529028 0 # Node ID bb9bed9cdc04289f35b58238270fdaf4b77defa9 # Parent 8c829ec67afe61951dad9ac688779b619278af27 Remove test diff -r 8c829ec67afe -r bb9bed9cdc04 kde-frameworks/kxmlgui/Manifest --- a/kde-frameworks/kxmlgui/Manifest Wed Jan 13 08:55:17 2021 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -AUX kxmlgui-5.77.0-fix-key-recording.patch 929 BLAKE2B c880e82e443f2bc4ca3df5a358843322dab68c2b47f075f5b25aaa9f9a5ad08820ecf9162c23d5595898ba15af3117538268a8db26cc0cd53bc3e43c822abf2e SHA512 66c5e6dcf10742c947b0da909edb762346e55111769c6481c0820bf45b8ccc5c4af8fe61a1f76072ff33b77d62c981f419555709348b49c68c2e36b76c3d3b78 -AUX kxmlgui-5.77.0-no-kwindowsystem.patch 1591 BLAKE2B a7034d980cd0c6106b87b3bf33fc719552af846648f3139e1604a4314e5aea6273c5dec73026dc3815e90f7c4355ad457e5dad99b65bbcac4df193785e7b1a36 SHA512 6395aaf426ac1ccde9f9cd14e296f92f00d8540e5a753ececa7cded09229a9131c733081e1d9d1a93fd03948eb2a9a4c63e0785e8d1c44a9d072674254694ac3 -DIST kxmlgui-5.77.0.tar.xz 860548 BLAKE2B c862dd9524698c5fc3f83933a20b229ad8b52c94b3b5a703f64518bd4e13543f46bfa2dcf85ed21a0d19c0d72e9efafe412f6cbf6698c14e4827ad4f38da6afa SHA512 bd0e9f0b41927f6e90b71328f5e680a9d83a9c9f502edefc78f898fcab6be3cf553409b63e117c80cc8541b7a48ceb66de49fbcc6e7c8afc33a0d9fd901512b0 -EBUILD kxmlgui-5.77.0-r2.ebuild 1382 BLAKE2B 53102ac0e8cc851b1ed131954ba69678c942c10805505e35627873e738fe27c491294f5a1c54170ff0b716834f161a701cb1ce4a60abf80f04470e4c2187424e SHA512 092c3aa992231779e7b70e0689e441315847c49759cbfc8c46d45b03788383cf27be2b7ebe32d1203363d301ceff4ebeeb2dfb07550d9a812a659e8e7a2ed1c6 diff -r 8c829ec67afe -r bb9bed9cdc04 kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch --- a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch Wed Jan 13 08:55:17 2021 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -From 1bd9ac05b0eed3582937829150b31ea48fd95bb0 Mon Sep 17 00:00:00 2001 -From: Weng Xuetian -Date: Thu, 17 Dec 2020 11:12:40 -0800 -Subject: [PATCH] Fix key recording by setWindow before capture starts. - -It is common that during the construction of widget, it is not yet added to -a window. Thus windowHandle will simply return null in this case. Always set -the window to before the capture starts. - -BUG: 430388 ---- - src/kkeysequencewidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp -index a51c6cc..c1f5c42 100644 ---- a/src/kkeysequencewidget.cpp -+++ b/src/kkeysequencewidget.cpp -@@ -493,6 +493,7 @@ void KKeySequenceWidget::setCheckActionCollections(const QListrecorder->setWindow(window()->windowHandle()); - d->recorder->startRecording(); - } - --- -GitLab - diff -r 8c829ec67afe -r bb9bed9cdc04 kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-no-kwindowsystem.patch --- a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-no-kwindowsystem.patch Wed Jan 13 08:55:17 2021 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -From ffd68935c2ef48fc60cbbb1b4159d49a018e597b Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Thu, 10 Dec 2020 17:22:21 +0100 -Subject: [PATCH] Remove unused KWindowSystem dependency - -Since -https://invent.kde.org/frameworks/kxmlgui/-/commit/28a80aba1463b83ea8845ff22566a2110c8fb041 -it's not needed any more ---- - CMakeLists.txt | 1 - - src/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7ffac4..0e516c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,6 @@ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5Attica ${KF5_DEP_VERSION}) - set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API" - PURPOSE "Support for Get Hot New Stuff in KXMLGUI" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e965d8d..3875a6b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -110,7 +110,6 @@ PRIVATE - KF5::ItemViews #KWidgetItemDelegate in KAboutApplicationPersonListDelegate - KF5::I18n #i18n and i18nc in many places - KF5::IconThemes #KIconLoader and KIconThemes in KToolBar -- KF5::WindowSystem #KKeyServer in kkeysequencewidget - ${XMLGUI_EXTRA_LIBS} - ) - if (TARGET Qt5::DBus) --- -GitLab - diff -r 8c829ec67afe -r bb9bed9cdc04 kde-frameworks/kxmlgui/kxmlgui-5.77.0-r2.ebuild --- a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r2.ebuild Wed Jan 13 08:55:17 2021 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -LICENSE="LGPL-2+" -IUSE="" - -# slot op: includes QtCore/private/qlocale_p.h -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-no-kwindowsystem.patch - "${FILESDIR}"/${P}-fix-key-recording.patch -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON - ) - - ecm_src_configure -} - -src_test() { - # Files are missing; whatever. Bugs 650290, 668198 - local myctestargs=( - -E "(ktoolbar_unittest|kxmlgui_unittest)" - ) - - ecm_src_test -}