diff options
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/Manifest.gz | bin | 38002 -> 38001 bytes | |||
| -rw-r--r-- | kde-apps/konsole/Manifest | 3 | ||||
| -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/konsole-21.08.0-r2.ebuild (renamed from kde-apps/konsole/konsole-21.08.0-r1.ebuild) | 2 |
4 files changed, 77 insertions, 1 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex d7a667ab630e..86053de31875 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 40ad18b14454..4a5e9e787234 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,8 +1,9 @@ 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-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 EBUILD konsole-21.04.3-r1.ebuild 1876 BLAKE2B 42e78abae3fe19c1f7fcaf1bfeca2598f8d0154702cb23b366450482c3e4d3c4d9ff35e88b4c927b1433e6c87df71ca85297364baed3765d307986856fc4f462 SHA512 42ad313c1a56514934ece7efaf1a6c682eafa06e5cd9906188e4ef7c1aafb4333d0630f3b45fe9b9afd3aa05c57c98d755209e7e5645a32fc0f194873da71f6c EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991 -EBUILD konsole-21.08.0-r1.ebuild 1854 BLAKE2B a93d607c6914115ad367d3d9b27b3b81d30b5b3d7d783e520bc598680f78e194bd42ba33831d000ba59914f642e612a010f4b91745ca69516b54f85ebe9e1335 SHA512 e4a1e4851f8aec3aaa9b519311b8a912ed2190eafbe986f7f2db0bf6bd1bb4c88ea0d47dfd12be475ccac7593c9483e70f0fd9092ef58dc9992136de828a78d7 +EBUILD konsole-21.08.0-r2.ebuild 1983 BLAKE2B 0dddca8c70ff7f09171115f581325f4768eae8f73a747fdef9422ca50ad2144ad48df6e4ef527777d999d7a06590475ae38a057bd42c50cc55acd9676a809fd6 SHA512 f2a67ea4f677f1e46bfe64631b9e24ea23347eb803aca699568861ab09df0674a027b78586c45170bb85127a07cde1e278dc2c2e76eb7da75bfae2ea63f59d55 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 new file mode 100644 index 000000000000..fc62466ea627 --- /dev/null +++ b/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch @@ -0,0 +1,73 @@ +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/konsole-21.08.0-r1.ebuild b/kde-apps/konsole/konsole-21.08.0-r2.ebuild index 4095d9ac5f9e..00032973af8f 100644 --- a/kde-apps/konsole/konsole-21.08.0-r1.ebuild +++ b/kde-apps/konsole/konsole-21.08.0-r2.ebuild @@ -53,6 +53,8 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933 "${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1 + # KDE-bugs 430036, 439339; backport pending for 21.08 branch + "${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" ) src_configure() { |