summaryrefslogtreecommitdiffstats
path: root/source/a/upower
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-04-13 01:10:11 +0000
committer Eric Hameleers <alien@slackware.com>2023-04-13 04:37:52 +0200
commit701cf3165a2eaae89658ea8ba070e344d8f24385 (patch)
treeb1768c92eb1c3445b5ade6bb5a62a482d3b98d1c /source/a/upower
parent59f80800c2ed60cbc51060bdfc90eb56292d41d0 (diff)
downloadcurrent-701cf3165a2eaae89658ea8ba070e344d8f24385.tar.gz
current-701cf3165a2eaae89658ea8ba070e344d8f24385.tar.xz
Thu Apr 13 01:10:11 UTC 202320230413011011
a/f2fs-tools-1.16.0-x86_64-1.txz: Upgraded. a/upower-1.90.0-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.27.4-x86_64-3.txz: Rebuilt. [PATCH] gtk3: restore old icon size for titlebutton Thanks to marav. kde/kwin-5.27.4.1-x86_64-1.txz: Upgraded. l/at-spi2-core-2.48.0-x86_64-1.txz: Upgraded. l/gjs-1.76.0-x86_64-1.txz: Upgraded. l/glib-networking-2.76.0-x86_64-1.txz: Upgraded. l/glib2-2.76.1-x86_64-1.txz: Upgraded. l/gst-plugins-bad-free-1.22.2-x86_64-1.txz: Upgraded. l/gst-plugins-base-1.22.2-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.22.2-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.22.2-x86_64-1.txz: Upgraded. l/gstreamer-1.22.2-x86_64-1.txz: Upgraded. l/librsvg-2.56.0-x86_64-1.txz: Upgraded. l/libsoup3-3.4.0-x86_64-1.txz: Upgraded. l/libwnck3-43.0-x86_64-1.txz: Upgraded. l/openal-soft-1.23.1-x86_64-1.txz: Upgraded. l/pygobject3-3.44.1-x86_64-1.txz: Upgraded. l/vte-0.72.0-x86_64-1.txz: Upgraded. n/dhcpcd-9.5.0-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-102.10.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/102.10.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2023-15/ https://www.mozilla.org/en-US/security/advisories/mfsa2023-15/#MFSA-TMP-2023-0001 https://www.cve.org/CVERecord?id=CVE-2023-29531 https://www.cve.org/CVERecord?id=CVE-2023-29532 https://www.cve.org/CVERecord?id=CVE-2023-29533 https://www.cve.org/CVERecord?id=CVE-2023-29535 https://www.cve.org/CVERecord?id=CVE-2023-29536 https://www.cve.org/CVERecord?id=CVE-2023-0547 https://www.cve.org/CVERecord?id=CVE-2023-29479 https://www.cve.org/CVERecord?id=CVE-2023-29539 https://www.cve.org/CVERecord?id=CVE-2023-29541 https://www.cve.org/CVERecord?id=CVE-2023-29542 https://www.cve.org/CVERecord?id=CVE-2023-29545 https://www.cve.org/CVERecord?id=CVE-2023-1945 https://www.cve.org/CVERecord?id=CVE-2023-29548 https://www.cve.org/CVERecord?id=CVE-2023-29550 (* Security fix *)
Diffstat (limited to 'source/a/upower')
-rw-r--r--source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch43
-rwxr-xr-xsource/a/upower/upower.SlackBuild46
2 files changed, 70 insertions, 19 deletions
diff --git a/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch b/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch
new file mode 100644
index 000000000..ff80079ea
--- /dev/null
+++ b/source/a/upower/81a89385a45d3de1028bcd86b3688fb465b4035c.patch
@@ -0,0 +1,43 @@
+From 81a89385a45d3de1028bcd86b3688fb465b4035c Mon Sep 17 00:00:00 2001
+From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
+Date: Fri, 21 Oct 2022 00:14:18 +0200
+Subject: [PATCH] enumerator-udev: actually check for an idevice
+
+up-enumerator-udev.c forgot to include the build config file, resulting in
+HAVE_IDEVICE macro always being undefined.
+
+This meant that the idevice backend was never actually instantiated - as
+evidenced by the file not even compiling when this was fixed, due to
+missing "up-device-idevice.h" include.
+
+Fix both of these issues.
+---
+ src/linux/up-enumerator-udev.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/linux/up-enumerator-udev.c b/src/linux/up-enumerator-udev.c
+index 9e52d153..1182bdfd 100644
+--- a/src/linux/up-enumerator-udev.c
++++ b/src/linux/up-enumerator-udev.c
+@@ -18,6 +18,8 @@
+ *
+ */
+
++#include "config.h"
++
+ #include <string.h>
+
+ #include <gudev/gudev.h>
+@@ -29,6 +31,9 @@
+ #include "up-device-supply-battery.h"
+ #include "up-device-hid.h"
+ #include "up-device-wup.h"
++#ifdef HAVE_IDEVICE
++#include "up-device-idevice.h"
++#endif /* HAVE_IDEVICE */
+
+ struct _UpEnumeratorUdev {
+ UpEnumerator parent;
+--
+GitLab
+
diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild
index 22dcb2cca..dfcc52113 100755
--- a/source/a/upower/upower.SlackBuild
+++ b/source/a/upower/upower.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for upower
# Copyright 2010, 2011, 2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -48,7 +49,7 @@ fi
# the name of the created package would be, and then exit. This information
# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ echo "$PKGNAM-$(echo $VERSION | sed "s/v//g")-$ARCH-$BUILD.txz"
exit 0
fi
@@ -90,21 +91,31 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Fix libimobiledevice support:
+zcat $CWD/81a89385a45d3de1028bcd86b3688fb465b4035c.patch.gz | patch -p1 --verbose || exit 1
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-static \
- --enable-man-pages \
- --build=$TARGET || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+ --buildtype=release \
+ -Dsystemdsystemunitdir=no \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
# Add upower policy allowing users in the 'power' group
# to suspend/hibernate the computer:
@@ -113,9 +124,6 @@ install -m 0644 -o root \
$CWD/10-enable-upower-suspend.rules \
$PKG/usr/share/polkit-1/rules.d/10-enable-upower-suspend.rules.new
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -125,14 +133,14 @@ mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$(echo $VERSION | sed "s/v//g")
cp -a \
AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \
- $PKG/usr/doc/$PKGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$(echo $VERSION | sed "s/v//g")
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | sed "s/v//g")-$ARCH-$BUILD.txz