upower: 0.99.13 -> 0.99.16

5 files changed, 109 insertions, 37 deletions

diff --git a/upower/.footprint b/upower/.footprint
index 20bc412c9..16faf86f1 100644
--- a/upower/.footprint
+++ b/upower/.footprint
@@ -24,15 +24,13 @@ drwxr-xr-x	root/root	usr/include/libupower-glib/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/UPowerGlib-1.0.typelib
--rw-r--r--	root/root	usr/lib/libupower-glib.a
--rwxr-xr-x	root/root	usr/lib/libupower-glib.la
-lrwxrwxrwx	root/root	usr/lib/libupower-glib.so -> libupower-glib.so.3.0.1
-lrwxrwxrwx	root/root	usr/lib/libupower-glib.so.3 -> libupower-glib.so.3.0.1
--rwxr-xr-x	root/root	usr/lib/libupower-glib.so.3.0.1
+lrwxrwxrwx	root/root	usr/lib/libupower-glib.so -> libupower-glib.so.3
+lrwxrwxrwx	root/root	usr/lib/libupower-glib.so.3 -> libupower-glib.so.3.1.0
+-rwxr-xr-x	root/root	usr/lib/libupower-glib.so.3.1.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/upower-glib.pc
-drwxr-xr-x	root/root	usr/lib/upower/
--rwxr-xr-x	root/root	usr/lib/upower/upowerd
+drwxr-xr-x	root/root	usr/libexec/
+-rwxr-xr-x	root/root	usr/libexec/upowerd
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
@@ -46,13 +44,6 @@ drwxr-xr-x	root/root	usr/share/dbus-1/system.d/
 -rw-r--r--	root/root	usr/share/dbus-1/system.d/org.freedesktop.UPower.conf
 drwxr-xr-x	root/root	usr/share/gir-1.0/
 -rw-r--r--	root/root	usr/share/gir-1.0/UPowerGlib-1.0.gir
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/upower.1.gz
-drwxr-xr-x	root/root	usr/share/man/man7/
--rw-r--r--	root/root	usr/share/man/man7/UPower.7.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/upowerd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	root/root	var/lib/upower/
diff --git a/upower/.signature b/upower/.signature
index c55b20ae6..c10e8291d 100644
--- a/upower/.signature
+++ b/upower/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fp5n/C7CZqogs3DZ5Uif3YvBsybu8guM68QCByWpeENaEfKuYhShD2XhaaRLo+pPnQpgBgOSaTJ5jkZyiqQgAc=
-SHA256 (Pkgfile) = ebe06097a8b5622d678dec8550098be39519692955c2409121b7870455a0d26f
-SHA256 (.footprint) = 75b0f0a649894c258c1ffef1c60f8dd0fcf3bc889254adf6832c180b68517f6a
-SHA256 (upower-UPOWER_0_99_13.tar.bz2) = 3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+RWSE3ohX2g5d/SealILcAgFQ6GUHKYLGS67k8XmsnOfcFWug4BdZ31h+igzywKdivHE6sXbD60vS9PCa9N7c3c4Ri1QJ8vfdjQI=
+SHA256 (Pkgfile) = 0740be64bd428ce9e50f06d237263dd89dfbd17acf08a9aa1b6bfdab25bcd7ed
+SHA256 (.footprint) = a5797f1ce30b51d4c9b92180ea4120e7e8cf8a1f2a47c968ae07808443868837
+SHA256 (upower-v0.99.16.tar.bz2) = 7e6a6867fcfc477dab24ae2e34b8f196eae062ef662197b59f618743fdf28e6e
 SHA256 (upower.1) = c4e05bc89b31c9ddc206a33d97c15c2babbce5330f79e0849c84fb878e896c6b
 SHA256 (UPower.7) = 50b3e3b2cec513492c88e270fcf3dee2f98d11f52130827740f804a1492b6dd8
 SHA256 (upowerd.8) = d31cd082985a171a92d63126304964453d5dc3c1431960885f2fe2259784786f
