diff options
Diffstat (limited to 'kde-apps/konsole')
-rw-r--r-- | kde-apps/konsole/Manifest | 7 | ||||
-rw-r--r-- | kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch | 73 | ||||
-rw-r--r-- | kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch | 79 | ||||
-rw-r--r-- | kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch | 49 | ||||
-rw-r--r-- | kde-apps/konsole/konsole-21.08.1.ebuild (renamed from kde-apps/konsole/konsole-21.08.0-r5.ebuild) | 11 |
5 files changed, 3 insertions, 216 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index b884d957bd57..7901c0d69ee9 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,12 +1,9 @@ AUX konsole-21.04.3-dont-close-window-while-split.patch 2592 BLAKE2B 22c438734d6e3959f965b54dd76fc683566ed17ef8d368984c5d54b9ec6f95612ab2c993f1266367933b2327e937164eb655d386dce9cd82178f229a136c5789 SHA512 641eb0010bd320868538ebb3254e5883b84e4e17d06bd0ddea961e49b00eb3f811c0a163fc50096ac4d194a53a22db5ad9d3b6c007a85a40299eab03f36ba394 AUX konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch 1960 BLAKE2B 8c13a8f2e200c07d0cb036257aae342e3b1046e55a259d2161cd2af24f788e225f661bb27e917b90081998cd7e2d290ecb609366e11bd22b0a70ae267c862356 SHA512 ad6de009a9f2d0ce39fbe13e32d4b821c5f6a96840173e26cf89e9f3b03f0f9b09bc7891d2efa457532926a3aa0f721655d549ca75d93ab5a91fed05ce07d543 AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e -AUX konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch 2818 BLAKE2B f8b8f3c9a5d709d8318e4e8a7e29eb74fde3106e2f50abeac4b535147d4fb2cc685a70e0609b1035e19c1b92aa9d4efd202b5a8b743ac32ec7a760091b41337c SHA512 18ae7cd7a52ddbe3ee1eb5899f2f177d126b7d3aa7ca030fc32abfbc13ad2bd6e76dbd9135c529f352814b474be8fbda23ff1ec563b66d12e6026681a8e440be -AUX konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch 3076 BLAKE2B c84ec4cf530973bf5eeff173a8a1f0f0e833229bd9f01f83ea658357d2fbd852923824234f0650ec485be2f3062730bfa401e7eab8569ea04e6bfe9c98f8a964 SHA512 4703e6282884e093d38cb9071fbe9b083d7b986632a3eb26fddc5bac180f92412e5fef82c1caaedf1feefefcc9df3fab30ef4cb79b254611a57b52b5eaa0bfc1 -AUX konsole-21.08.0-fix-crash-w-blur.patch 1613 BLAKE2B f4a54da701a24031f5a530896b6b4861bd90c0b4f6be9a32046582187da8dc35752e768a9f05e3492f6174990ef371a7570d556cf3e135a4c73049491d369e92 SHA512 fd600b7c3752364c311c727461627b6183e31084b5af36768f7ff2b84e024494b5ec1121202184e2301cbff72549fb99dd8c2475f749ce440ec6192ba70eed15 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8 -DIST konsole-21.08.0.tar.xz 1373652 BLAKE2B 52661bf8296cb1f64b065f32d0d6a7d4bcf689a45e54c18165b5d4bf6893b7312daa6b45418b9142042154801b34e22388d04998af7d406fed53ab20073dcc11 SHA512 7b59b43e1dd1374001570c7bc611c00c7de738cdf7030954173a8d5b901412cb5653616c12f0b85af38a48e3598bf64d6bce9ca068b520a6683f5fb7bac3c38f +DIST konsole-21.08.1.tar.xz 1374720 BLAKE2B b686def9a04b92b7de71d47fa16f0c1172baf6304dff6b0fcb3ebb11276190b1294ee77bc4245494f874bf39e33f39b5f791d96b8ea6150987ef1fb373b10f47 SHA512 ebac48f71bde793e39fc2f3c0dc39f8fc24e6f9ba8447988ee793ef33154bcbc7f97dfe863b708acc85c472e424c4190625fc8139417f4a98520c4c9a903903d EBUILD konsole-21.04.3-r3.ebuild 2043 BLAKE2B 678772cfa9534224af8933a8f00e215f05e7c24677ee4df2f747e77289b25a8f10710ace4904b8fc14b39a2ac383c3939b91dd3a8c62b8464e3d4c69122b5284 SHA512 fc01e7d0efbf1256c679101339f364ca3dcbc7db98f4d60bf41ae6a693367613a9570b677da7354dbbb208c3cb9af66f5e36c4422f25681a244fe9d36fc1e814 EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991 -EBUILD konsole-21.08.0-r5.ebuild 2211 BLAKE2B 828b15ba1f38093ba953df17203f0c0c86672466b0ac47151835270762b1393e287ad844973ed4441789d6df6f2904cf776db97c3e789f77c8b520f3e460e2ee SHA512 8d1934ffeb022b817064a3c5a94a9bc4abd02433c5689371469045bd4a9f08000cca79ce5ef355bbbbc5ddbbb63ec9f0763ed25ede4b33282646180d49d8b4e1 +EBUILD konsole-21.08.1.ebuild 1693 BLAKE2B 6b601b18eb9e4100732886a54ae34a3a87efc548e861e0b8e65fd262228ffbb900a15c6a782d23960d5475774bec0ca02c090274c358f83796c4579f4e6e2843 SHA512 289aa49b2c9f16b6c878755cd4c2cc3b835cd2e1db7c8eaf53f9ba0cfd2805593e8574be683856e12bbaf608ff8b16a625ab978b7c1225aa9bffb016d949eee6 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369 diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch deleted file mode 100644 index fc62466ea627..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch +++ /dev/null @@ -1,73 +0,0 @@ -From fb7f838fd3138a39aea3bcb2e91f923741587137 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Thu, 29 Jul 2021 18:44:07 +0200 -Subject: [PATCH] Fix KXmlGUI toolbars; and Konsole MainWindow size - -Call setupGUI(), which will call createGUI (since we set the -KXmlGuiWindow::Create flag), omit the StatusBar flag since we don't have a -statusbar and don't want the "Show StatusBar" menu action. - -TabbedViewContainer::sizeHint() calculates an optimum size for itself, -including the sizes of its child widgets; added in efb621d091c05f11 by -Mariusz Glebocki; following the code: -MainWindow creates a ViewManager -ViewManager creates a TabbedViewContainer and then a TerminalDisplay - -which means that the first time TabbedViewContainer::sizeHint() is called -the TerminalDisplay widget size is 0, then TabbedViewContainer::sizeHint() -would return 0. - -Which is why calling resize() in MainWindow was delayed to the showEvent(), -(and even delayed more by a QTimer::singleShot() call in Application), -at which point all the child widgets have been created and -MainWindow::sizeHint() (which logically takes into account the sizeHint() -of its child widgets) would return a sensible size. - -CCBUG: 430036 -CCBUG: 439339 -BUG: 436471 - - -(cherry picked from commit 090356661c92bfedeeeaf6f4f77d294facb3d8c6) ---- - src/MainWindow.cpp | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index c67acf8b9..a4b36b61d 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -131,8 +131,10 @@ MainWindow::MainWindow() : - // in terminal applications - KAcceleratorManager::setNoAccel(menuBar()); - -- // create menus -- createGUI(); -+ constexpr KXmlGuiWindow::StandardWindowOptions guiOpts = ToolBar | Keys | Save | Create; -+ const QString xmlFile = componentName() + QLatin1String("ui.rc"); // Typically "konsoleui.rc" -+ // The "Create" flag will make it call createGUI() -+ setupGUI(guiOpts, xmlFile); - - // remember the original menu accelerators for later use - rememberMenuAccelerators(); -@@ -945,9 +947,14 @@ void MainWindow::showEvent(QShowEvent *event) - menuBar()->setVisible(_menuBarInitialVisibility); - _toggleMenuBarAction->setChecked(_menuBarInitialVisibility); - _menuBarInitialVisibilityApplied = true; -- if (!KonsoleSettings::saveGeometryOnExit()) { -- resize(sizeHint()); -- } -+ } -+ -+ if (!KonsoleSettings::saveGeometryOnExit()) { -+ // Delay resizing to here, so that the other parts of the UI -+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc) -+ // have been created and TabbedViewContainer::sizeHint() returns -+ // a usuable size. -+ resize(sizeHint()); - } - - // Call parent method --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch deleted file mode 100644 index 48fe1be666af..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c78edfbac49852cec40efd5cbe73c341bc06c5ab Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Thu, 29 Jul 2021 18:45:45 +0200 -Subject: [PATCH] Fix MainWindow size when there is no saved size - -The very first time a user runs Konsole, where is no konsolerc file in $HOME, -there is no saved size to restore, instead use the sizeHint(), which ideally -will be the size set in the default profile (based on lines/columns setting). - -CCBUG: 437791 ---- - src/MainWindow.cpp | 21 +++++++++++++++------ - src/MainWindow.h | 1 + - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index a4b36b61d..9b025c8fe 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -70,13 +70,22 @@ MainWindow::MainWindow() : - _menuBarInitialVisibility(true), - _menuBarInitialVisibilityApplied(false) - { -- if (!KonsoleSettings::saveGeometryOnExit()) { -+ KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -+ KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow")); -+ const bool isGroup = cg.exists(); -+ if (isGroup) { -+ const QString stateConfig = cg.readEntry(QStringLiteral("State")); -+ -+ // If "stateConfig" is empty then this is the very first run, -+ // i.e. no konsolerc file in $HOME -+ _isSavedUiState = !stateConfig.isEmpty(); -+ } -+ -+ if (isGroup && !KonsoleSettings::saveGeometryOnExit()) { - // If we are not using the global Konsole save geometry on exit, - // remove all geometry data from [MainWindow] in Konsolerc, so KWin will - // manage it directly -- KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -- KConfigGroup group = konsoleConfig->group("MainWindow"); -- QMap<QString, QString> configEntries = group.entryMap(); -+ QMap<QString, QString> configEntries = cg.entryMap(); - QMapIterator<QString, QString> i(configEntries); - - while (i.hasNext()) { -@@ -93,7 +102,7 @@ MainWindow::MainWindow() : - || i.key().contains(QLatin1String(" YPosition")) - #endif - ) { -- group.deleteEntry(i.key()); -+ cg.deleteEntry(i.key()); - } - } - } -@@ -949,7 +958,7 @@ void MainWindow::showEvent(QShowEvent *event) - _menuBarInitialVisibilityApplied = true; - } - -- if (!KonsoleSettings::saveGeometryOnExit()) { -+ if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) { - // Delay resizing to here, so that the other parts of the UI - // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc) - // have been created and TabbedViewContainer::sizeHint() returns -diff --git a/src/MainWindow.h b/src/MainWindow.h -index a80674012..876a81d71 100644 ---- a/src/MainWindow.h -+++ b/src/MainWindow.h -@@ -200,6 +200,7 @@ private: - bool _menuBarInitialVisibility; - bool _menuBarInitialVisibilityApplied; - bool _blurEnabled = false; -+ bool _isSavedUiState = false; - }; - } - --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch deleted file mode 100644 index b0c7193eda84..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f24dd6acc28393ba6f731be1360731c01a9a1ef0 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Fri, 16 Jul 2021 21:37:51 +0200 -Subject: [PATCH] Fix crash when setting blur effect - -Basically to use QWidget::windowHandle() to get a QWindow*, we need to first -set the Qt::WA_NativeWindow attribute on the QWidget. See: -https://phabricator.kde.org/D23108 - -BUG: 439871 -FIXED-IN: 21.12 -(cherry picked from commit a6b2bd539162b39191e827566b656bd97266ffad) ---- - src/MainWindow.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index ed5d8cc3d..c67acf8b9 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -56,6 +56,8 @@ - #include "terminalDisplay/TerminalDisplay.h" - #include "widgets/ViewContainer.h" - -+#include <konsoledebug.h> -+ - using namespace Konsole; - - MainWindow::MainWindow() : -@@ -889,7 +891,15 @@ void MainWindow::setBlur(bool blur) - #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0) - KWindowEffects::enableBlurBehind(winId(), blur); - #else -- KWindowEffects::enableBlurBehind(windowHandle(), blur); -+ // Set the WA_NativeWindow attribute to force the creation of the QWindow. -+ // Without this QWidget::windowHandle() returns 0. -+ // See https://phabricator.kde.org/D23108 -+ setAttribute(Qt::WA_NativeWindow); -+ if (QWindow *window = windowHandle()) { -+ KWindowEffects::enableBlurBehind(window, blur); -+ } else { -+ qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled."; -+ } - #endif - } - } --- -GitLab - diff --git a/kde-apps/konsole/konsole-21.08.0-r5.ebuild b/kde-apps/konsole/konsole-21.08.1.ebuild index 22a1835a1ffc..88085c295f8b 100644 --- a/kde-apps/konsole/konsole-21.08.0-r5.ebuild +++ b/kde-apps/konsole/konsole-21.08.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="true" @@ -50,15 +50,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933 - "${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 808510 - "${FILESDIR}/${PN}-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598 - "${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1 - "${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339 - "${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791 -) - src_configure() { local mycmakeargs=( $(cmake_use_find_package X X11) |