From bd0fcc79d4fa32412994f803fa62ecc2232923a2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 9 Jun 2021 18:59:30 +0000 Subject: Wed Jun 9 18:59:30 UTC 2021 a/dialog-1.3_20210530-x86_64-1.txz: Upgraded. a/grub-2.06-x86_64-1.txz: Upgraded. a/kernel-firmware-20210609_0f66b74-noarch-1.txz: Upgraded. d/gcc-10.3.0-x86_64-2.txz: Rebuilt. Applied upstream patches to address the regressions noted in PR100101 and PR100102. Thanks to eduardr. d/gcc-brig-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-g++-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-gdc-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-gfortran-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-gnat-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-go-10.3.0-x86_64-2.txz: Rebuilt. d/gcc-objc-10.3.0-x86_64-2.txz: Rebuilt. d/meson-0.58.1-x86_64-1.txz: Upgraded. kde/bluedevil-5.22.0-x86_64-1.txz: Upgraded. kde/breeze-5.22.0-x86_64-1.txz: Upgraded. kde/breeze-grub-5.22.0-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.22.0-x86_64-1.txz: Upgraded. kde/drkonqi-5.22.0-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.22.0-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.22.0-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.22.0-x86_64-1.txz: Upgraded. kde/kdecoration-5.22.0-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.22.0-x86_64-1.txz: Upgraded. kde/kgamma5-5.22.0-x86_64-1.txz: Upgraded. kde/khotkeys-5.22.0-x86_64-1.txz: Upgraded. kde/kinfocenter-5.22.0-x86_64-1.txz: Upgraded. kde/kmenuedit-5.22.0-x86_64-1.txz: Upgraded. kde/krita-4.4.5-x86_64-1.txz: Upgraded. kde/kscreen-5.22.0-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.22.0-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.22.0-x86_64-1.txz: Upgraded. kde/ksysguard-5.22.0-x86_64-1.txz: Upgraded. kde/ksystemstats-5.22.0-x86_64-1.txz: Added. kde/kwallet-pam-5.22.0-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.22.0-x86_64-1.txz: Upgraded. kde/kwayland-server-5.22.0-x86_64-1.txz: Upgraded. kde/kwin-5.22.0-x86_64-1.txz: Upgraded. kde/kwrited-5.22.0-x86_64-1.txz: Upgraded. kde/latte-dock-0.9.12-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.22.0-x86_64-1.txz: Added. kde/libkscreen-5.22.0-x86_64-1.txz: Upgraded. kde/libksysguard-5.22.0-x86_64-1.txz: Upgraded. kde/milou-5.22.0-x86_64-1.txz: Upgraded. kde/oxygen-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-disks-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-integration-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-nm-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-pa-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-vault-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.22.0-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.22.0-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.22.0-x86_64-1.txz: Upgraded. kde/powerdevil-5.22.0-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.22.0-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.22.0-x86_64-1.txz: Upgraded. kde/systemsettings-5.22.0-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.22.0-x86_64-1.txz: Upgraded. l/alsa-lib-1.2.5-x86_64-3.txz: Rebuilt. Apply upstream patches to fix device detection. Thanks to USUARIONUEVO. l/libiodbc-3.52.15-x86_64-1.txz: Upgraded. n/sshfs-3.7.2-x86_64-1.txz: Upgraded. n/wpa_supplicant-2.9-x86_64-7.txz: Rebuilt. Support WPA3 and add some more options from the defconfig included in the source to Slackware's config file. Thanks to ArTourter. x/xkeyboard-config-2.33-noarch-1.txz: Upgraded. x/xterm-368-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.16.2-x86_64-1.txz: Upgraded. --- source/a/grub/grub.SlackBuild | 2 +- source/d/gcc/gcc.SlackBuild | 9 +- ....2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch | 100 ++++++++++++++++ ....a1b3484a8e6c53c8084723e3f1738d402374198e.patch | 59 +++++++++ ....5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch | 133 +++++++++++++++++++++ source/d/meson/meson.SlackBuild | 2 +- source/kde/kde/build/krita | 2 +- source/kde/kde/build/ksystemstats | 1 + source/kde/kde/build/latte-dock | 2 +- source/kde/kde/build/layer-shell-qt | 1 + source/kde/kde/modules/plasma | 2 + source/kde/kde/patch/milou.patch | 2 - .../kde/kde/patch/milou/milou_krunner_include.diff | 11 -- source/kde/kde/slack-desc/ksystemstats | 19 +++ source/kde/kde/slack-desc/layer-shell-qt | 19 +++ .../0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch | 65 ++++++++++ .../9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch | 31 +++++ source/l/alsa-lib/alsa-lib.SlackBuild | 7 +- .../ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch | 94 +++++++++++++++ source/n/sshfs/sshfs.SlackBuild | 2 +- source/n/wpa_supplicant/config/dot.config | 37 +++++- source/n/wpa_supplicant/wpa_supplicant.SlackBuild | 2 +- source/xfce/xfce4-settings/xfce4-settings.url | 2 +- 23 files changed, 579 insertions(+), 25 deletions(-) create mode 100644 source/d/gcc/patches/PR100101.2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch create mode 100644 source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch create mode 100644 source/d/gcc/patches/PR100102.5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch create mode 100644 source/kde/kde/build/ksystemstats create mode 100644 source/kde/kde/build/layer-shell-qt delete mode 100644 source/kde/kde/patch/milou.patch delete mode 100644 source/kde/kde/patch/milou/milou_krunner_include.diff create mode 100644 source/kde/kde/slack-desc/ksystemstats create mode 100644 source/kde/kde/slack-desc/layer-shell-qt create mode 100644 source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch create mode 100644 source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch create mode 100644 source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch (limited to 'source') diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index dfc7eec34..3a0438acd 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index a3ca1c9be..5830d762c 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -171,6 +171,11 @@ zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --su # Fix a gfortran bug: zcat $CWD/patches/gfortran.deferred-shape-vs-assumed-shape.patch.gz | patch -p0 --verbose --backup --suffix=.orig || exit 1 +# Fix regressions in 10.3.0: +zcat $CWD/patches/PR100101.2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/patches/PR100102.5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + # Fix perms/owners: chown -R root:root . find . \ diff --git a/source/d/gcc/patches/PR100101.2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch b/source/d/gcc/patches/PR100101.2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch new file mode 100644 index 000000000..51ee459fd --- /dev/null +++ b/source/d/gcc/patches/PR100101.2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f.patch @@ -0,0 +1,100 @@ +From 2efbbba16a0630fac8cadcd6d9e0ffaabfadb79f Mon Sep 17 00:00:00 2001 +From: Jason Merrill +Date: Thu, 15 Apr 2021 13:38:54 -0400 +Subject: [PATCH] c++: noexcept error recursion [PR100101] + +Here instantiating the noexcept-specifier for bar() means +instantiating A::value, which complains about the conversion from 0 to +int* in the default argument of foo. Since my patch for PR99583, printing +the error context involves looking at C::type, which again wants to +instantiate A::value, which breaks. For now at least, let's break +this recursion by avoiding looking into the noexcept-specifier in +find_typenames, and limit that to just the uses_parameter_packs case that +PR99583 cares about. + +gcc/cp/ChangeLog: + + PR c++/100101 + PR c++/99583 + * pt.c (find_parameter_packs_r) [FUNCTION_TYPE]: Walk into + TYPE_RAISES_EXCEPTIONS here. + +gcc/testsuite/ChangeLog: + + PR c++/100101 + * g++.dg/cpp0x/noexcept67.C: New test. +--- + gcc/cp/pt.c | 11 +++++++++++ + gcc/testsuite/g++.dg/cpp0x/noexcept67.C | 26 +++++++++++++++++++++++++ + 3 files changed, 37 insertions(+), 5 deletions(-) + create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept67.C + +diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c +index 0f119a55272..2190f83882a 100644 +--- a/gcc/cp/pt.c ++++ b/gcc/cp/pt.c +@@ -3890,6 +3890,10 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) + (struct find_parameter_pack_data*)data; + bool parameter_pack_p = false; + ++#define WALK_SUBTREE(NODE) \ ++ cp_walk_tree (&(NODE), &find_parameter_packs_r, \ ++ ppd, ppd->visited) \ ++ + /* Don't look through typedefs; we are interested in whether a + parameter pack is actually written in the expression/type we're + looking at, not the target type. */ +@@ -4070,10 +4074,17 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) + ppd, ppd->visited); + return NULL_TREE; + ++ case FUNCTION_TYPE: ++ case METHOD_TYPE: ++ WALK_SUBTREE (TYPE_RAISES_EXCEPTIONS (t)); ++ break; ++ + default: + return NULL_TREE; + } + ++#undef WALK_SUBTREE ++ + return NULL_TREE; + } + +diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept67.C b/gcc/testsuite/g++.dg/cpp0x/noexcept67.C +new file mode 100644 +index 00000000000..7f061034323 +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/noexcept67.C +@@ -0,0 +1,26 @@ ++// PR c++/100101 ++// { dg-do compile { target c++11 } } ++ ++template struct A ++{ ++ template static char foo(U*, int* = 0); ++ static const bool value = sizeof(foo(static_cast(nullptr))) > 0; ++}; ++ ++template struct B ++{ ++ static const bool value = b; ++}; ++ ++template struct C ++{ ++ typedef B::value> type; ++}; ++ ++template ++void bar() noexcept(A::value && C::type::value) {} ++ ++void baz() ++{ ++ bar(); ++} +-- +2.27.0 + + diff --git a/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch b/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch new file mode 100644 index 000000000..56394fc3f --- /dev/null +++ b/source/d/gcc/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch @@ -0,0 +1,59 @@ +From a1b3484a8e6c53c8084723e3f1738d402374198e Mon Sep 17 00:00:00 2001 +From: Jason Merrill +Date: Mon, 31 May 2021 12:56:34 -0400 +Subject: [PATCH] c++: alias member template [PR100102] + +Patrick already fixed the primary cause of this bug. But while I was +looking at this testcase I noticed that with the qualified name k::o we +ended up with a plain FUNCTION_DECL, whereas without the k:: we got a +BASELINK. There seems to be no good reason not to return the BASELINK +in this case as well. + + PR c++/100102 + +gcc/cp/ChangeLog: + + * init.c (build_offset_ref): Return the BASELINK for a static + member function. + +gcc/testsuite/ChangeLog: + + * g++.dg/cpp0x/alias-decl-73.C: New test. +--- + gcc/cp/init.c | 2 +- + gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C + +diff --git a/gcc/cp/init.c b/gcc/cp/init.c +index b1123287300..1b161d526f6 100644 +--- a/gcc/cp/init.c ++++ b/gcc/cp/init.c +@@ -2214,7 +2214,7 @@ build_offset_ref (tree type, tree member, bool address_p, + if (!ok) + return error_mark_node; + if (DECL_STATIC_FUNCTION_P (t)) +- return t; ++ return member; + member = t; + } + else +diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C +new file mode 100644 +index 00000000000..aae778646dc +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-73.C +@@ -0,0 +1,9 @@ ++// PR c++/100102 ++// { dg-do compile { target c++11 } } ++ ++template using a = int; ++template struct k { ++ static long o(); ++ template using n = a; ++ n q; ++}; +-- +2.27.0 + + diff --git a/source/d/gcc/patches/PR100102.5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch b/source/d/gcc/patches/PR100102.5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch new file mode 100644 index 000000000..57432468e --- /dev/null +++ b/source/d/gcc/patches/PR100102.5357ab75dedef403b0eebf9277d61d1cbeb5898f.patch @@ -0,0 +1,133 @@ +From 5357ab75dedef403b0eebf9277d61d1cbeb5898f Mon Sep 17 00:00:00 2001 +From: Patrick Palka +Date: Fri, 4 Jun 2021 13:46:53 -0400 +Subject: [PATCH 1/1] c++: tsubst_function_decl and excess arg levels + [PR100102] + +Here, when instantiating the dependent alias template +duration::__is_harmonic with args={{T,U},{int}}, we find ourselves +substituting the function decl _S_gcd. Since we have more arg levels +than _S_gcd has parm levels, an old special case in tsubst_function_decl +causes us to unwantedly reduce args to its innermost level, yielding +args={int}, which leads to a nonsensical substitution into the decl +context and eventually a crash. + +The comment for this special case refers to three examples for which we +ought to see more arg levels than parm levels here, but none of the +examples actually demonstrate this. In the first example, when +defining S::f(U) parms_depth is 2 and args_depth is 1, and +later when instantiating say S::f both depths are 2. In the +second example, when substituting the template friend declaration +parms_depth is 2 and args_depth is 1, and later when instantiating f +both depths are 1. Finally, the third example is invalid since we can't +specialize a member template of an unspecialized class template like +that. + +Given that this reduction code seems no longer relevant for its +documented purpose and that it causes problems as in the PR, this patch +just removes it. Note that as far as bootstrap/regtest is concerned, +this code is dead; the below two tests would be the first to reach it. + + PR c++/100102 + +gcc/cp/ChangeLog: + + * pt.c (tsubst_function_decl): Remove old code for reducing + args when it has excess levels. + +gcc/testsuite/ChangeLog: + + * g++.dg/cpp0x/alias-decl-72.C: New test. + * g++.dg/cpp0x/alias-decl-72a.C: New test. +--- + gcc/cp/pt.c | 39 --------------------- + gcc/testsuite/g++.dg/cpp0x/alias-decl-72.C | 9 +++++ + gcc/testsuite/g++.dg/cpp0x/alias-decl-72a.C | 9 +++++ + 3 files changed, 18 insertions(+), 39 deletions(-) + create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-72.C + create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-72a.C + +diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c +index 7211bdc5bbc..744461ed8cb 100644 +--- a/gcc/cp/pt.c ++++ b/gcc/cp/pt.c +@@ -13905,45 +13905,6 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain, + if (tree spec = retrieve_specialization (gen_tmpl, argvec, hash)) + return spec; + } +- +- /* We can see more levels of arguments than parameters if +- there was a specialization of a member template, like +- this: +- +- template struct S { template void f(); } +- template <> template void S::f(U); +- +- Here, we'll be substituting into the specialization, +- because that's where we can find the code we actually +- want to generate, but we'll have enough arguments for +- the most general template. +- +- We also deal with the peculiar case: +- +- template struct S { +- template friend void f(); +- }; +- template void f() {} +- template S; +- template void f(); +- +- Here, the ARGS for the instantiation of will be {int, +- double}. But, we only need as many ARGS as there are +- levels of template parameters in CODE_PATTERN. We are +- careful not to get fooled into reducing the ARGS in +- situations like: +- +- template struct S { template void f(U); } +- template template <> void S::f(int) {} +- +- which we can spot because the pattern will be a +- specialization in this case. */ +- int args_depth = TMPL_ARGS_DEPTH (args); +- int parms_depth = +- TMPL_PARMS_DEPTH (DECL_TEMPLATE_PARMS (DECL_TI_TEMPLATE (t))); +- +- if (args_depth > parms_depth && !DECL_TEMPLATE_SPECIALIZATION (t)) +- args = get_innermost_template_args (args, parms_depth); + } + else + { +diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-72.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-72.C +new file mode 100644 +index 00000000000..8009756dcba +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-72.C +@@ -0,0 +1,9 @@ ++// PR c++/100102 ++// { dg-do compile { target c++11 } } ++ ++template struct ratio; ++template struct duration { ++ static constexpr int _S_gcd(); ++ template using __is_harmonic = ratio<_S_gcd>; ++ using type = __is_harmonic; ++}; +diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-72a.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-72a.C +new file mode 100644 +index 00000000000..a4443e18f9d +--- /dev/null ++++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-72a.C +@@ -0,0 +1,9 @@ ++// PR c++/100102 ++// { dg-do compile { target c++11 } } ++ ++template struct ratio; ++template struct duration { ++ static constexpr int _S_gcd(); ++ template using __is_harmonic = ratio<(duration::_S_gcd)()>; ++ using type = __is_harmonic; ++}; +-- +2.27.0 + + diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index a428c81aa..1da694352 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=meson VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 7ed6ff82d..d00491fd7 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -5 +1 diff --git a/source/kde/kde/build/ksystemstats b/source/kde/kde/build/ksystemstats new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/kde/kde/build/ksystemstats @@ -0,0 +1 @@ +1 diff --git a/source/kde/kde/build/latte-dock b/source/kde/kde/build/latte-dock index 00750edc0..d00491fd7 100644 --- a/source/kde/kde/build/latte-dock +++ b/source/kde/kde/build/latte-dock @@ -1 +1 @@ -3 +1 diff --git a/source/kde/kde/build/layer-shell-qt b/source/kde/kde/build/layer-shell-qt new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/kde/kde/build/layer-shell-qt @@ -0,0 +1 @@ +1 diff --git a/source/kde/kde/modules/plasma b/source/kde/kde/modules/plasma index cd71c7dcb..8129d6289 100644 --- a/source/kde/kde/modules/plasma +++ b/source/kde/kde/modules/plasma @@ -11,6 +11,7 @@ plasma-integration kinfocenter libksysguard ksysguard +layer-shell-qt kscreenlocker kwin kwrited @@ -54,3 +55,4 @@ plasma-disks plasma-firewall plasma-systemmonitor qqc2-breeze-style +ksystemstats diff --git a/source/kde/kde/patch/milou.patch b/source/kde/kde/patch/milou.patch deleted file mode 100644 index 2caee005f..000000000 --- a/source/kde/kde/patch/milou.patch +++ /dev/null @@ -1,2 +0,0 @@ -# Forgotten include: -cat $CWD/patch/milou/milou_krunner_include.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/milou/milou_krunner_include.diff b/source/kde/kde/patch/milou/milou_krunner_include.diff deleted file mode 100644 index ffd075cad..000000000 --- a/source/kde/kde/patch/milou/milou_krunner_include.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/qml/CMakeLists.txt 2014-07-10 17:30:16.000000000 +0200 -+++ b/lib/qml/CMakeLists.txt 2014-08-01 14:50:57.417710976 +0200 -@@ -7,7 +7,7 @@ - - target_link_libraries (milouqmlplugin - Qt5::Qml -- -+ KF5::Runner - milou - ) - diff --git a/source/kde/kde/slack-desc/ksystemstats b/source/kde/kde/slack-desc/ksystemstats new file mode 100644 index 000000000..50e932d23 --- /dev/null +++ b/source/kde/kde/slack-desc/ksystemstats @@ -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------------------------------------------------------| +ksystemstats: ksystemstats (daemon to collect system statistics) +ksystemstats: +ksystemstats: SystemStats is a daemon that collects statistics about the running +ksystemstats: system. +ksystemstats: +ksystemstats: +ksystemstats: +ksystemstats: +ksystemstats: +ksystemstats: +ksystemstats: diff --git a/source/kde/kde/slack-desc/layer-shell-qt b/source/kde/kde/slack-desc/layer-shell-qt new file mode 100644 index 000000000..dfe7913e3 --- /dev/null +++ b/source/kde/kde/slack-desc/layer-shell-qt @@ -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 ':'. + + |-----handy-ruler------------------------------------------------------| +layer-shell-qt: layer-shell-qt (Wayland layer surface support) +layer-shell-qt: +layer-shell-qt: This component is meant for applications to be able to easily use +layer-shell-qt: clients based on wlr-layer-shell. +layer-shell-qt: +layer-shell-qt: +layer-shell-qt: +layer-shell-qt: +layer-shell-qt: +layer-shell-qt: +layer-shell-qt: diff --git a/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch b/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch new file mode 100644 index 000000000..3703f8096 --- /dev/null +++ b/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch @@ -0,0 +1,65 @@ +From 0e4ba2ea8c0402f12a645032a14693eb9b1278e6 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 2 Jun 2021 11:09:43 +0200 +Subject: [PATCH] ucm: add _alibpref to get the private device prefix + +It may be useful to get the device prefix for the local configuration. + +Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1251 +Signed-off-by: Jaroslav Kysela +--- + include/use-case.h | 1 + + src/ucm/main.c | 21 +++++++++++++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/include/use-case.h b/include/use-case.h +index ec1a97b0..7890358b 100644 +--- a/include/use-case.h ++++ b/include/use-case.h +@@ -258,6 +258,7 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr, + * - _verb - return current verb + * - _file - return configuration file loaded for current card + * - _alibcfg - return private alsa-lib's configuration for current card ++ * - _alibpref - return private alsa-lib's configuration device prefix for current card + * + * - [=]{NAME}[/[{modifier}|{/device}][/{verb}]] + * - value identifier {NAME} +diff --git a/src/ucm/main.c b/src/ucm/main.c +index 361952f6..3c9ea15d 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -2138,6 +2138,25 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str) + return 0; + } + ++/** ++ * \brief Get device prefix for private alsa-lib configuration ++ * \param uc_mgr Use case manager ++ * \param str Returned value string ++ * \return Zero on success (value is filled), otherwise a negative error code ++ */ ++static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str) ++{ ++ const size_t l = 9; ++ char *s; ++ ++ s = malloc(l); ++ if (s == NULL) ++ return -ENOMEM; ++ snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number); ++ *str = s; ++ return 0; ++} ++ + /** + * \brief Get current - string + * \param uc_mgr Use case manager +@@ -2193,6 +2212,8 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, + + } else if (strcmp(identifier, "_alibcfg") == 0) { + err = get_alibcfg(uc_mgr, (char **)value); ++ } else if (strcmp(identifier, "_alibpref") == 0) { ++ err = get_alibpref(uc_mgr, (char **)value); + } else if (identifier[0] == '_') { + err = -ENOENT; + } else { diff --git a/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch b/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch new file mode 100644 index 000000000..981870ed8 --- /dev/null +++ b/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch @@ -0,0 +1,31 @@ +From 9621d0bff2e60b43e329ffa5059ab19f2914ec14 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 2 Jun 2021 11:21:54 +0200 +Subject: [PATCH] ucm: fix _alibpref string (add '.' delimiter to the end) + +Fixes: 0e4ba2ea ("ucm: add _alibpref to get the private device prefix") +Signed-off-by: Jaroslav Kysela +--- + src/ucm/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ucm/main.c b/src/ucm/main.c +index 3c9ea15d..c9b37b68 100644 +--- a/src/ucm/main.c ++++ b/src/ucm/main.c +@@ -2146,13 +2146,13 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str) + */ + static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str) + { +- const size_t l = 9; ++ const size_t l = 10; + char *s; + + s = malloc(l); + if (s == NULL) + return -ENOMEM; +- snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number); ++ snprintf(s, l, "_ucm%04X.", uc_mgr->ucm_card_number); + *str = s; + return 0; + } diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index ea572df94..559cb6aac 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,6 +81,11 @@ if [ ! -r src/conf/smixer.conf ]; then cp -a $CWD/smixer.conf src/conf fi +# Fix regressions in 1.2.5: +zcat $CWD/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + # Untar the configuration files. We'll install them later. ( mkdir ucm-and-topology-configs cd ucm-and-topology-configs diff --git a/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch b/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch new file mode 100644 index 000000000..88ce8f502 --- /dev/null +++ b/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch @@ -0,0 +1,94 @@ +From ddfc32abf5697de1618b9e7ffdf57a0f97013090 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 2 Jun 2021 08:49:32 +0200 +Subject: [PATCH] conf: fix load_for_all_cards() + +The 63f7745b commit is loading the driver specific configuration +multiple times which ends with the array merges (see the bug). + +Introduce the loaded compound which traces the already loaded +driver configurations and skip the multiple load requests. + +Fixes: https://github.com/alsa-project/alsa-lib/issues/143 +Fixes: 63f7745b ("conf: extend load_for_all_cards hook (id/value table)") +Signed-off-by: Jaroslav Kysela +--- + src/conf.c | 33 ++++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) + +diff --git a/src/conf.c b/src/conf.c +index f6c80031..d863dec6 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -4325,18 +4325,23 @@ static int _snd_config_hook_table(snd_config_t *root, snd_config_t *config, snd_ + int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config, snd_config_t **dst, snd_config_t *private_data ATTRIBUTE_UNUSED) + { + int card = -1, err; ++ snd_config_t *loaded; // trace loaded cards + ++ err = snd_config_top(&loaded); ++ if (err < 0) ++ return err; + do { + err = snd_card_next(&card); + if (err < 0) +- return err; ++ goto __fin_err; + if (card >= 0) { +- snd_config_t *n, *private_data = NULL; ++ snd_config_t *n, *m, *private_data = NULL; + const char *driver; + char *fdriver = NULL; ++ bool load; + err = snd_determine_driver(card, &fdriver); + if (err < 0) +- return err; ++ goto __fin_err; + if (snd_config_search(root, fdriver, &n) >= 0) { + if (snd_config_get_string(n, &driver) < 0) { + if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND) { +@@ -4357,6 +4362,19 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config, + driver = fdriver; + } + __std: ++ load = true; ++ err = snd_config_imake_integer(&m, driver, 1); ++ if (err < 0) ++ goto __err; ++ err = snd_config_add(loaded, m); ++ if (err < 0) { ++ if (err == -EEXIST) { ++ snd_config_delete(m); ++ load = false; ++ } else { ++ goto __err; ++ } ++ } + private_data = _snd_config_hook_private_data(card, driver); + if (!private_data) { + err = -ENOMEM; +@@ -4365,17 +4383,22 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config, + err = _snd_config_hook_table(root, config, private_data); + if (err < 0) + goto __err; +- err = snd_config_hook_load(root, config, &n, private_data); ++ if (load) ++ err = snd_config_hook_load(root, config, &n, private_data); + __err: + if (private_data) + snd_config_delete(private_data); + free(fdriver); + if (err < 0) +- return err; ++ goto __fin_err; + } + } while (card >= 0); ++ snd_config_delete(loaded); + *dst = NULL; + return 0; ++__fin_err: ++ snd_config_delete(loaded); ++ return err; + } + #ifndef DOC_HIDDEN + SND_DLSYM_BUILD_VERSION(snd_config_hook_load_for_all_cards, SND_CONFIG_DLSYM_VERSION_HOOK); diff --git a/source/n/sshfs/sshfs.SlackBuild b/source/n/sshfs/sshfs.SlackBuild index bbc263082..c771495aa 100755 --- a/source/n/sshfs/sshfs.SlackBuild +++ b/source/n/sshfs/sshfs.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sshfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/wpa_supplicant/config/dot.config b/source/n/wpa_supplicant/config/dot.config index 966a98c27..dca4df7c3 100644 --- a/source/n/wpa_supplicant/config/dot.config +++ b/source/n/wpa_supplicant/config/dot.config @@ -114,6 +114,16 @@ CONFIG_EAP_TTLS=y # with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. CONFIG_EAP_FAST=y +# EAP-TEAP +# Note: The current EAP-TEAP implementation is experimental and should not be +# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number +# of conflicting statements and missing details and the implementation has +# vendor specific workarounds for those and as such, may not interoperate with +# any other implementation. This should not be used for anything else than +# experimentation and interoperability testing until those issues has been +# resolved. +#CONFIG_EAP_TEAP=y + # EAP-GTC CONFIG_EAP_GTC=y @@ -123,6 +133,9 @@ CONFIG_EAP_OTP=y # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) #CONFIG_EAP_SIM=y +# Enable SIM simulator (Milenage) for EAP-SIM +#CONFIG_SIM_SIMULATOR=y + # EAP-PSK (experimental; this is _not_ needed for WPA-PSK) #CONFIG_EAP_PSK=y @@ -238,6 +251,13 @@ CONFIG_READLINE=y # wpa_passphrase). This saves about 0.5 kB in code size. #CONFIG_NO_WPA_PASSPHRASE=y +# Simultaneous Authentication of Equals (SAE), WPA3-Personal +CONFIG_SAE=y + +# WPA3-Enterprise (SuiteB-192) +CONFIG_SUITEB=y +CONFIG_SUITEB192=y + # Disable scan result processing (ap_mode=1) to save code size by about 1 kB. # This can be used if ap_scan=1 mode is never enabled. #CONFIG_NO_SCAN_PROCESSING=y @@ -304,6 +324,9 @@ CONFIG_BACKEND=file # Driver support is also needed for IEEE 802.11w. CONFIG_IEEE80211W=y +# Support Operating Channel Validation +#CONFIG_OCV=y + # Select TLS implementation # openssl = OpenSSL (default) # gnutls = GnuTLS @@ -462,6 +485,11 @@ CONFIG_DEBUG_SYSLOG=y # that meet the requirements described above. #CONFIG_NO_RANDOM_POOL=y +# Should we attempt to use the getrandom(2) call that provides more reliable +# yet secure randomness source than /dev/random on Linux 3.17 and newer. +# Requires glibc 2.25 to build, falls back to /dev/random if unavailable. +#CONFIG_GETRANDOM=y + # IEEE 802.11n (High Throughput) support (mainly for AP mode) CONFIG_IEEE80211N=y @@ -503,8 +531,8 @@ CONFIG_P2P=y # Enable TDLS support #CONFIG_TDLS=y -# Wi-Fi Direct -# This can be used to enable Wi-Fi Direct extensions for P2P using an external +# Wi-Fi Display +# This can be used to enable Wi-Fi Display extensions for P2P using an external # program to control the additional information exchanges in the messages. CONFIG_WIFI_DISPLAY=y @@ -597,3 +625,8 @@ CONFIG_BGSCAN_SIMPLE=y # Opportunistic Wireless Encryption (OWE) # Experimental implementation of draft-harkins-owe-07.txt #CONFIG_OWE=y + +# Device Provisioning Protocol (DPP) +# This requires CONFIG_IEEE80211W=y to be enabled, too. (see +# wpa_supplicant/README-DPP for details) +CONFIG_DPP=y diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index 97b7d8d70..eee5ff45e 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} SRCVERSION=$(printf $VERSION | tr _ -) diff --git a/source/xfce/xfce4-settings/xfce4-settings.url b/source/xfce/xfce4-settings/xfce4-settings.url index cac17cc80..a26db2af7 100644 --- a/source/xfce/xfce4-settings/xfce4-settings.url +++ b/source/xfce/xfce4-settings/xfce4-settings.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.1.tar.bz2 +http://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.2.tar.bz2 -- cgit v1.2.3