Fri Aug 9 21:22:03 UTC 202420240809212203

ap/mariadb-10.11.9-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://mariadb.com/kb/en/mariadb-10-11-9-release-notes/
d/rust-1.80.1-x86_64-1.txz:  Upgraded.
l/polkit-125-x86_64-1.txz:  Upgraded.
l/python-babel-2.16.0-x86_64-1.txz:  Upgraded.
l/vte-0.76.4-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.48.8-x86_64-1.txz:  Upgraded.
x/OpenCC-1.1.9-x86_64-1.txz:  Upgraded.

3 files changed, 6 insertions, 90 deletions

diff --git a/source/l/polkit/polkit-124-systemd-fixup.patch b/source/l/polkit/polkit-124-systemd-fixup.patch
deleted file mode 100644
index a4dd7eafc..000000000
--- a/source/l/polkit/polkit-124-systemd-fixup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/922458
-https://github.com/polkit-org/polkit/pull/417/files#r1458416421
---- a/meson.build
-+++ b/meson.build
-@@ -212,14 +212,17 @@ if enable_logind
-   config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
- 
-   # systemd unit / service files
--  systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-   systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
--  if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
--    # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
--    systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
--  endif
-+  if session_tracking == 'libsystemd-login'
-+    systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
- 
--  systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
-+    if systemd_systemdsystemunitdir == ''
-+      # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
-+      systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-+    endif
-+
-+    systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
-+  endif
- endif
- config_h.set('HAVE_LIBSYSTEMD', enable_logind)
- 
diff --git a/source/l/polkit/polkit-124-systemd.patch b/source/l/polkit/polkit-124-systemd.patch
deleted file mode 100644
index e9b10e99e..000000000
--- a/source/l/polkit/polkit-124-systemd.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/polkit-org/polkit/pull/417
-
-From 69d6b94d590b4dd1fbbac22b4f4d449f46ef61aa Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Thu, 18 Jan 2024 15:07:32 +0000
-Subject: [PATCH] meson: fix build failure when -Dsystemdsystemunitdir is
- specified
-
-When 'systemdsystemunitdir' is specified as an option the systemd_dep
-variable is not defined, but the sysusers.d directory lookup uses it,
-causing a build failure:
-
-dh_auto_configure -- \
-	-Dexamples=false \
-	-Dintrospection=true \
-	-Dman=true \
-	-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-	-Dtests=true \
-	-Dgtk_doc=true -Dsession_tracking=libsystemd-login
-	cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb LC_ALL=C.UTF-8 meson setup .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu -Dpython.bytecompile=-1 -Dexamples=false -Dintrospection=true -Dman=true -Dsystemdsystemunitdir=/usr/lib/systemd/system -Dtests=true -Dgtk_doc=true -Dsession_tracking=libsystemd-login
-The Meson build system
-Version: 1.3.1
-Source dir: /builds/bluca/polkit/debian/output/source_dir
-Build dir: /builds/bluca/polkit/debian/output/source_dir/obj-x86_64-linux-gnu
-Build type: native build
-Project name: polkit
-Project version: 124
-
-<...>
-
-Run-time dependency libsystemd found: YES 255
-Checking for function "sd_uid_get_display" with dependency libsystemd: YES
-Checking for function "sd_pidfd_get_session" with dependency libsystemd: YES
-../meson.build:222:37: ERROR: Unknown variable "systemd_dep".
-
-Follow-up for 24f1e0af3f7bd17e220cb96201f3c654e737ad34
---- a/meson.build
-+++ b/meson.build
-@@ -212,9 +212,9 @@ if enable_logind
-   config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
- 
-   # systemd unit / service files
-+  systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-   systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
-   if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
--    systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-     # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
-     systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-   endif
-
diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild
index f83b85613..7cb04f862 100755
--- a/source/l/polkit/polkit.SlackBuild
+++ b/source/l/polkit/polkit.SlackBuild
@@ -26,12 +26,12 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=polkit
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -51,14 +51,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+if [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=pentium4 -mtune=generic"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -82,9 +79,6 @@ find . \
 
 zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 --verbose || exit 1
 
-cat $CWD/polkit-124-systemd.patch | patch -p1 --verbose || exit 1
-cat $CWD/polkit-124-systemd-fixup.patch | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -103,7 +97,7 @@ meson setup \
   --localstatedir=/var \
   --buildtype=release \
   -Dintrospection=true \
-  -Dsession_tracking=libelogind \
+  -Dsession_tracking=elogind \
   -Dsystemdsystemunitdir=/usr/lib/systemd/user \
   -Dauthfw=pam \
   -Dpam_module_dir=/lib${LIBDIRSUFFIX}/security \