summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_libraries/aaa_libraries.SlackBuild2
-rw-r--r--source/k/kernel-configs/config-generic-5.13.12 (renamed from source/k/kernel-configs/config-generic-5.13.11)2
-rw-r--r--source/k/kernel-configs/config-generic-5.13.12.x64 (renamed from source/k/kernel-configs/config-generic-5.13.11.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.13.12-smp (renamed from source/k/kernel-configs/config-generic-smp-5.13.11-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.13.12 (renamed from source/k/kernel-configs/config-huge-5.13.11)2
-rw-r--r--source/k/kernel-configs/config-huge-5.13.12.x64 (renamed from source/k/kernel-configs/config-huge-5.13.11.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.13.12-smp (renamed from source/k/kernel-configs/config-huge-smp-5.13.11-smp)2
-rw-r--r--source/kde/kde/build/konsole2
-rw-r--r--source/kde/kde/patch/konsole.patch3
-rw-r--r--source/kde/kde/patch/konsole/konsole_fix_toolbar.patch69
10 files changed, 80 insertions, 8 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index bdf44ff69..3cac1008d 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_libraries
VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/k/kernel-configs/config-generic-5.13.11 b/source/k/kernel-configs/config-generic-5.13.12
index 993bfaee5..0cdf0e6c7 100644
--- a/source/k/kernel-configs/config-generic-5.13.11
+++ b/source/k/kernel-configs/config-generic-5.13.12
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.13.11.x64 b/source/k/kernel-configs/config-generic-5.13.12.x64
index a92ea1d53..c04fc584b 100644
--- a/source/k/kernel-configs/config-generic-5.13.11.x64
+++ b/source/k/kernel-configs/config-generic-5.13.12.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.13.11-smp b/source/k/kernel-configs/config-generic-smp-5.13.12-smp
index 5412a326e..c1fbfbb09 100644
--- a/source/k/kernel-configs/config-generic-smp-5.13.11-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.13.12-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.13.11 b/source/k/kernel-configs/config-huge-5.13.12
index 483a6643f..4e4e938f0 100644
--- a/source/k/kernel-configs/config-huge-5.13.11
+++ b/source/k/kernel-configs/config-huge-5.13.12
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.13.11.x64 b/source/k/kernel-configs/config-huge-5.13.12.x64
index aee9dae56..12dae52a0 100644
--- a/source/k/kernel-configs/config-huge-5.13.11.x64
+++ b/source/k/kernel-configs/config-huge-5.13.12.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.13.11-smp b/source/k/kernel-configs/config-huge-smp-5.13.12-smp
index 334b871b8..8d10fc384 100644
--- a/source/k/kernel-configs/config-huge-smp-5.13.11-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.13.12-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.11 Kernel Configuration
+# Linux/x86 5.13.12 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/konsole
+++ b/source/kde/kde/build/konsole
@@ -1 +1 @@
-1
+2
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
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-27 23:05:00 +0000