commit: 86609f78337a4ba8097dbdbf11854bd3835127f4
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 22:34:18 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 22:43:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86609f78
sys-apps/fwupd: explicitly disable Meson feature 'gresource_quirks'
By default the option in question is enabled or disabled automatically
depending on the version of Meson in use, which is something I very
much do NOT want to affect whether certain data is installed as XML
files (which is how older fwupd versions always did it) or embedded
as gresources in the program binaries. Besides, the way upstream
implemented the latter only works for a specific location of
${BUILD_DIR} with respect to ${S} - hence the linked bug.
Nb. For future reference, a patch which makes gresource_quirks=enabled
work has been included as well.
Closes: https://bugs.gentoo.org/861521
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch | 11 +++++++++++
sys-apps/fwupd/fwupd-1.8.3.ebuild | 2 ++
2 files changed, 13 insertions(+)
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
new file mode 100644
index 000000000000..f4f628adc7c2
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
@@ -0,0 +1,11 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -154,7 +154,7 @@
+ error_message: 'meson >= 0.63.0 is needed for
-Dgresource_quirks=enabled').allowed()
+ fwupd_gresource_xml = custom_target('fwupd-resources-xml',
+ input : [
+- 'org.freedesktop.fwupd.xml',
++ join_paths(meson.current_source_dir(), 'org.freedesktop.fwupd.xml'),
+ ] + plugin_quirks,
+ output : 'fwupd.gresource.xml',
+ command : [
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild
b/sys-apps/fwupd/fwupd-1.8.3.ebuild
index 6e7df4eaa3c8..2d52acf698a3 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -94,6 +94,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
+ "${FILESDIR}"/${PN}-1.8.3-gresource_quirks_paths.patch
)
pkg_setup() {
@@ -150,6 +151,7 @@ src_configure() {
-Dconsolekit="disabled"
-Dcurl="enabled"
-Defi_binary="false"
+ -Dgresource_quirks="disabled"
-Dsupported_build="enabled"
-Dudevdir="${EPREFIX}$(get_udevdir)"
$(meson_feature archive libarchive)
