From 73eafa8dc7b3134baffadbf47b42531490a4367c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 13 Aug 2018 14:42:22 -0300 Subject: [PATCH] fwupd: update to 1.1.1. --- srcpkgs/fwupd/patches/fix-systemd-breakage.patch | 7 +------ srcpkgs/fwupd/template | 13 +++++++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/fwupd/patches/fix-systemd-breakage.patch b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch index 1b5494fac74..b6eb4756698 100644 --- a/srcpkgs/fwupd/patches/fix-systemd-breakage.patch +++ b/srcpkgs/fwupd/patches/fix-systemd-breakage.patch @@ -1,8 +1,3 @@ -Souce: maxice8 -Upstream: not upstreamable -Reason: force meson to build org.freedesktop dbus entry regardless if systemd - option is on or not. not generating it causes the package to break. - --- data/meson.build +++ data/meson.build @@ -30,59 +30,18 @@ if get_option('daemon') @@ -19,7 +14,7 @@ Reason: force meson to build org.freedesktop dbus entry regardless if systemd - rw_directories += join_paths (localstatedir, 'lib', 'fwupd') - rw_directories += join_paths (default_sysconfdir, 'fwupd', 'remotes.d') - if get_option('plugin_uefi') -- rw_directories += ['-/boot/efi', '-/boot', '-/efi'] +- rw_directories += ['-/boot/efi', '-/efi', '-/boot/EFI'] - endif - - dynamic_options = [] diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 670b4667b0a..9fd5a4f3f7d 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,14 +1,15 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.1.0 +version=1.1.1 revision=1 build_style=meson # manpages fail to build # tests require unpackaged umockdev configure_args="-Dbootdir=/boot/EFI -Dconsolekit=false -Dgtkdoc=false - -Dintrospection=false -Dsystemd=false -Dplugin_altos=false -Dtests=false + -Dintrospection=true -Dsystemd=false -Dplugin_altos=false -Dtests=false -Dman=false -Dpkcs7=false" -hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab" +hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab + gobject-introspection" makedepends="appstream-glib-devel cairo-devel colord-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel python3-Pillow python3-gobject libefivar-devel gnu-efi-libs" @@ -17,7 +18,8 @@ maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=fc5b4453edc47e880d7800e2149e777a10f77deae0ec87d4ab07b5f0e3504db2 +checksum=6959299eebf1e0fc747174b34e12159e6da42c92d556f1485d3e70aa391c1eba +nocross="depends on python3-gobject whether or not introspection is enabled" conf_files="/etc/dbus-1/system.d/org.freedesktop.fwupd.conf /etc/fwupd/daemon.conf /etc/fwupd/remotes.d/*.conf" @@ -33,5 +35,8 @@ fwupd-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove usr/share/gir-1.0 + vmove usr/share/vala + vmove usr/lib/girepository-1.0 } }