diff options
Diffstat (limited to 'source')
15 files changed, 19 insertions, 83 deletions
diff --git a/source/k/kernel-configs/config-generic-6.1.16 b/source/k/kernel-configs/config-generic-6.1.18 index c6c9a861d..930e6c7d6 100644 --- a/source/k/kernel-configs/config-generic-6.1.16 +++ b/source/k/kernel-configs/config-generic-6.1.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1652,7 +1652,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m diff --git a/source/k/kernel-configs/config-generic-6.1.16.x64 b/source/k/kernel-configs/config-generic-6.1.18.x64 index bdb42f768..61d6942fc 100644 --- a/source/k/kernel-configs/config-generic-6.1.16.x64 +++ b/source/k/kernel-configs/config-generic-6.1.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1742,7 +1742,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -6447,7 +6446,6 @@ CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y -CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y @@ -6479,6 +6477,7 @@ CONFIG_DRM_I915_STOP_TIMEOUT=100 CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation +CONFIG_DRM_I915_GVT=y CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m diff --git a/source/k/kernel-configs/config-generic-smp-6.1.16-smp b/source/k/kernel-configs/config-generic-smp-6.1.18-smp index a7e6fe51e..553fb52e2 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.16-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1686,7 +1686,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m diff --git a/source/k/kernel-configs/config-huge-6.1.16 b/source/k/kernel-configs/config-huge-6.1.18 index 4f3d246a0..a2d32bdfc 100644 --- a/source/k/kernel-configs/config-huge-6.1.16 +++ b/source/k/kernel-configs/config-huge-6.1.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1652,7 +1652,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m diff --git a/source/k/kernel-configs/config-huge-6.1.16.x64 b/source/k/kernel-configs/config-huge-6.1.18.x64 index 92cbaf1de..b5fd36b87 100644 --- a/source/k/kernel-configs/config-huge-6.1.16.x64 +++ b/source/k/kernel-configs/config-huge-6.1.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1742,7 +1742,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -6447,7 +6446,6 @@ CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y -CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y @@ -6479,6 +6477,7 @@ CONFIG_DRM_I915_STOP_TIMEOUT=100 CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation +CONFIG_DRM_I915_GVT=y CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m diff --git a/source/k/kernel-configs/config-huge-smp-6.1.16-smp b/source/k/kernel-configs/config-huge-smp-6.1.18-smp index 6ab3faabe..7eb2ad743 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.16-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.16 Kernel Configuration +# Linux/x86 6.1.18 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1686,7 +1686,6 @@ CONFIG_NET_SCH_ETS=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m diff --git a/source/kde/kde/build/kidletime b/source/kde/kde/build/kidletime index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kidletime +++ b/source/kde/kde/build/kidletime @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kimageformats b/source/kde/kde/build/kimageformats index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kimageformats +++ b/source/kde/kde/build/kimageformats @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kio b/source/kde/kde/build/kio index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kio +++ b/source/kde/kde/build/kio @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/kidletime.patch b/source/kde/kde/patch/kidletime.patch deleted file mode 100644 index 5d8e5e302..000000000 --- a/source/kde/kde/patch/kidletime.patch +++ /dev/null @@ -1 +0,0 @@ -cat $CWD/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch b/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch deleted file mode 100644 index da2faa692..000000000 --- a/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a0da010b8c4c97792543d24f6597ba1c1b3ceaef Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Thu, 16 Feb 2023 12:16:03 +0100 -Subject: [PATCH] wayland: Guard wayland object destructors - -Kidletime is a singleton and the client API works by supplying ints to add -or remove timeouts. When not all timeouts are removed before program exits, -trying to destroy the wayland objects will crash since the lifetime of the -wayland connection is tied to the QGuiApplication. -BUG:465801 -FIXED-IN:5.104 - - -(cherry picked from commit 53779a8d8fb177762d0435634c8ca45b0a47f1db) ---- - src/plugins/wayland/poller.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/wayland/poller.cpp b/src/plugins/wayland/poller.cpp -index 918766b..9c1d7ad 100644 ---- a/src/plugins/wayland/poller.cpp -+++ b/src/plugins/wayland/poller.cpp -@@ -50,7 +50,9 @@ public: - - ~IdleTimeoutKwin() - { -- release(); -+ if (qGuiApp) { -+ release(); -+ } - } - - protected: -@@ -74,7 +76,9 @@ public: - - ~IdleTimeoutExt() - { -- destroy(); -+ if (qGuiApp) { -+ destroy(); -+ } - } - - protected: -@@ -120,7 +124,7 @@ public: - } - ~IdleManagerExt() - { -- if (isActive()) { -+ if (qGuiApp && isActive()) { - destroy(); - } - } --- -GitLab - diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 00f49b4d7..fd0e60a14 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.26 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff index 4240941e0..dbc7c7668 100644 --- a/source/n/php/php.ini-development.diff +++ b/source/n/php/php.ini-development.diff @@ -1,6 +1,6 @@ ---- ./php.ini-development.orig 2021-11-23 12:56:11.000000000 -0600 -+++ ./php.ini-development 2021-11-29 13:08:24.467109377 -0600 -@@ -905,7 +905,50 @@ +--- ./php.ini-development.orig 2023-02-13 19:06:39.000000000 -0600 ++++ ./php.ini-development 2023-03-11 13:29:08.667004041 -0600 +@@ -905,7 +905,49 @@ ; 'extension='php_<ext>.dll') is supported for legacy reasons and may be ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=<ext>) syntax. @@ -43,15 +43,14 @@ +extension=tidy +extension=tokenizer +extension=xmlreader -+extension=xmlrpc +extension=xsl +extension=zip +extension=zlib + ; Notes for Windows environments : ; - ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) -@@ -1350,7 +1393,7 @@ + ; - Many DLL files are located in the ext/ +@@ -1363,7 +1405,7 @@ ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. ; https://php.net/session.save-path diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild index 310eb608b..1580fca71 100755 --- a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fcitx5-chinese-addons VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | cut -f 2- -d _ | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/libime/libime.SlackBuild b/source/x/libime/libime.SlackBuild index a087aa8ec..e5920ce4a 100755 --- a/source/x/libime/libime.SlackBuild +++ b/source/x/libime/libime.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libime VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | cut -f 2- -d _ | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |