diff options
Diffstat (limited to 'kde-frameworks/kxmlgui')
-rw-r--r-- | kde-frameworks/kxmlgui/Manifest | 7 | ||||
-rw-r--r-- | kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch | 68 | ||||
-rw-r--r-- | kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild | 4 | ||||
-rw-r--r-- | kde-frameworks/kxmlgui/kxmlgui-5.78.0.ebuild (renamed from kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild) | 8 |
4 files changed, 8 insertions, 79 deletions
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest index ce43eab48461..8977419e319b 100644 --- a/kde-frameworks/kxmlgui/Manifest +++ b/kde-frameworks/kxmlgui/Manifest @@ -1,8 +1,7 @@ -AUX kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch 2160 BLAKE2B c467d71f6ce8d24f90aa29192e1f19d10ff8c2d290a1695259e93fb90b1f0d77ed46a2346599c8c5a540a406c55ef68a3fe8cf9b8fe40bcbdb8cca9f113df755 SHA512 4188f192ac437f6334d261f8f178dd2ca29d2ea48fa4d51e23483b2212369ee79521f098a9a51e8e8ac1ec0f861b76a96fefe5a1620149102d2d9268ca794cb3 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.74.0.tar.xz 864784 BLAKE2B d6cc88603f0036415981411bbaeca6ba7877df085d5b5095b04b7d5567d0e1f23ad3d8c8b1472a365018e9360ee4351c7523fd791d4e53ecca3e9143cc8f2b72 SHA512 98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92 DIST kxmlgui-5.77.0.tar.xz 860548 BLAKE2B c862dd9524698c5fc3f83933a20b229ad8b52c94b3b5a703f64518bd4e13543f46bfa2dcf85ed21a0d19c0d72e9efafe412f6cbf6698c14e4827ad4f38da6afa SHA512 bd0e9f0b41927f6e90b71328f5e680a9d83a9c9f502edefc78f898fcab6be3cf553409b63e117c80cc8541b7a48ceb66de49fbcc6e7c8afc33a0d9fd901512b0 -EBUILD kxmlgui-5.74.0-r2.ebuild 1357 BLAKE2B 6c6005846bf19a7183596eb941ce21234a2cb82c80dea14daa01b5a3340e1e14b3aaecea4555514bcbefbb31176c1462f2121fca823cc249ef1cf929bfb6be52 SHA512 b04f9bf2d45d1cdbd68fe46f015d24b7341b836e673d299b35d3c55688764b829206a39766e521dad0adbdf716371236ff87091f446467c8277f25aa74ecd57c -EBUILD kxmlgui-5.77.0-r1.ebuild 1385 BLAKE2B 269b77c622efe27e538c7246756649b50a01cebcd88fbfe95a073e862c0ccc6a9a7e3ce4ba9e6a54a9d9ac79f13eb978ef37609464d67b36d2417eac4a0d5a5f SHA512 9b9eda7eb3197a548d153ad42cffd8d3a37354bfba713567964bd8e62c1a8b3ae1d8bf7ad2e18534603175d4214d8aa21507f77fa2fdd3a94ec5d1890a7d295f +DIST kxmlgui-5.78.0.tar.xz 860428 BLAKE2B 4d92a748ebd107d7f6388b33b1b4cd288779866a17ac97f6899a660fe0f0b47da31dfa1d63243bd53608b89efb280095fd56bcb689edf31c159e37832277ee8a SHA512 187ed211c369b9b6195a164ed0b41ddf87397b5677e38b84f73ade1cbf62388e9665ef3d58ce6bcd7d56754a50e57ea0cbd2cf56cdde5b94fd8d8c2cc6484790 +EBUILD kxmlgui-5.77.0-r1.ebuild 1382 BLAKE2B 53102ac0e8cc851b1ed131954ba69678c942c10805505e35627873e738fe27c491294f5a1c54170ff0b716834f161a701cb1ce4a60abf80f04470e4c2187424e SHA512 092c3aa992231779e7b70e0689e441315847c49759cbfc8c46d45b03788383cf27be2b7ebe32d1203363d301ceff4ebeeb2dfb07550d9a812a659e8e7a2ed1c6 +EBUILD kxmlgui-5.78.0.ebuild 1285 BLAKE2B eae645ca1be29e1c634c026ca3e8aa6e3c56899738af069b3f69eadaf7265f304207ee78548fe9b59c55b156aba3404da380ad9125535fcde107b52f1bb0c9ea SHA512 0cb2470f04dcc4d173dbadcfeee732c293b529a4461b3fbb4883730b77b4aea8c2dabafed9b4d0e5c56156d287c56dee52d55edaa7d89172344c85885fc29202 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch deleted file mode 100644 index f49999eb6490..000000000000 --- a/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 7cefdcf3d04669978aa28481d8ea274402935374 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Mon, 10 Aug 2020 09:54:14 +0200 -Subject: [PATCH] Handle double close in main window - -After a bug fix in Qt 5.14 we now get real close events for unclosed windows -when the application closes, so we would be getting two close events breaking -our logic when when to suppress on-close dialogs. - -Suppress the real close event after we have handled our own simulated one. Also -works if there is no real close event. - -BUG: 416728 - -* Fixup after git merged the wrong commit ---- - src/kmainwindow.cpp | 8 ++++++++ - src/kmainwindow_p.h | 1 + - 2 files changed, 9 insertions(+) - -diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp -index b9bc2b6..33babb9 100644 ---- a/src/kmainwindow.cpp -+++ b/src/kmainwindow.cpp -@@ -269,6 +269,7 @@ void KMainWindowPrivate::init(KMainWindow *_q) - letDirtySettings = true; - - sizeApplied = false; -+ suppressCloseEvent = false; - } - - static bool endsWithHashNumber(const QString &s) -@@ -532,6 +533,10 @@ void KMainWindow::appHelpActivated() - void KMainWindow::closeEvent(QCloseEvent *e) - { - K_D(KMainWindow); -+ if (d->suppressCloseEvent) { -+ e->accept(); -+ return; -+ } - - // Save settings if auto-save is enabled, and settings have changed - if (d->settingsTimer && d->settingsTimer->isActive()) { -@@ -556,6 +561,9 @@ void KMainWindow::closeEvent(QCloseEvent *e) - } else { - e->ignore(); //if the window should not be closed, don't close it - } -+ // If saving session, we are processing a fake close event, and might get the real one later. -+ if (e->isAccepted() && qApp->isSavingSession()) -+ d->suppressCloseEvent = true; - } - - bool KMainWindow::queryClose() -diff --git a/src/kmainwindow_p.h b/src/kmainwindow_p.h -index 13f6f19..bdd1eb4 100644 ---- a/src/kmainwindow_p.h -+++ b/src/kmainwindow_p.h -@@ -33,6 +33,7 @@ public: - bool settingsDirty: 1; - bool autoSaveWindowSize: 1; - bool sizeApplied: 1; -+ bool suppressCloseEvent: 1; - KConfigGroup autoSaveGroup; - QTimer *settingsTimer; - QTimer *sizeTimer; --- -2.28.0 - diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild index 5a6e29e0ebbd..fe6e58394fc7 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" LICENSE="LGPL-2+" IUSE="" diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.78.0.ebuild index 405c52cf9ede..15d397e43a91 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r2.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-5.78.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ 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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" LICENSE="LGPL-2+" IUSE="" @@ -27,16 +27,14 @@ DEPEND=" =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 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-fix-multiple-tabs-popup-on-logout.patch ) - src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON |