diff options
Diffstat (limited to 'source')
26 files changed, 107 insertions, 84 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index c680f141..de91c0c4 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Tue Jun 14 08:08:08 UTC 2022 + Added liblz4 for fsck.f2fs. Thanks to Brent Earl. ++--------------------------+ Mon Feb 7 19:03:07 UTC 2022 Add a /usr/bin/dbclient symlink. Thanks to alienBOB. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 3aeb5574..14856a42 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -3,7 +3,7 @@ set +o posix # $Id: build_installer.sh,v 1.129 2011/04/13 23:03:07 eha Exp eha $ # -# Copyright 2005-2021 Stuart Winter, Surrey, England, UK +# Copyright 2005-2022 Stuart Winter, Surrey, England, UK # Copyright 2008, 2009, 2010, 2011, 2017 Eric Hameleers, Eindhoven, Netherlands # Copyright 2011-2020 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. @@ -970,6 +970,7 @@ l/libidn2 \ l/libnsl \ l/libunistring \ l/libusb \ +l/lz4 \ l/lzo \ l/parted \ l/pcre \ @@ -1316,6 +1317,7 @@ cp -fa${VERBOSE1} \ libidn2*.so* \ libjson-c.so* \ liblz.so* \ + liblz4.so* \ liblzo*.so* \ libparted*so* \ libreadline*.so* \ diff --git a/source/k/kernel-configs/config-generic-5.18.3 b/source/k/kernel-configs/config-generic-5.18.4 index 4e719564..549bf846 100644 --- a/source/k/kernel-configs/config-generic-5.18.3 +++ b/source/k/kernel-configs/config-generic-5.18.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.18.3.x64 b/source/k/kernel-configs/config-generic-5.18.4.x64 index af8a8a78..9d8ae3c1 100644 --- a/source/k/kernel-configs/config-generic-5.18.3.x64 +++ b/source/k/kernel-configs/config-generic-5.18.4.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.18.3-smp b/source/k/kernel-configs/config-generic-smp-5.18.4-smp index 6ddf89ee..671c0fda 100644 --- a/source/k/kernel-configs/config-generic-smp-5.18.3-smp +++ b/source/k/kernel-configs/config-generic-smp-5.18.4-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.18.3 b/source/k/kernel-configs/config-huge-5.18.4 index cb431f82..f3175dfe 100644 --- a/source/k/kernel-configs/config-huge-5.18.3 +++ b/source/k/kernel-configs/config-huge-5.18.4 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.18.3.x64 b/source/k/kernel-configs/config-huge-5.18.4.x64 index 8ad9a393..38943729 100644 --- a/source/k/kernel-configs/config-huge-5.18.3.x64 +++ b/source/k/kernel-configs/config-huge-5.18.4.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.18.3-smp b/source/k/kernel-configs/config-huge-smp-5.18.4-smp index 9d652aff..baf9f0b6 100644 --- a/source/k/kernel-configs/config-huge-smp-5.18.3-smp +++ b/source/k/kernel-configs/config-huge-smp-5.18.4-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.3 Kernel Configuration +# Linux/x86 5.18.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/oxygen-sounds b/source/kde/kde/build/oxygen-sounds new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/source/kde/kde/build/oxygen-sounds @@ -0,0 +1 @@ +1 diff --git a/source/kde/kde/build/plasma-framework b/source/kde/kde/build/plasma-framework index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/plasma-framework +++ b/source/kde/kde/build/plasma-framework @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index 00750edc..d00491fd 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/modules/plasma b/source/kde/kde/modules/plasma index 872f6ea9..3bd09ed7 100644 --- a/source/kde/kde/modules/plasma +++ b/source/kde/kde/modules/plasma @@ -6,7 +6,8 @@ breeze-gtk breeze-grub #breeze-plymouth kwayland-integration -kwayland-server +# obsolete, removed: +#kwayland-server plasma-integration kinfocenter libksysguard @@ -18,6 +19,7 @@ kwrited libkscreen milou oxygen +oxygen-sounds plasma-workspace kde-cli-tools # Circular dependency between plasma-workspace and kde-cli-tools: diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch deleted file mode 100644 index 829028e5..00000000 --- a/source/kde/kde/patch/kwin.patch +++ /dev/null @@ -1 +0,0 @@ -cat $CWD/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch deleted file mode 100644 index 7968887a..00000000 --- a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 76abce728d3abb94c71076e6211a0da655397b0f Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 12 Nov 2019 13:18:26 +0100 -Subject: [PATCH] Bypass wayland interface blacklisting - -Currently the check isn't worth anything and it breaks some applications. -See discussion on https://phabricator.kde.org/D22571 and https://phabricator.kde.org/T4437#207062. ---- - src/wayland_server.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp -index e93d51911..95f3a746a 100644 ---- a/src/wayland_server.cpp -+++ b/src/wayland_server.cpp -@@ -130,6 +130,7 @@ public: - QSet<QString> m_reported; - - bool allowInterface(KWaylandServer::ClientConnection *client, const QByteArray &interfaceName) override { -+ return true; - if (client->processId() == getpid()) { - return true; - } --- -2.25.1 - diff --git a/source/kde/kde/patch/plasma-framework.patch b/source/kde/kde/patch/plasma-framework.patch new file mode 100644 index 00000000..23919a6e --- /dev/null +++ b/source/kde/kde/patch/plasma-framework.patch @@ -0,0 +1 @@ +cat $CWD/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch b/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch new file mode 100644 index 00000000..30061276 --- /dev/null +++ b/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch @@ -0,0 +1,42 @@ +From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <a.samirh78@gmail.com> +Date: Tue, 14 Jun 2022 14:05:32 +0200 +Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and + TARGET for glesv2" + +This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9. +--- + CMakeLists.txt | 3 ++- + src/declarativeimports/core/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6698a2091..63229cdfb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES + TYPE OPTIONAL + ) + +-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl) ++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES) ++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl")) + add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.") + set(HAVE_GLX 1) + else() +diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt +index d08b4c619..2136bb985 100644 +--- a/src/declarativeimports/core/CMakeLists.txt ++++ b/src/declarativeimports/core/CMakeLists.txt +@@ -70,7 +70,7 @@ else() + + endif() + +-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2) ++if(QtGui_Enabled_Features MATCHES "opengles2") + target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2) + endif() + +-- +GitLab + diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 1c69240c..77645b0c 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1,2 +1 @@ cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch deleted file mode 100644 index 352bed91..00000000 --- a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Mon, 16 May 2022 16:18:00 +0800 -Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading - ThemesModel - -Before this commit ThemesModel only finds metadata.desktop, but after -KF5.94, the default theme metadata files have been ported to json format. - -BUG: 453830 - - -(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e) ---- - kcms/desktoptheme/themesmodel.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 6f0ecf4e3..296951742 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -155,7 +155,15 @@ void ThemesModel::load() - const QDir cd(ppath); - const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); - for (const QString &pack : entries) { -- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop"); -+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator()); -+ -+ QString _metadata = QStringLiteral("%1json").arg(prefix); -+ if (QFile::exists(_metadata)) { -+ themes << _metadata; -+ continue; -+ } -+ -+ _metadata = QStringLiteral("%1desktop").arg(prefix); - if (QFile::exists(_metadata)) { - themes << _metadata; - } --- -GitLab - diff --git a/source/kde/kde/slack-desc/oxygen-sounds b/source/kde/kde/slack-desc/oxygen-sounds new file mode 100644 index 00000000..c8bf62ac --- /dev/null +++ b/source/kde/kde/slack-desc/oxygen-sounds @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +oxygen-sounds: oxygen-sounds (KDE Oxygen sound pack) +oxygen-sounds: +oxygen-sounds: This package contains the KDE Oxygen sound pack. +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: +oxygen-sounds: diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh index 4859cf30..c589534b 100755 --- a/source/l/qt5/fetch_sources.sh +++ b/source/l/qt5/fetch_sources.sh @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="5.15.3" +BRANCH="5.15.4" rm -f qt-everywhere-src-*.tar* @@ -31,7 +31,7 @@ cd qt5 ./init-repository # Sync qtwebengine version with the rest of qt5 - sed -i -E "s/5.15.(.*)/5.15.3/" qtwebengine/.qmake.conf + sed -i -E "s/5.15.(.*)/5.15.4/" qtwebengine/.qmake.conf for i in $(find . -type d -name "qt*" -maxdepth 1); do cd $i diff --git a/source/l/qt5/patches/qt5-webengine-gcc12.patch b/source/l/qt5/patches/qt5-webengine-gcc12.patch new file mode 100644 index 00000000..46f2dbfe --- /dev/null +++ b/source/l/qt5/patches/qt5-webengine-gcc12.patch @@ -0,0 +1,13 @@ +diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp +index 7260365b2c6..b5a6aae3596 100644 +--- a/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -8,6 +8,8 @@ + + #include "include/utils/SkParse.h" + ++#include <iterator> ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index cc3731f9..3cdb22cb 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -135,6 +135,11 @@ cd qtwebengine zcat $CWD/patches/qt5-qtwebengine-gcc11.patch.gz | patch -p1 --verbose || exit 1 cd - 1>/dev/null +# Fix build with gcc12: +cd qtwebengine/src/3rdparty + zcat $CWD/patches/qt5-webengine-gcc12.patch.gz | patch -p1 --verbose || exit 1 +cd - 1>/dev/null + # CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui # and for it breaks KWin compilation with: # /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory diff --git a/source/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild index 091415e4..da040d03 100755 --- a/source/l/talloc/talloc.SlackBuild +++ b/source/l/talloc/talloc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=talloc 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 diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index b6242fc5..023ecf16 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.16.1.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.16.1.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.16.2.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.16.2.tar.asc diff --git a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build index e3030faa..a4659df2 100755 --- a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build +++ b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build @@ -52,4 +52,6 @@ find . \ -exec chmod 644 {} \; cargo build --release +rm /root/.cargo/bin 2> /dev/null +mkdir -p /root/.cargo/bin install -Dm755 target/release/cbindgen /root/.cargo/bin diff --git a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build index e3030faa..a4659df2 100755 --- a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build +++ b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build @@ -52,4 +52,6 @@ find . \ -exec chmod 644 {} \; cargo build --release +rm /root/.cargo/bin 2> /dev/null +mkdir -p /root/.cargo/bin install -Dm755 target/release/cbindgen /root/.cargo/bin |