diff options
Diffstat (limited to 'source')
20 files changed, 256 insertions, 409 deletions
diff --git a/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch b/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch deleted file mode 100644 index 0a45dcf1b..000000000 --- a/source/a/upower/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8e6cb06ff68a283b9857d4d0e831d93c42521534 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 17 Oct 2019 16:36:58 +0200 -Subject: [PATCH 2/7] linux: Fix memory leak in Bluez backend - -g_dbus_proxy_get_cached_property() returns transfer full GVariants. ---- - src/linux/up-device-bluez.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c -index cd89529..5e595a9 100644 ---- a/src/linux/up-device-bluez.c -+++ b/src/linux/up-device-bluez.c -@@ -71,9 +71,10 @@ up_device_bluez_coldplug (UpDevice *device) - GDBusProxy *proxy; - GError *error = NULL; - UpDeviceKind kind; -+ guint16 appearance; - const char *uuid; - const char *model; -- guint16 appearance; -+ GVariant *v; - guchar percentage; - - /* Static device properties */ -@@ -93,10 +94,18 @@ up_device_bluez_coldplug (UpDevice *device) - return FALSE; - } - -- appearance = g_variant_get_uint16 (g_dbus_proxy_get_cached_property (proxy, "Appearance")); -+ v = g_dbus_proxy_get_cached_property (proxy, "Appearance"); -+ appearance = g_variant_get_uint16 (v); - kind = appearance_to_kind (appearance); -- uuid = g_variant_get_string (g_dbus_proxy_get_cached_property (proxy, "Address"), NULL); -- model = g_variant_get_string (g_dbus_proxy_get_cached_property (proxy, "Alias"), NULL); -+ g_variant_unref (v); -+ -+ v = g_dbus_proxy_get_cached_property (proxy, "Address"); -+ uuid = g_variant_get_string (v, NULL); -+ g_variant_unref (v); -+ -+ v = g_dbus_proxy_get_cached_property (proxy, "Alias"); -+ model = g_variant_get_string (v, NULL); -+ g_variant_unref (v); - - /* hardcode some values */ - g_object_set (device, --- -2.24.1 - diff --git a/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch b/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch deleted file mode 100644 index 156631a7f..000000000 --- a/source/a/upower/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ed0dfe4427770776a081877f77f1263491fbe1b6 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 17 Oct 2019 16:43:15 +0200 -Subject: [PATCH 3/7] linux: Fix warning when bluez Appearance property isn't - set - -The Appearance property might not be available, and would cause -warnings like: -upowerd[17733]: g_variant_get_type: assertion 'value != NULL' failed -upowerd[17733]: g_variant_type_is_subtype_of: assertion 'g_variant_type_check (type)' failed -upowerd[17733]: g_variant_get_uint16: assertion 'g_variant_is_of_type (value, G_VARIANT_TYPE_UINT16)' failed ---- - src/linux/up-device-bluez.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c -index 5e595a9..2074746 100644 ---- a/src/linux/up-device-bluez.c -+++ b/src/linux/up-device-bluez.c -@@ -71,7 +71,6 @@ up_device_bluez_coldplug (UpDevice *device) - GDBusProxy *proxy; - GError *error = NULL; - UpDeviceKind kind; -- guint16 appearance; - const char *uuid; - const char *model; - GVariant *v; -@@ -95,9 +94,15 @@ up_device_bluez_coldplug (UpDevice *device) - } - - v = g_dbus_proxy_get_cached_property (proxy, "Appearance"); -- appearance = g_variant_get_uint16 (v); -- kind = appearance_to_kind (appearance); -- g_variant_unref (v); -+ if (v) { -+ guint16 appearance; -+ -+ appearance = g_variant_get_uint16 (v); -+ kind = appearance_to_kind (appearance); -+ g_variant_unref (v); -+ } else { -+ kind = UP_DEVICE_KIND_UNKNOWN; -+ } - - v = g_dbus_proxy_get_cached_property (proxy, "Address"); - uuid = g_variant_get_string (v, NULL); --- -2.24.1 - diff --git a/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch b/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch deleted file mode 100644 index f05b108da..000000000 --- a/source/a/upower/patches/0006-lib-Add-Pen-device-type.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 72b85b8c1371f3396c293d9a2aa373b6a7551f63 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 24 Oct 2019 12:50:26 +0200 -Subject: [PATCH 6/7] lib: Add "Pen" device type - -So we can track the battery information for powered tablet pens, rather -than labelling them as tablets. ---- - libupower-glib/up-device.c | 6 ++++-- - libupower-glib/up-types.c | 4 ++++ - libupower-glib/up-types.h | 1 + - src/linux/integration-test | 3 ++- - 4 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c -index e21274d..01f752f 100644 ---- a/libupower-glib/up-device.c -+++ b/libupower-glib/up-device.c -@@ -313,7 +313,8 @@ up_device_to_text (UpDevice *device) - kind == UP_DEVICE_KIND_BATTERY || - kind == UP_DEVICE_KIND_MOUSE || - kind == UP_DEVICE_KIND_KEYBOARD || -- kind == UP_DEVICE_KIND_GAMING_INPUT) && -+ kind == UP_DEVICE_KIND_GAMING_INPUT || -+ kind == UP_DEVICE_KIND_PEN) && - !is_display) - g_string_append_printf (string, " rechargeable: %s\n", up_device_bool_to_string (up_exported_device_get_is_rechargeable (priv->proxy_device))); - if (kind == UP_DEVICE_KIND_BATTERY || -@@ -367,7 +368,8 @@ up_device_to_text (UpDevice *device) - kind == UP_DEVICE_KIND_COMPUTER || - kind == UP_DEVICE_KIND_MEDIA_PLAYER || - kind == UP_DEVICE_KIND_UPS || -- kind == UP_DEVICE_KIND_GAMING_INPUT) { -+ kind == UP_DEVICE_KIND_GAMING_INPUT || -+ kind == UP_DEVICE_KIND_PEN) { - if (battery_level == UP_DEVICE_LEVEL_NONE) - g_string_append_printf (string, " percentage: %g%%\n", up_exported_device_get_percentage (priv->proxy_device)); - else -diff --git a/libupower-glib/up-types.c b/libupower-glib/up-types.c -index 525cd02..7cf9573 100644 ---- a/libupower-glib/up-types.c -+++ b/libupower-glib/up-types.c -@@ -71,6 +71,8 @@ up_device_kind_to_string (UpDeviceKind type_enum) - return "computer"; - case UP_DEVICE_KIND_GAMING_INPUT: - return "gaming-input"; -+ case UP_DEVICE_KIND_PEN: -+ return "pen"; - default: - return "unknown"; - } -@@ -113,6 +115,8 @@ up_device_kind_from_string (const gchar *type) - return UP_DEVICE_KIND_TABLET; - if (g_str_equal (type, "gaming-input")) - return UP_DEVICE_KIND_GAMING_INPUT; -+ if (g_str_equal (type, "pen")) -+ return UP_DEVICE_KIND_PEN; - return UP_DEVICE_KIND_UNKNOWN; - } - -diff --git a/libupower-glib/up-types.h b/libupower-glib/up-types.h -index 079bccd..379d46c 100644 ---- a/libupower-glib/up-types.h -+++ b/libupower-glib/up-types.h -@@ -49,6 +49,7 @@ typedef enum { - UP_DEVICE_KIND_TABLET, - UP_DEVICE_KIND_COMPUTER, - UP_DEVICE_KIND_GAMING_INPUT, -+ UP_DEVICE_KIND_PEN, - UP_DEVICE_KIND_LAST - } UpDeviceKind; - -diff --git a/src/linux/integration-test b/src/linux/integration-test -index 7098a67..e5c6c46 100755 ---- a/src/linux/integration-test -+++ b/src/linux/integration-test -@@ -86,7 +86,8 @@ BATTERY_IFACE = 'org.bluez.Battery1' - UP_DEVICE_KIND_MEDIA_PLAYER, - UP_DEVICE_KIND_TABLET, - UP_DEVICE_KIND_COMPUTER, -- UP_DEVICE_KIND_GAMING_INPUT) = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) -+ UP_DEVICE_KIND_GAMING_INPUT, -+ UP_DEVICE_KIND_PEN) = (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13) - - class Tests(dbusmock.DBusTestCase): - @classmethod --- -2.24.1 - diff --git a/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch b/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch deleted file mode 100644 index 13624db09..000000000 --- a/source/a/upower/patches/0007-linux-Detect-Bluetooth-pens.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 85cd95ae53499788a0df86af28876ec27074caa2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 24 Oct 2019 12:52:33 +0200 -Subject: [PATCH 1/3] linux: Detect Bluetooth pens - -Numbers from: -https://www.bluetooth.com/specifications/assigned-numbers/baseband/ ---- - src/linux/up-device-bluez.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/linux/up-device-bluez.c b/src/linux/up-device-bluez.c -index 2074746..8673d82 100644 ---- a/src/linux/up-device-bluez.c -+++ b/src/linux/up-device-bluez.c -@@ -52,6 +52,9 @@ appearance_to_kind (guint16 appearance) - return UP_DEVICE_KIND_GAMING_INPUT; - case 0x05: - return UP_DEVICE_KIND_TABLET; -+ case 0x0e: -+ case 0x0f: -+ return UP_DEVICE_KIND_PEN; - } - break; - } --- -2.26.2 - diff --git a/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch b/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch deleted file mode 100644 index f8fece700..000000000 --- a/source/a/upower/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e0b8354e9cf53a271e66a7ba44fd567daeac2416 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Tue, 5 May 2020 16:07:31 +0200 -Subject: [PATCH 2/3] linux: Identify keyboard/pointing device combos as - keyboards - -Rather than using the type of the first sibling device we find, which is -usually the pointing device portion, make sure that keyboard/pointing -device combo devices are identified as keyboards. ---- - src/linux/up-device-supply.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c -index d7e4423..9302119 100644 ---- a/src/linux/up-device-supply.c -+++ b/src/linux/up-device-supply.c -@@ -888,7 +888,7 @@ up_device_supply_get_sibling_with_subsystem (GUdevDevice *device, - class[0] = subsystem; - client = g_udev_client_new (class); - devices = g_udev_client_query_by_subsystem (client, subsystem); -- for (l = devices; l != NULL && sibling == NULL; l = l->next) { -+ for (l = devices; l != NULL; l = l->next) { - GUdevDevice *d = l->data; - GUdevDevice *p; - const char *p_path; -@@ -897,8 +897,14 @@ up_device_supply_get_sibling_with_subsystem (GUdevDevice *device, - if (!p) - continue; - p_path = g_udev_device_get_sysfs_path (p); -- if (g_strcmp0 (p_path, parent_path) == 0) -- sibling = g_object_ref (d); -+ if (g_strcmp0 (p_path, parent_path) == 0) { -+ if (sibling != NULL && -+ g_udev_device_get_property_as_boolean (d, "ID_INPUT_KEYBOARD")) { -+ g_clear_object (&sibling); -+ } -+ if (sibling == NULL) -+ sibling = g_object_ref (d); -+ } - - g_object_unref (p); - } --- -2.26.2 - diff --git a/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch b/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch deleted file mode 100644 index 2426e044b..000000000 --- a/source/a/upower/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 97185bae75b16bea48d532aa5511417e485b1c06 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 17 Jun 2020 10:51:09 +0200 -Subject: [PATCH 1/4] linux: Add support for iPhone XR, XS models - -Modifying the udev serial to be acceptable as an hyphened UDID, as the -usbmux stack expects. - -Closes: #114 ---- - src/linux/up-device-idevice.c | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c -index a808269..d2fa0a1 100644 ---- a/src/linux/up-device-idevice.c -+++ b/src/linux/up-device-idevice.c -@@ -203,6 +203,28 @@ out: - return G_SOURCE_CONTINUE; - } - -+static char * -+get_device_uuid (GUdevDevice *native) -+{ -+ const char *uuid; -+ char *retval; -+ -+ uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT"); -+ if (uuid == NULL) -+ return NULL; -+ -+ if (strlen (uuid) != 24) -+ return g_strdup (uuid); -+ -+ /* new style UDID: add hyphen between first 8 and following 16 digits */ -+ retval = g_malloc0 (24 + 1 + 1); -+ memcpy (&retval[0], &uuid[0], 8); -+ retval[8] = '-'; -+ memcpy (&retval[9], &uuid[8], 16); -+ -+ return retval; -+} -+ - /** - * up_device_idevice_coldplug: - * -@@ -213,7 +235,7 @@ up_device_idevice_coldplug (UpDevice *device) - { - UpDeviceIdevice *idevice = UP_DEVICE_IDEVICE (device); - GUdevDevice *native; -- const gchar *uuid; -+ char *uuid; - const gchar *model; - UpDeviceKind kind; - -@@ -223,7 +245,7 @@ up_device_idevice_coldplug (UpDevice *device) - return FALSE; - - /* Get the UUID */ -- uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT"); -+ uuid = get_device_uuid (native); - if (uuid == NULL) - return FALSE; - -@@ -253,6 +275,8 @@ up_device_idevice_coldplug (UpDevice *device) - g_source_set_name_by_id (idevice->priv->start_id, - "[upower] up_device_idevice_start_poll_cb (linux)"); - -+ g_free (uuid); -+ - return TRUE; - } - --- -2.27.0 - diff --git a/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch b/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch deleted file mode 100644 index d7e24ecf0..000000000 --- a/source/a/upower/patches/0012-build-Use-a-newer-libplist-if-available.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 694207d3f08bdd2095f01eee09eb523363800825 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Tue, 16 Jun 2020 14:04:25 +0200 -Subject: [PATCH 2/4] build: Use a newer libplist if available - ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a96b794..5f08d91 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,8 +202,10 @@ if test x$with_backend = xlinux; then - PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0]) - AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]), - with_idevice=$withval,with_idevice=yes) -+ LIBPLIST_DEP=libplist -+ PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0) - AS_IF([test "x$with_idevice" != "xno"], -- [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist >= 0.12, have_idevice=yes, have_idevice=no)], -+ [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 $LIBPLIST_DEP, have_idevice=yes, have_idevice=no)], - [have_idevice=no]) - AS_IF([test "x$have_idevice" = "xyes"], - [AC_DEFINE(HAVE_IDEVICE, 1, [Define to 1 if iDevice is going to be built])]) --- -2.27.0 - diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild index 5c9e49d85..22dcb2cca 100755 --- a/source/a/upower/upower.SlackBuild +++ b/source/a/upower/upower.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=upower VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -90,14 +90,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0006-lib-Add-Pen-device-type.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0007-linux-Detect-Bluetooth-pens.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0012-build-Use-a-newer-libplist-if-available.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 99b86d080..a20ba1e89 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.52.1} +VERSION=${VERSION:-1.53.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.51.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2021-03-25} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.51.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.52.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2021-05-06} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.52.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -67,7 +67,7 @@ fi # If the bootstrap binaries are present, use those. Otherwise bootstrap from # installed compiler. -if /bin/ls *-unknown-linux-gnu.tar.gz 1> /dev/null 2> /dev/null ; then +if /bin/ls *-unknown-linux-gnu.tar.?z 1> /dev/null 2> /dev/null ; then LOCAL_BOOTSTRAP=no else LOCAL_BOOTSTRAP=yes @@ -153,9 +153,7 @@ if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR fi -# Build configuration. We'll go ahead and build with rpath because it may be -# needed during the build, and then we'll strip the rpaths out of the -# binaries later. +# Build configuration: cat << EOF > config.toml [llvm] ccache = "/usr/bin/ccache" @@ -165,6 +163,7 @@ link-shared = true build = "$BARCH-unknown-linux-$BABI" host = ["$TARCH-unknown-linux-$BABI"] target = ["$TARCH-unknown-linux-$BABI"] +tools = ["analysis", "cargo", "clippy", "rls", "rustfmt", "src"] submodules = false vendor = true extended = true @@ -178,7 +177,7 @@ mandir = "man" [rust] codegen-units = 0 channel = "stable" -rpath = true +rpath = false codegen-tests = false ignore-git = true @@ -232,7 +231,7 @@ elif [ "$BARCH" = "i686" ] ; then fi # Build and install: -python3 x.py dist || exit 1 +python3 ./x.py build || exit 1 DESTDIR=$PKG python3 x.py install || exit 1 # Eh, none of this is all that big. Might as well leave it around as a @@ -258,11 +257,12 @@ find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Remove any compiled-in RPATHs: -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | while read elfobject ; do - patchelf --remove-rpath $elfobject || exit 1 -done +# Commented out (for now) since we disable rpaths in config.toml: +## Remove any compiled-in RPATHs: +#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +# | cut -f 1 -d : | while read elfobject ; do +# patchelf --remove-rpath $elfobject || exit 1 +#done # Compress man pages: find $PKG/usr/man -type f -exec gzip -9 {} \+ diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index b77baf645..027157599 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.lz): -VERSION=1.52.1 +VERSION=1.53.0 rm -f rustc-${VERSION}-src.tar.* lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc @@ -20,16 +20,16 @@ fi # update the settings below, look at src/stage0.txt in the Rust sources. exit 0 -BOOTSTRAP_DATE=2021-03-25 -BOOTSTRAP_CARGO=1.51.0 -BOOTSTRAP_VERSION=1.51.0 +BOOTSTRAP_DATE=2021-05-06 +BOOTSTRAP_CARGO=1.52.0 +BOOTSTRAP_VERSION=1.52.0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.xz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-x86_64-unknown-linux-gnu.tar.xz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz +lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz diff --git a/source/k/kernel-configs/config-generic-5.12.11 b/source/k/kernel-configs/config-generic-5.12.12 index b35ac8be4..f68ab1c05 100644 --- a/source/k/kernel-configs/config-generic-5.12.11 +++ b/source/k/kernel-configs/config-generic-5.12.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.12.11.x64 b/source/k/kernel-configs/config-generic-5.12.12.x64 index 10c497652..18b59cb5a 100644 --- a/source/k/kernel-configs/config-generic-5.12.11.x64 +++ b/source/k/kernel-configs/config-generic-5.12.12.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.12.11-smp b/source/k/kernel-configs/config-generic-smp-5.12.12-smp index 02eee2486..85a5d56aa 100644 --- a/source/k/kernel-configs/config-generic-smp-5.12.11-smp +++ b/source/k/kernel-configs/config-generic-smp-5.12.12-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.12.11 b/source/k/kernel-configs/config-huge-5.12.12 index f25756f2a..56558fa21 100644 --- a/source/k/kernel-configs/config-huge-5.12.11 +++ b/source/k/kernel-configs/config-huge-5.12.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.12.11.x64 b/source/k/kernel-configs/config-huge-5.12.12.x64 index b75e5baad..ebaf4bf94 100644 --- a/source/k/kernel-configs/config-huge-5.12.11.x64 +++ b/source/k/kernel-configs/config-huge-5.12.12.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.12.11-smp b/source/k/kernel-configs/config-huge-smp-5.12.12-smp index e700437e4..c62bda964 100644 --- a/source/k/kernel-configs/config-huge-smp-5.12.11-smp +++ b/source/k/kernel-configs/config-huge-smp-5.12.12-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.12.11 Kernel Configuration +# Linux/x86 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/kdeconnect-kde b/source/kde/kde/build/kdeconnect-kde index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kdeconnect-kde +++ b/source/kde/kde/build/kdeconnect-kde @@ -1 +1 @@ -1 +2 diff --git a/source/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild index cbd933e54..8c78f0e0c 100755 --- a/source/l/gdbm/gdbm.SlackBuild +++ b/source/l/gdbm/gdbm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdbm 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/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index e545a4abb..d29ce41a7 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -141,6 +141,9 @@ cd seamonkey-${TARBALLVER} || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/sm.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1 +# Fix syntax for NSS 3.66+: +zcat $CWD/seamonkey.nss-3.66.patch.gz | patch -p1 --verbose || exit 1 + # Make sure the perms/ownerships are sane: chown -R root:root . find . \ diff --git a/source/xap/seamonkey/seamonkey.nss-3.66.patch b/source/xap/seamonkey/seamonkey.nss-3.66.patch new file mode 100644 index 000000000..253d0021a --- /dev/null +++ b/source/xap/seamonkey/seamonkey.nss-3.66.patch @@ -0,0 +1,219 @@ +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/ActorsParent.cpp +--- seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp 2020-08-10 13:30:33.000000000 +0200 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/ActorsParent.cpp 2021-06-03 09:50:00.029405152 +0200 +@@ -11381,7 +11381,7 @@ + MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE || + mDEBUGTransaction->GetMode() == + IDBTransaction::READ_WRITE_FLUSH || +- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mDEBUGTransaction->GetMode() == IDBTransaction::_CLEANUP || + mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + if (NS_FAILED(mConnection->RollbackSavepoint())) { +@@ -11397,7 +11397,7 @@ + MOZ_ASSERT(aTransaction); + MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE || + aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- aTransaction->GetMode() == IDBTransaction::CLEANUP || ++ aTransaction->GetMode() == IDBTransaction::_CLEANUP || + aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection(); +@@ -14540,7 +14540,7 @@ + if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY && + aMode != IDBTransaction::READ_WRITE && + aMode != IDBTransaction::READ_WRITE_FLUSH && +- aMode != IDBTransaction::CLEANUP)) { ++ aMode != IDBTransaction::_CLEANUP)) { + ASSERT_UNLESS_FUZZING(); + return nullptr; + } +@@ -14549,7 +14549,7 @@ + // has write access. + if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP) && ++ aMode == IDBTransaction::_CLEANUP) && + mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo && + !mChromeWriteAccessAllowed)) { + return nullptr; +@@ -14615,7 +14615,7 @@ + MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY || + aMode == IDBTransaction::READ_WRITE || + aMode == IDBTransaction::READ_WRITE_FLUSH || +- aMode == IDBTransaction::CLEANUP); ++ aMode == IDBTransaction::_CLEANUP); + MOZ_ASSERT(!mClosed); + + if (IsInvalidated()) { +@@ -14778,7 +14778,7 @@ + + Transaction()->SetActiveOnConnectionThread(); + +- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) { ++ if (Transaction()->GetMode() == IDBTransaction::_CLEANUP) { + nsresult rv = aConnection->DisableQuotaChecks(); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; +@@ -15097,7 +15097,7 @@ + case RequestParams::TObjectStoreDeleteParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::_CLEANUP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -15121,7 +15121,7 @@ + case RequestParams::TObjectStoreClearParams: { + if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE && + mMode != IDBTransaction::READ_WRITE_FLUSH && +- mMode != IDBTransaction::CLEANUP && ++ mMode != IDBTransaction::_CLEANUP && + mMode != IDBTransaction::VERSION_CHANGE)) { + ASSERT_UNLESS_FUZZING(); + return false; +@@ -23880,7 +23880,7 @@ + mTransaction->AssertIsOnConnectionThread(); + MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE || + mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mTransaction->GetMode() == IDBTransaction::_CLEANUP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -23948,7 +23948,7 @@ + mTransaction->AssertIsOnConnectionThread(); + MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE || + mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH || +- mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ mTransaction->GetMode() == IDBTransaction::_CLEANUP || + mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE); + + nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray = +@@ -24080,7 +24080,7 @@ + + connection->FinishWriteTransaction(); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) { ++ if (mTransaction->GetMode() == IDBTransaction::_CLEANUP) { + connection->DoIdleProcessing(/* aNeedsCheckpoint */ true); + + connection->EnableQuotaChecks(); +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBCursor.cpp +--- seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp 2020-08-10 13:30:33.000000000 +0200 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBCursor.cpp 2021-06-03 09:50:17.112733298 +0200 +@@ -686,7 +686,7 @@ + return nullptr; + } + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::_CLEANUP || + IsSourceDeleted() || + !mHaveValue || + mType == Type_ObjectStoreKey || +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBDatabase.cpp +--- seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp 2020-04-01 13:01:50.000000000 +0200 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBDatabase.cpp 2021-06-03 09:49:17.882753478 +0200 +@@ -673,7 +673,7 @@ + break; + case IDBTransactionMode::Readwrite: + if (mQuotaExceeded) { +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::_CLEANUP; + mQuotaExceeded = false; + } else { + mode = IDBTransaction::READ_WRITE; +@@ -683,7 +683,7 @@ + mode = IDBTransaction::READ_WRITE_FLUSH; + break; + case IDBTransactionMode::Cleanup: +- mode = IDBTransaction::CLEANUP; ++ mode = IDBTransaction::_CLEANUP; + mQuotaExceeded = false; + break; + case IDBTransactionMode::Versionchange: +@@ -717,7 +717,7 @@ + + transaction->SetBackgroundActor(actor); + +- if (mode == IDBTransaction::CLEANUP) { ++ if (mode == IDBTransaction::_CLEANUP) { + ExpireFileActors(/* aExpireAll */ true); + } + +@@ -870,7 +870,7 @@ + // We warn for any transactions that could have written data. + case IDBTransaction::READ_WRITE: + case IDBTransaction::READ_WRITE_FLUSH: +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::_CLEANUP: + case IDBTransaction::VERSION_CHANGE: + transactionsThatNeedWarning.AppendElement(transaction); + break; +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBObjectStore.cpp +--- seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp 2020-08-10 13:30:33.000000000 +0200 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBObjectStore.cpp 2021-06-03 09:50:08.506069171 +0200 +@@ -1546,7 +1546,7 @@ + MOZ_ASSERT(aCx); + MOZ_ASSERT_IF(aFromCursor, aOverwrite); + +- if (mTransaction->GetMode() == IDBTransaction::CLEANUP || ++ if (mTransaction->GetMode() == IDBTransaction::_CLEANUP || + mDeletedSpec) { + aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR); + return nullptr; +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBTransaction.cpp +--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp 2020-02-18 00:37:49.000000000 +0100 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBTransaction.cpp 2021-06-03 09:49:38.769412315 +0200 +@@ -221,7 +221,7 @@ + MOZ_ASSERT(aMode == READ_ONLY || + aMode == READ_WRITE || + aMode == READ_WRITE_FLUSH || +- aMode == CLEANUP); ++ aMode == _CLEANUP); + + RefPtr<IDBTransaction> transaction = + new IDBTransaction(aDatabase, aObjectStoreNames, aMode); +@@ -913,7 +913,7 @@ + case READ_WRITE_FLUSH: + return IDBTransactionMode::Readwriteflush; + +- case CLEANUP: ++ case _CLEANUP: + return IDBTransactionMode::Cleanup; + + case VERSION_CHANGE: +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBTransaction.h +--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h 2020-02-18 00:37:49.000000000 +0100 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/IDBTransaction.h 2021-06-03 09:50:53.802723917 +0200 +@@ -59,7 +59,7 @@ + READ_ONLY = 0, + READ_WRITE, + READ_WRITE_FLUSH, +- CLEANUP, ++ _CLEANUP, + VERSION_CHANGE, + + // Only needed for IPC serialization helper, should never be used in code. +@@ -194,7 +194,7 @@ + AssertIsOnOwningThread(); + return mMode == READ_WRITE || + mMode == READ_WRITE_FLUSH || +- mMode == CLEANUP || ++ mMode == _CLEANUP || + mMode == VERSION_CHANGE; + } + +diff -rauN seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/ProfilerHelpers.h +--- seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h 2020-02-18 00:37:49.000000000 +0100 ++++ seamonkey-2.53.7.1-CLEANUP-patch/dom/indexedDB/ProfilerHelpers.h 2021-06-03 09:49:29.132749162 +0200 +@@ -130,7 +130,7 @@ + case IDBTransaction::READ_WRITE_FLUSH: + AppendLiteral("\"readwriteflush\""); + break; +- case IDBTransaction::CLEANUP: ++ case IDBTransaction::_CLEANUP: + AppendLiteral("\"cleanup\""); + break; + case IDBTransaction::VERSION_CHANGE: |