upgpkg: 1.90.0-5

version/1.90.0-5/0001-build-Fix-default-udevrulesdir.patch

+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'

version/1.90.0-5/0002-build-Fix-version-macros.patch

+From 0000000000000000000000000000000000000000 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] 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 1bab59b80390..2ff7baf51e85 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',

version/1.90.0-5/PKGBUILD

+# Copyright     : Obarun
+#------------------------
+# Maintainer    : Eric Vidal <eric@obarun.org>
+# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
+#----------------
+# Pkgbuild Src  : https://git.obarun.org/pkg/obextra/upower
+#--------------------------------------------------------------
+# DESCRIPTION ]
+
+# Temp add to fix pkg commit (05-13-23)
+
+pkgname=upower
+pkgver=1.90.0
+pkgrel=5
+pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
+url='http://upower.freedesktop.org'
+	
+track="commit"
+target=d4259c009b3ca1169dfd19231a040c233fc3b58d  # tags/v1.90.0^0
+source=(
+    "git+https://gitlab.freedesktop.org/upower/upower.git#${track}=${target}"
+    0001-build-Fix-default-udevrulesdir.patch
+    0002-build-Fix-version-macros.patch
+)
+
+#----------------------
+# BUILD CONFIGURATION ]
+
+makedepends=(
+    'docbook-xsl'
+    'gobject-introspection'
+    'python'
+    'git'
+    'gtk-doc'
+    'meson'
+)
+
+checkdepends=(
+    'python-dbus'
+    'python-dbusmock'
+    'python-gobject'
+    'python-packaging'
+)   #'umockdev'
+
+#------------------------
+# INSTALL CONFIGURATION ]
+
+depends=(
+    'libimobiledevice'
+    'libgudev'
+    'usbmuxd'
+)
+
+backup=(
+    'etc/UPower/UPower.conf'
+)
+
+#--------------------
+# BUILD PREPARATION ]
+
+pkgver() {
+    cd $pkgname
+    git describe --tags | sed -e 's/^v\|^UPOWER_//;s/_/\./g;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+    cd $pkgname
+
+    # Fix use of libimobiledevice
+    git cherry-pick -n 81a89385a45d3de1028bcd86b3688fb465b4035c
+
+}
+
+#--------
+# BUILD ]
+
+build() {
+    arch-meson upower build -D systemdsystemunitdir=no
+    meson compile -C build
+}
+
+#--------
+# CHECK ]
+
+#check() {
+#    meson test -C build --print-errorlogs
+#}
+
+#----------
+# PACKAGE ]
+
+package() {
+    depends+=(
+        'libglib-2.0.so'
+        'libgobject-2.0.so'
+        'libgio-2.0.so'
+    )
+    provides+=(
+        'libupower-glib.so'
+    )
+
+    meson install -C build --destdir "$pkgdir"
+}
+
+#--------------------
+# ARCH LICENSE AUTH ]
+
+arch=(x86_64)
+license=(GPL)
+
+sha512sums=('')