summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/d/make/make-4.0-noclock_gettime.patch14
-rw-r--r--source/d/make/make-4.3-getcwd.patch12
-rw-r--r--source/d/make/make-4.3-j8k.patch25
-rwxr-xr-xsource/d/make/make.SlackBuild11
-rw-r--r--source/kde/kde/build/kwin2
-rw-r--r--source/kde/kde/patch/kwin.patch3
-rw-r--r--source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch35
-rw-r--r--source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch34
-rw-r--r--source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch27
-rw-r--r--source/x/x11/build/libXext2
-rw-r--r--source/x/x11/build/libXinerama2
-rw-r--r--source/x/x11/build/makedepend2
-rw-r--r--source/x/x11/build/rgb2
-rw-r--r--source/x/x11/build/sessreg2
-rw-r--r--source/x/x11/build/x11perf2
-rw-r--r--source/x/x11/build/xsetroot2
16 files changed, 109 insertions, 68 deletions
diff --git a/source/d/make/make-4.0-noclock_gettime.patch b/source/d/make/make-4.0-noclock_gettime.patch
deleted file mode 100644
index f63e1fc7c..000000000
--- a/source/d/make/make-4.0-noclock_gettime.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up make-3.82/configure\~ make-3.82/configure
---- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200
-+++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200
-@@ -7215,7 +7215,7 @@ return clock_gettime ();
- return 0;
- }
- _ACEOF
--for ac_lib in '' rt posix4; do
-+for ac_lib in '' posix4; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
-
-Diff finished. Wed Aug 11 15:07:59 2010
diff --git a/source/d/make/make-4.3-getcwd.patch b/source/d/make/make-4.3-getcwd.patch
deleted file mode 100644
index 7f6f18fa9..000000000
--- a/source/d/make/make-4.3-getcwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/src/makeint.h b/src/makeint.h
---- a/src/makeint.h 2016-05-21 16:22:32.000000000 -0400
-+++ b/src/makeint.h 2016-09-22 16:12:38.606702160 -0400
-@@ -596,7 +596,7 @@ long int lseek ();
- # endif
-
- # ifdef HAVE_GETCWD
--# if !defined(VMS) && !defined(__DECC)
-+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
- char *getcwd ();
- # endif
- # else
diff --git a/source/d/make/make-4.3-j8k.patch b/source/d/make/make-4.3-j8k.patch
deleted file mode 100644
index 60a0c7fba..000000000
--- a/source/d/make/make-4.3-j8k.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nrup a/src/main.c b/src/main.c
---- a/src/main.c 2016-05-31 03:17:26.000000000 -0400
-+++ b/src/main.c 2016-09-22 16:18:52.283889265 -0400
-@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp
- }
- #endif
-
-+#ifdef PIPE_BUF
-+ if (job_slots > PIPE_BUF)
-+#elif defined _POSIX_PIPE_BUF
-+ if (job_slots > _POSIX_PIPE_BUF)
-+#else
-+ if (job_slots > 512)
-+#endif
-+ {
-+ O (error, NILF,
-+ _("More parallel jobs (-jN) than this platform can handle requested."));
-+ O (error, NILF, _("Resetting to single job (-j1) mode."));
-+ job_slots = 1;
-+ }
-+
-+
- /* If we have >1 slot at this point, then we're a top-level make.
- Set up the jobserver.
-
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index adc0ccaa9..dfce383db 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=make
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,13 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Patches from Fedora:
-zcat $CWD/make-4.0-noclock_gettime.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/make-4.3-getcwd.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/make-4.3-j8k.patch.gz | patch -p1 --verbose || exit 1
-
-autoreconf -vif
-
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kwin
+++ b/source/kde/kde/build/kwin
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
new file mode 100644
index 000000000..c98d53e37
--- /dev/null
+++ b/source/kde/kde/patch/kwin.patch
@@ -0,0 +1,3 @@
+cat $CWD/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch b/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch
new file mode 100644
index 000000000..8a4de9426
--- /dev/null
+++ b/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch
@@ -0,0 +1,35 @@
+From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 26 Oct 2022 21:43:41 +0200
+Subject: [PATCH] x11window: revert more from 3a28c02f
+
+BUG: 461032
+
+
+(cherry picked from commit 2997fb24bb8171145ce1107df85eb3a3a4c0cf74)
+---
+ src/x11window.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/x11window.cpp b/src/x11window.cpp
+index c02d33b338..b7a180d317 100644
+--- a/src/x11window.cpp
++++ b/src/x11window.cpp
+@@ -4519,11 +4519,10 @@ void X11Window::changeMaximize(bool horizontal, bool vertical, bool adjust)
+ }
+ }
+ r.moveTopLeft(rules()->checkPosition(r.topLeft()));
+- // The above code tries to center align the window followed by setting top and bottom
+- // it's possible that we're in between two pixels
+- r.setX(Xcb::nativeFloor(r.x()));
+- r.setY(Xcb::nativeFloor(r.y()));
+ }
++ // The above code tries to center align the window followed by setting top and bottom
++ // it's possible that we're in between two pixels
++ r = Xcb::nativeFloor(r);
+
+ moveResize(r);
+ if (options->electricBorderMaximize() && r.top() == clientArea.top()) {
+--
+GitLab
+
diff --git a/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch b/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch
new file mode 100644
index 000000000..9de1f3db1
--- /dev/null
+++ b/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch
@@ -0,0 +1,34 @@
+From 4c5830ba149ec4462587a95f78624dfc981d281c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Tue, 25 Oct 2022 15:49:27 +0200
+Subject: [PATCH] x11: Don't force QT_NO_GLIB=1
+
+This breaks certain apps, e.g. KDE System Settings when launched from
+overview effect.
+
+BUG: 460980
+
+
+(cherry picked from commit c2b4f03f9671c0ad9fc1929426df5f79db414aa7)
+---
+ src/main_x11.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index 21cfab94b3..c175d8729e 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -337,10 +337,6 @@ int main(int argc, char *argv[])
+
+ signal(SIGPIPE, SIG_IGN);
+
+- // Disable the glib event loop integration, since it seems to be responsible
+- // for several bug reports about high CPU usage (bug #239963)
+- setenv("QT_NO_GLIB", "1", true);
+-
+ // enforce xcb plugin, unfortunately command line switch has precedence
+ setenv("QT_QPA_PLATFORM", "xcb", true);
+
+--
+GitLab
+
diff --git a/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch b/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch
new file mode 100644
index 000000000..0fbb74fed
--- /dev/null
+++ b/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch
@@ -0,0 +1,27 @@
+From a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Thu, 27 Oct 2022 00:42:24 +0200
+Subject: [PATCH] x11: Don't force QT_QPA_PLATFORM=xcb
+
+This is basically a cherry pick of 77ec43d5e (Don't force
+QT_QPA_PLATFORM=wayland), except for X11.
+---
+ src/main_x11.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index bb722bf5d8..66e0341f1c 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -362,6 +362,8 @@ int main(int argc, char *argv[])
+
+ KWin::ApplicationX11 a(argc, argv);
+ a.setupTranslator();
++ // reset QT_QPA_PLATFORM so we don't propagate it to our children (e.g. apps launched from the overview effect)
++ qunsetenv("QT_QPA_PLATFORM");
+
+ KSignalHandler::self()->watchSignal(SIGTERM);
+ KSignalHandler::self()->watchSignal(SIGINT);
+--
+GitLab
+
diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXext
+++ b/source/x/x11/build/libXext
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/libXinerama
+++ b/source/x/x11/build/libXinerama
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/makedepend
+++ b/source/x/x11/build/makedepend
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/rgb b/source/x/x11/build/rgb
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/rgb
+++ b/source/x/x11/build/rgb
@@ -1 +1 @@
-5
+1
diff --git a/source/x/x11/build/sessreg b/source/x/x11/build/sessreg
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/sessreg
+++ b/source/x/x11/build/sessreg
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/x11perf
+++ b/source/x/x11/build/x11perf
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xsetroot b/source/x/x11/build/xsetroot
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xsetroot
+++ b/source/x/x11/build/xsetroot
@@ -1 +1 @@
-4
+1
generated by cgit v1.2.3-65-gdbad (git 2.45.1) at 2024-06-19 09:18:24 +0000