From cc734609107030e3c36f288ba338b4582c52f60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 2 Oct 2020 22:07:19 -0300 Subject: [PATCH] udisks2: update to 2.9.1, adopt. Remove zram build option, which wasn't functional without systemd already, but now explicitly requires it. --- srcpkgs/udisks2/patches/O_CLOEXEC.patch | 10 ---------- srcpkgs/udisks2/template | 9 +++++---- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/udisks2/patches/O_CLOEXEC.patch diff --git a/srcpkgs/udisks2/patches/O_CLOEXEC.patch b/srcpkgs/udisks2/patches/O_CLOEXEC.patch deleted file mode 100644 index 69785f52244cf9..00000000000000 --- a/srcpkgs/udisks2/patches/O_CLOEXEC.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/udiskslinuxblock.c.orig -+++ src/udiskslinuxblock.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#define __USE_GNU - #include - #include - #include diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 6d54c5f8b9500f..3fd8e2282bf2dc 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,24 +1,25 @@ # Template file for 'udisks2' pkgname=udisks2 -version=2.9.0 +version=2.9.1 revision=1 wrksrc="udisks-${version}" build_style=gnu-configure build_helper="gir" +# zram module is disabled, since it requires systemd units configure_args="--disable-static --with-udevdir=/usr/lib/udev --enable-lvm2 --enable-btrfs --enable-bcache --enable-vdo - --enable-lvmcache --enable-zram $(vopt_enable gir introspection)" + --enable-lvmcache $(vopt_enable gir introspection)" hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config $(vopt_if gir 'gobject-introspection') polkit" makedepends="acl-devel libatasmart-devel libgudev-devel libparted-devel polkit-devel sg3_utils-devel libblockdev-devel libbtrfs-devel elogind-devel" short_desc="Disk Management Service, version 2" -maintainer="Orphaned " +maintainer="Érico Nogueira " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/udisks" changelog="https://raw.githubusercontent.com/storaged-project/udisks/master/NEWS" distfiles="https://github.com/storaged-project/udisks/releases/download/udisks-${version}/udisks-${version}.tar.bz2" -checksum=25b09265d71b9b97069e4a2fae10f696a851e0b812e69b20bcc4b23efee1ad34 +checksum=da25c348edebefd5614c727fd6a7c286ba114479aa3279dcd5df274da6f28646 make_dirs="/var/lib/udisks2 0750 root root" conf_files="/etc/udisks2/udisks2.conf"