summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-08 15:53:38 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-06-08 17:06:29 +0200
commit03eff8c762d6436b6efec5f1eb63c10faf411a0d (patch)
tree78912b223604ee5f8f5e65ad02fec689fdca57eb
parent29a1e696acf024600c67f178b5d54b2ebc5725a1 (diff)
downloadhardware-03eff8c762d6436b6efec5f1eb63c10faf411a0d.tar.gz
hardware-03eff8c762d6436b6efec5f1eb63c10faf411a0d.tar.xz
fwupd: version bump to 0.9.3
Change-Id: I3f6df4e5fa216531e05b596168df96eda37192df Reviewed-on: https://galileo.mailstation.de/gerrit/9251 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/sys-apps/fwupd/files/fwupd-0.9.2-build.patch58
-rw-r--r--packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0 (renamed from packages/sys-apps/fwupd/fwupd-0.9.2.exheres-0)15
2 files changed, 8 insertions, 65 deletions
diff --git a/packages/sys-apps/fwupd/files/fwupd-0.9.2-build.patch b/packages/sys-apps/fwupd/files/fwupd-0.9.2-build.patch
deleted file mode 100644
index 79466c4..0000000
--- a/packages/sys-apps/fwupd/files/fwupd-0.9.2-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: TODO
-Reason: Install to prefix
-
-From 850f733093e6c8e08fb73f2227acea228c3bf699 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Mon, 29 May 2017 15:13:43 +0200
-Subject: [PATCH] Allow to specify bindir
-
----
- libdfu/meson.build | 2 +-
- meson.build | 3 +++
- src/meson.build | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/libdfu/meson.build b/libdfu/meson.build
-index 75ee523..dc318d8 100644
---- a/libdfu/meson.build
-+++ b/libdfu/meson.build
-@@ -86,7 +86,7 @@ executable(
- link_with : dfu,
- c_args : cargs,
- install : true,
-- install_dir : 'bin'
-+ install_dir : get_option('bindir')
- )
-
- gnome.generate_gir(dfu,
-diff --git a/meson.build b/meson.build
-index 1751256..69732bd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -171,6 +171,9 @@ plugin_dir = join_paths(get_option('prefix'),
- conf.set_quoted('PLUGINDIR', plugin_dir)
-
- conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
-+conf.set_quoted('BINDIR',
-+ join_paths(get_option('prefix'),
-+ get_option('bindir')))
- conf.set_quoted('LIBEXECDIR',
- join_paths(get_option('prefix'),
- get_option('libexecdir')))
-diff --git a/src/meson.build b/src/meson.build
-index e5af674..8673b47 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -31,7 +31,7 @@ executable(
- '-DFU_OFFLINE_DESTDIR=""',
- ],
- install : true,
-- install_dir : 'bin'
-+ install_dir : get_option('bindir')
- )
-
- resources_src = gnome.compile_resources(
---
-2.13.0
-
diff --git a/packages/sys-apps/fwupd/fwupd-0.9.2.exheres-0 b/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
index 057031e..2fc1d2f 100644
--- a/packages/sys-apps/fwupd/fwupd-0.9.2.exheres-0
+++ b/packages/sys-apps/fwupd/fwupd-0.9.3.exheres-0
@@ -16,6 +16,7 @@ MYOPTIONS="
description = [ Support for flashing formware on DELL machines ]
requires = [ efi ]
]]
+ gtk-doc
"
# 2/6 fwupd-self-test: FAIL, last checked: 0.9.2
@@ -23,17 +24,17 @@ RESTRICT="test"
DEPENDENCIES="
build:
- dev-doc/gtk-doc
virtual/pkg-config
+ gtk-doc? ( dev-doc/gtk-doc )
build+run:
- app-arch/gcab
+ app-arch/gcab [[ note = [ colorhug and rpiupdate plugin ] ]]
app-arch/libarchive
app-crypt/gpgme
dev-db/sqlite:3
dev-libs/appstream-glib[>=0.6.13-r1][gobject-introspection]
dev-libs/glib:2[>=2.45.8]
dev-libs/libgpg-error
- dev-libs/libgusb[>=0.2.9]
+ dev-libs/libgusb[>=0.2.9][gobject-introspection]
dev-util/elfutils
gnome-desktop/gobject-introspection:1
gnome-desktop/libgudev
@@ -48,13 +49,12 @@ DEPENDENCIES="
)
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-0.9.2-build.patch
-)
-
MESON_SRC_CONFIGURE_PARAMS=(
--localstatedir=/var
+ -Denable-consolekit=false
-Denable-libelf=true
+ -Denable-man=false
+ -Denable-systemd=true
-Denable-tests=false
-Denable-thunderbolt=false
-Dwith-bootdir=/boot/efi
@@ -63,6 +63,7 @@ MESON_SRC_CONFIGURE_OPTION_ENABLES=(
colorhug
'efi uefi'
dell
+ 'gtk-doc doc'
)
src_test() {