diff --git a/srcpkgs/fwupd/patches/fix-cross.patch b/srcpkgs/fwupd/patches/fix-cross.patch index 6bff6ffdbe..36a2bd1089 100644 --- a/srcpkgs/fwupd/patches/fix-cross.patch +++ b/srcpkgs/fwupd/patches/fix-cross.patch @@ -1,12 +1,11 @@ -diff --git a/meson.build b/meson.build -index d7c21fa..fcf8dae 100644 +diff --git meson.build meson.build +index c0463ef..c7d1567 100644 --- meson.build +++ meson.build -@@ -237,9 +237,15 @@ if get_option('plugin_uefi') - gnu_efi_arch = '' +@@ -241,6 +241,13 @@ if get_option('plugin_uefi') endif conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) -- r = run_command([python3, 'po/test-deps']) + r = run_command([python3, 'po/test-deps']) + if meson.is_cross_build() + qemu = '/usr/bin/qemu-' + gnu_efi_arch + '-static' + qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3' @@ -15,13 +14,10 @@ index d7c21fa..fcf8dae 100644 + r = run_command([python3, 'po/test-deps']) + endif if r.returncode() != 0 -- error(r.stdout()) -+ error(r.stderr()) + error(r.stderr()) endif - endif - -diff --git a/po/meson.build b/po/meson.build -index 6e78d2e..36d9989 100644 +diff --git po/meson.build po/meson.build +index 6e78d2e..3fdedb7 100644 --- po/meson.build +++ po/meson.build @@ -5,6 +5,12 @@ i18n.gettext(meson.project_name(), @@ -38,17 +34,4 @@ index 6e78d2e..36d9989 100644 -meson.add_install_script('make-images.sh', localedir, python3.path()) +meson.add_install_script('make-images.sh', localedir, python3_cmd) endif -diff --git po/make-images.sh po/make-images.sh -index b5b95ba..04999bf 100755 ---- po/make-images.sh -+++ po/make-images.sh -@@ -7,7 +7,7 @@ - # - - LOCALEDIR=${DESTDIR}$1 --PYTHON3=$2 -+PYTHON3="$2" - - install -m 0755 -d $LOCALEDIR - ${PYTHON3} ${MESON_SOURCE_ROOT}/po/make-images "Installing firmware update…" $LOCALEDIR ${MESON_SOURCE_ROOT}/po/LINGUAS diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index c0f4699853..e789f9f1f4 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,6 +1,6 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.2.5 +version=1.2.6 revision=1 build_style=meson build_helper="gir" @@ -22,7 +22,7 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>" license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/fwupd" distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=d65ea134f1b60ce5b11bf0224e3ec477be3eb01c3435d1364a40ea5403400e8c +checksum=cebe8739d0c1a513199e4cfb3cdedb600061e0bfedd07796610dd5d9871a4524 conf_files=" /etc/dbus-1/system.d/org.freedesktop.fwupd.conf