summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-16 11:33:49 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-16 12:47:06 +0200
commit9b5d09a934289d3c1587eecfec3b7a6f176f1ebc (patch)
tree89af734d26b7cd0db06e454e6be381188c55af96
parent15fc4d96008ceab22b799e88666488ce22a6bbe1 (diff)
downloadhardware-9b5d09a934289d3c1587eecfec3b7a6f176f1ebc.tar.gz
hardware-9b5d09a934289d3c1587eecfec3b7a6f176f1ebc.tar.xz
fwupd: version bump to 0.9.4
Change-Id: Ib9b87eed940d4cf89225092679f438fcdb26dc89 Reviewed-on: https://galileo.mailstation.de/gerrit/9298 Retest: Timo Gurr <tgurr@exherbo.org> 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.4.exheres-0 (renamed from packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0)17
3 files changed, 10 insertions, 84 deletions
diff --git a/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch b/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
deleted file mode 100644
index d0ae6f6..0000000
--- a/packages/sys-apps/fwupd/files/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 74dea77..0000000
--- a/packages/sys-apps/fwupd/files/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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.4.exheres-0
index f2cb72a..c62e44e 100644
--- a/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
+++ b/packages/sys-apps/fwupd/fwupd-0.9.4.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2017 Timo Gurr <tgurr@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require github [ user=hughsie ] meson
+require github [ user=hughsie ] meson python [ blacklist=2 multibuild=false has_lib=false ]
SUMMARY="A simple daemon to allow session software to update firmware"
HOMEPAGE+=" http://www.fwupd.org"
@@ -19,11 +19,19 @@ MYOPTIONS="
gtk-doc
"
-# 2/6 fwupd-self-test: FAIL, last checked: 0.9.2
+# 2/8 fwupd-self-test: FAIL, last checked: 0.9.4
RESTRICT="test"
DEPENDENCIES="
build:
+ dev-python/Pillow[python_abis:*(-)?]
+ dev-python/pycairo[python_abis:*(-)?]
+ fonts/dejavu
+ gnome-bindings/pygobject:3[python_abis:*(-)?]
+ media-libs/fontconfig
+ media-libs/freetype:2
+ x11-libs/cairo
+ x11-libs/pango
virtual/pkg-config
gtk-doc? ( dev-doc/gtk-doc )
build+run:
@@ -49,11 +57,6 @@ DEPENDENCIES="
)
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/e691d301879e10ec33ea8fd87b275cbbbfa9305e.patch
- "${FILES}"/daac6a68fe4ed53a11bac36abaeeaea93a98887d.patch
-)
-
MESON_SRC_CONFIGURE_PARAMS=(
--localstatedir=/var
-Denable-consolekit=false