diff --git a/upower/0001-build-Fix-default-udevrulesdir.patch b/upower/0001-build-Fix-default-udevrulesdir.patch
new file mode 100644
index 000000000..ad70b1ca0
--- /dev/null
+++ b/upower/0001-build-Fix-default-udevrulesdir.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 5 Feb 2022 02:26:48 +0000
+Subject: [PATCH] build: Fix default udevrulesdir
+
+We need to append 'rules.d' to the udev_dir.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f87de19b98cf..3858cbe0afdf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ endif
+ udevrulesdir = get_option('udevrulesdir')
+ if udevrulesdir == 'auto'
+     udev_dep = dependency('udev', required: true)
+-    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir')
++    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') / 'rules.d'
+ endif
+ 
+ dbusdir = get_option('datadir') / 'dbus-1'
diff --git a/upower/105.patch b/upower/105.patch
new file mode 100644
index 000000000..0aee93c1e
--- /dev/null
+++ b/upower/105.patch
@@ -0,0 +1,61 @@
+From 8eb8ab1056e03b68634098b754c89c5a99f33c5c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 5 Feb 2022 02:26:48 +0000
+Subject: [PATCH 1/2] build: Fix default udevrulesdir
+
+We need to append 'rules.d' to the udev_dir.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f87de19..3858cbe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ endif
+ udevrulesdir = get_option('udevrulesdir')
+ if udevrulesdir == 'auto'
+     udev_dep = dependency('udev', required: true)
+-    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir')
++    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') / 'rules.d'
+ endif
+ 
+ dbusdir = get_option('datadir') / 'dbus-1'
+-- 
+GitLab
+
+
+From 1dc74629ff24a2121f17f6e38b2c8067be0b7182 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 5 Feb 2022 02:30:52 +0000
+Subject: [PATCH 2/2] build: Fix version macros
+
+The project version is a string. We need to split it into an array of
+version components.
+---
+ libupower-glib/meson.build | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/libupower-glib/meson.build b/libupower-glib/meson.build
+index 1bab59b..2ff7baf 100644
+--- a/libupower-glib/meson.build
++++ b/libupower-glib/meson.build
+@@ -1,7 +1,12 @@
++version_arr = meson.project_version().split('.')
++major_version = version_arr[0].to_int()
++minor_version = version_arr[1].to_int()
++micro_version = version_arr[2].to_int()
++
+ cdata = configuration_data()
+-cdata.set('UP_MAJOR_VERSION', meson.project_version()[0])
+-cdata.set('UP_MINOR_VERSION', meson.project_version()[1])
+-cdata.set('UP_MICRO_VERSION', meson.project_version()[2])
++cdata.set('UP_MAJOR_VERSION', major_version)
++cdata.set('UP_MINOR_VERSION', minor_version)
++cdata.set('UP_MICRO_VERSION', micro_version)
+ 
+ up_version_h = configure_file(
+     output: 'up-version.h',
+-- 
+GitLab
+
diff --git a/upower/Pkgfile b/upower/Pkgfile
index 069fb29b8..ad724f506 100644
--- a/upower/Pkgfile
+++ b/upower/Pkgfile
@@ -2,32 +2,29 @@
 # URL: https://upower.freedesktop.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: dbus-glib intltool libgudev libusb
-# Optional: gtk-doc
+# Optional: gobject-introspection gtk-doc libxslt
 
 name=upower
-version=0.99.13
+version=0.99.16
 release=1
-source=(https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${version//[\.]/_}/upower-UPOWER_${version//[\.]/_}.tar.bz2
+source=(https://gitlab.freedesktop.org/upower/upower/-/archive/v$version/upower-v$version.tar.bz2
 	upower.1 UPower.7 upowerd.8 disable-gtk-docs.patch)
 
 build() {
-	cd $name-UPOWER_${version//[\.]/_}
-	patch -Np1 -i $SRC/disable-gtk-docs.patch
+	prt-get isinst libxslt || PKGMK_UPOWER+=' -D man=false'
+	prt-get isinst gtk-doc || PKGMK_UPOWER+=' -D gtk-doc=false'
 
-	NOCONFIGURE=1 ./autogen.sh
-	./configure \
+	meson setup build $name-v$version $PKGMK_UPOWER \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/$name \
-		--disable-nls
+		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D os_backend=dummy \
+		-D udevrulesdir=/lib/udev/rules.d \
+		-D systemdsystemunitdir=no
+	meson compile -C build -j ${JOBS:-1}
+	DESTDIR=$PKG meson install -C build
 
-	make
-	make DESTDIR=$PKG install
-
-	if [ ! -e 'usr/share/pkgconfig/gtk-doc.pc' ]; then
-		install -Dm644 $SRC/upower.1 $PKG/usr/share/man/man1/upower.1
-		install -Dm644 $SRC/UPower.7 $PKG/usr/share/man/man7/UPower.7
-		install -Dm644 $SRC/upowerd.8 $PKG/usr/share/man/man8/upowerd.8
-	fi
+	rm -rf $PKG/usr/share/locale
 }