summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-14 12:02:02 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-14 12:26:48 +0200
commit15fc4d96008ceab22b799e88666488ce22a6bbe1 (patch)
treee2787a6bf9b08c0aa75a3aaa5b651281cc6b11c7
parent0bfe116ad558e564f49483755f7fa98ac26e7d5a (diff)
downloadhardware-15fc4d96008ceab22b799e88666488ce22a6bbe1.tar.gz
hardware-15fc4d96008ceab22b799e88666488ce22a6bbe1.tar.xz
fwupd: upstream patches to fix build with meson >= 0.41.0
Change-Id: Ice9abb10211675a0e9e12133cc75d0ab5b197c37 Reviewed-on: https://galileo.mailstation.de/gerrit/9289 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch22
-rw-r--r--packages/sys-apps/fwupd/files/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch55
-rw-r--r--packages/sys-apps/fwupd/fwupd-0.9.3.exheres-05
3 files changed, 82 insertions, 0 deletions
diff --git a/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch b/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
new file mode 100644
index 0000000..d0ae6f6
--- /dev/null
+++ b/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
@@ -0,0 +1,22 @@
+From daac6a68fe4ed53a11bac36abaeeaea93a98887d Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Tue, 13 Jun 2017 15:10:54 -0500
+Subject: [PATCH] Fix version comparison for meson 0.41
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5c47970..4876748 100644
+--- a/meson.build
++++ b/meson.build
+@@ -219,7 +219,7 @@ subdir('po')
+ subdir('policy')
+ subdir('src')
+
+-if meson.version().version_compare('<meson-0.41.0')
++if meson.version().version_compare('<0.41.0')
+ archiver = find_program('git', required : false)
+ if archiver.found()
+ run_target('dist',
diff --git a/packages/sys-apps/fwupd/files/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch b/packages/sys-apps/fwupd/files/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch
new file mode 100644
index 0000000..74dea77
--- /dev/null
+++ b/packages/sys-apps/fwupd/files/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch
@@ -0,0 +1,55 @@
+From e691d301879e10ec33ea8fd87b275cbbbfa9305e Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 13 Jun 2017 16:40:49 +0100
+Subject: [PATCH] Allow compiling with newer versions of meson
+
+In 0.41.0 meson introduced it's own 'dist' target and so we don't need to
+define this ourselves anymore. Use a version compare to avoid depending on a
+very new meson.
+---
+ meson.build | 32 +++++++++++++++++---------------
+ 1 files changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 41296bd..5c47970 100644
+--- a/meson.build
++++ b/meson.build
+@@ -219,21 +219,23 @@ subdir('po')
+ subdir('policy')
+ subdir('src')
+
+-archiver = find_program('git', required : false)
+-if archiver.found()
+- run_target('dist',
+- # git config tar.tar.xz.command "xz -c"
+- command: [
+- 'git', 'archive',
+- '--prefix=' + meson.project_name() + '-' + meson.project_version() + '/',
+- 'HEAD',
+- '--format=tar.xz',
+- '--output',
+- meson.project_name() + '-' + meson.project_version() + '.tar.xz'
+- ]
+- )
+-else
+- message('git not found, you will not be able to run `ninja dist`')
++if meson.version().version_compare('<meson-0.41.0')
++ archiver = find_program('git', required : false)
++ if archiver.found()
++ run_target('dist',
++ # git config tar.tar.xz.command "xz -c"
++ command: [
++ 'git', 'archive',
++ '--prefix=' + meson.project_name() + '-' + meson.project_version() + '/',
++ 'HEAD',
++ '--format=tar.xz',
++ '--output',
++ meson.project_name() + '-' + meson.project_version() + '.tar.xz'
++ ]
++ )
++ else
++ message('git not found, you will not be able to run `ninja dist`')
++ endif
+ endif
+
+ if get_option('enable-systemd')
diff --git a/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0 b/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
index 2fc1d2f..f2cb72a 100644
--- a/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
+++ b/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
@@ -49,6 +49,11 @@ DEPENDENCIES="
)
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch
+ "${FILES}"/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
+)
+
MESON_SRC_CONFIGURE_PARAMS=(
--localstatedir=/var
-Denable-consolekit=false