From 1d525ca4322e964150e4341d6ce2f4e4ef27593a Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 18 Nov 2019 10:07:57 -0600 Subject: [PATCH] fwupd: update to 1.3.3 Signed-off-by: Nathan Owens --- common/shlibs | 14 +++++++------- srcpkgs/fwupd/template | 28 ++++++++++++---------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/common/shlibs b/common/shlibs index 68bb8421da1..57e4623cbeb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -16,13 +16,6 @@ # PLEASE NOTE: when multiple packages provide the same SONAME, the first # one (order top->bottom) is preferred over the next ones. # -libtss2-mu.so.0 tpm2-tss-2.3.1_1 -libtss2-esys.so.0 tpm2-tss-2.3.1_1 -libtss2-sys.so.0 tpm2-tss-2.3.1_1 -libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1 -libtss2-rc.so.0 tpm2-tss-2.3.1_1 -libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1 -libtss2-tctildr.so.0 tpm2-tss-2.3.1_1 libc.so musl-1.1.21_1 libc.so.6 glibc-2.29_1 libm.so.6 glibc-2.29_1 @@ -3686,3 +3679,10 @@ libgcj_bc.so.1 libgcj-6.5.0_1 libgcj.so.17 libgcj-6.5.0_1 libgij.so.17 libgcj-6.5.0_1 libtty.so.1 libtermrec-0.18_1 +libtss2-mu.so.0 tpm2-tss-2.3.1_1 +libtss2-esys.so.0 tpm2-tss-2.3.1_1 +libtss2-sys.so.0 tpm2-tss-2.3.1_1 +libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1 +libtss2-rc.so.0 tpm2-tss-2.3.1_1 +libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1 +libtss2-tctildr.so.0 tpm2-tss-2.3.1_1 diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 06a68a00754..33bb590d617 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,6 +1,6 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.2.11 +version=1.3.3 revision=1 build_style=meson build_helper="gir" @@ -12,30 +12,35 @@ configure_args="-Dconsolekit=false -Dgtkdoc=false -Dintrospection=true -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-ld=${XBPS_CROSS_BASE}/usr/bin/ld -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true" hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab - vala glib-devel polkit" + vala glib-devel polkit efivar gnu-efi-libs" makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject - python3-Pillow elogind-devel" + python3-Pillow elogind-devel libefivar-devel tpm2-tss-devel gnu-efi-libs" short_desc="Daemon to allow session software to update firmware" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=8f9238053689aaa29e80328122012ddb3fb8a6432d19af24904b3db62ec167ca +checksum=39b9c87bcff50fa77a4e0db02195a84d3c6fc65a5f36c529e94928405f390108 conf_files=" - /etc/dbus-1/system.d/org.freedesktop.fwupd.conf /etc/fwupd/daemon.conf /etc/fwupd/remotes.d/*.conf" if [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in arm*) # Segfaults under qemu trying to gzip non-existing files - broken="https://build.voidlinux.org/builders/armv7l_builder/builds/17377/steps/shell_3/logs/stdio" - ;; + broken="https://build.voidlinux.org/builders/armv7l_builder/builds/17377/steps/shell_3/logs/stdio";; + aarch64*) broken="https://travis-ci.org/void-linux/void-packages/jobs/618827513";; esac + configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc" + + pre_configure() { + # Replace the values from our patch into the system itself + sed -i -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" meson.build +} fi case "$XBPS_TARGET_MACHINE" in @@ -46,9 +51,7 @@ case "$XBPS_TARGET_MACHINE" in *) configure_args+=" -Dplugin_dell=false" ;; -esac -case "$XBPS_TARGET_MACHINE" in ppc64*) configure_args+=" -Dplugin_uefi=false" configure_args+=" -Dplugin_redfish=false" @@ -57,13 +60,6 @@ case "$XBPS_TARGET_MACHINE" in *) makedepends+=" gnu-efi-libs libefivar-devel" ;; esac -pre_configure() { - if [ "$CROSS_BUILD" ]; then - # Replace the values from our patch into the system itself - sed -i -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" meson.build - fi -} - fwupd-devel_package() { depends="${sourcepkg}>=${version}_${revision} libglib-devel" short_desc+=" - development files"