summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-08-19 05:17:32 +0000
committer Eric Hameleers <alien@slackware.com>2021-08-19 11:59:58 +0200
commitcbe41bb716d11b2258c713cb0a8001e30d57a784 (patch)
treef349daeac81a06077e935056c5432888dd015c66 /source/kde/kde/patch
parent4dd4f47b2c102c8bc2fbb9403eb80808ea4c7b29 (diff)
downloadcurrent-cbe41bb716d11b2258c713cb0a8001e30d57a784.tar.gz
current-cbe41bb716d11b2258c713cb0a8001e30d57a784.tar.xz
Thu Aug 19 05:17:32 UTC 202120210819051732
a/aaa_libraries-15.0-x86_64-9.txz: Rebuilt. Fixed wrong version of libasound.so.2.0.0. Thanks to Eduardo Charquero and PiterPunk. a/kernel-firmware-20210818_c46b8c3-noarch-1.txz: Upgraded. a/kernel-generic-5.13.12-x86_64-1.txz: Upgraded. a/kernel-huge-5.13.12-x86_64-1.txz: Upgraded. a/kernel-modules-5.13.12-x86_64-1.txz: Upgraded. d/kernel-headers-5.13.12-x86-1.txz: Upgraded. k/kernel-source-5.13.12-noarch-1.txz: Upgraded. kde/konsole-21.08.0-x86_64-2.txz: Rebuilt. Patched to fix konsole size and toolbars. Thanks to alienBOB and PiterPunk. n/bind-9.16.20-x86_64-1.txz: Upgraded. This update fixes bugs and the following security issue: An assertion failure occurred when named attempted to send a UDP packet that exceeded the MTU size, if Response Rate Limiting (RRL) was enabled. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-25218 (* Security fix *) isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/konsole.patch3
-rw-r--r--source/kde/kde/patch/konsole/konsole_fix_toolbar.patch69
2 files changed, 72 insertions, 0 deletions
diff --git a/source/kde/kde/patch/konsole.patch b/source/kde/kde/patch/konsole.patch
new file mode 100644
index 000000000..34dfbe26c
--- /dev/null
+++ b/source/kde/kde/patch/konsole.patch
@@ -0,0 +1,3 @@
+# Fix KXmlGUI toolbars; and Konsole MainWindow size - https://invent.kde.org/utilities/konsole/-/merge_requests/457
+cat $CWD/patch/konsole/konsole_fix_toolbar.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch b/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch
new file mode 100644
index 000000000..1b31fd729
--- /dev/null
+++ b/source/kde/kde/patch/konsole/konsole_fix_toolbar.patch
@@ -0,0 +1,69 @@
+diff -Naur konsole-21.08.0.orig/src/MainWindow.cpp konsole-21.08.0.new/src/MainWindow.cpp
+--- konsole-21.08.0.orig/src/MainWindow.cpp 2021-08-04 18:48:59.000000000 -0300
++++ konsole-21.08.0.new/src/MainWindow.cpp 2021-08-18 00:11:52.801474543 -0300
+@@ -56,6 +56,8 @@
+ #include "terminalDisplay/TerminalDisplay.h"
+ #include "widgets/ViewContainer.h"
+
++#include <konsoledebug.h>
++
+ using namespace Konsole;
+
+ MainWindow::MainWindow() :
+@@ -103,7 +105,7 @@
+
+ // create view manager
+ _viewManager = new ViewManager(this, actionCollection());
+- connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close);
++ connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close);
+ connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this,
+ &Konsole::MainWindow::activeViewChanged);
+ connect(_viewManager, &Konsole::ViewManager::unplugController, this,
+@@ -129,8 +131,10 @@
+ // 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();
+@@ -889,7 +893,15 @@
+ #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
+ }
+ }
+@@ -935,9 +947,14 @@
+ 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