[arch-commits] Commit in fwupd/trunk (6 files)
Bruno Pagani
archange at archlinux.org
Tue Jun 20 12:15:07 UTC 2017
Date: Tuesday, June 20, 2017 @ 12:15:06
Author: archange
Revision: 239021
upgpkg: fwupd 0.9.4-1
Drop patches, integrated upstream.
Add new patches from upstream.
New makedeps to generate images at building time.
Added:
fwupd/trunk/fix-missing-name.patch
fwupd/trunk/fix-test-failure.patch
Modified:
fwupd/trunk/PKGBUILD
Deleted:
fwupd/trunk/fix-failure-without-remote-d.patch
fwupd/trunk/fix-missing-test-files.patch
fwupd/trunk/fix-refresh-crash.patch
------------------------------------+
PKGBUILD | 24 +++----
fix-failure-without-remote-d.patch | 23 -------
fix-missing-name.patch | 21 ++++++
fix-missing-test-files.patch | 111 -----------------------------------
fix-refresh-crash.patch | 29 ---------
fix-test-failure.patch | 21 ++++++
6 files changed, 53 insertions(+), 176 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-20 11:52:37 UTC (rev 239020)
+++ PKGBUILD 2017-06-20 12:15:06 UTC (rev 239021)
@@ -2,8 +2,8 @@
# Contributor: Mirco Tischler <mt-ml at gmx dot de>
pkgname=fwupd
-pkgver=0.9.3
-pkgrel=3
+pkgver=0.9.4
+pkgrel=1
pkgdesc='A simple daemon to allow session software to update firmware'
arch=('i686' 'x86_64')
url='https://github.com/hughsie/fwupd'
@@ -11,21 +11,19 @@
depends=('appstream-glib' 'fwupdate' 'colord')
#makedepends=('meson' 'valgrind' 'docbook2x' 'gobject-introspection' 'gtk-doc')
makedepends=('meson' 'valgrind' 'docbook-utils' 'docbook-sgml' 'perl-sgmls'
- 'gobject-introspection' 'gtk-doc')
+ 'gobject-introspection' 'gtk-doc' 'python-pillow' 'python-cairo'
+ 'ttf-dejavu' 'adobe-source-han-sans-cn-fonts' 'python-gobject')
source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
- 'fix-missing-test-files.patch'
- 'fix-failure-without-remote-d.patch'
- 'fix-refresh-crash.patch')
-sha256sums=('56840998a4a7757ac93732c4a51e203e1fef1497dc98ebc175310b132da2a2cc'
- 'ee2bb86e1efaff2d4ca3f2ed55fd8b685cba2cb40debf1418d4e91e27dba00a7'
- '79a5ffc151067d52ff49af55b851b8bcd0976e47d1751268fb1bdd61b46f5dbe'
- '0718def1d7572e47822e76d4745971f64c8ec070de6d8778ea9816a218011bb8')
+ 'fix-missing-name.patch'
+ 'fix-test-failure.patch')
+sha256sums=('ac6c02df4a00d541a205f17c0fa681cc5fe9161dd20cc28045c28cbe43b042e0'
+ '2a620759ccceaa1e06e81ad47467804f5bffc2a0e83e1cc25f351f94d2444900'
+ 'e684937330f4fffd32fea3db0f444fcbd0250009905c3c76693bdc6eccb425da')
prepare() {
cd ${pkgname}-${pkgver}
- patch -p1 -i ../fix-missing-test-files.patch
- patch -p1 -i ../fix-failure-without-remote-d.patch
- patch -p1 -i ../fix-refresh-crash.patch
+ patch -p1 -i ../fix-missing-name.patch
+ patch -p1 -i ../fix-test-failure.patch
}
build() {
Deleted: fix-failure-without-remote-d.patch
===================================================================
--- fix-failure-without-remote-d.patch 2017-06-20 11:52:37 UTC (rev 239020)
+++ fix-failure-without-remote-d.patch 2017-06-20 12:15:06 UTC (rev 239021)
@@ -1,23 +0,0 @@
-From f04923ae2ff186a10802c3b236855c612d676fea Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Tue, 13 Jun 2017 10:15:40 +0100
-Subject: [PATCH] trivial: Don't fail to refresh if a remotes.d does not exist
-
-Resolves: https://github.com/hughsie/fwupd/issues/137
----
- libfwupd/fwupd-client.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libfwupd/fwupd-client.c b/libfwupd/fwupd-client.c
-index 1601b2a..814802c 100644
---- a/libfwupd/fwupd-client.c
-+++ b/libfwupd/fwupd-client.c
-@@ -1294,6 +1294,8 @@ fwupd_client_add_remotes_for_path (FwupdClient *client,
- g_autoptr(GDir) dir = NULL;
-
- path_remotes = g_build_filename (path, "remotes.d", NULL);
-+ if (!g_file_test (path_remotes, G_FILE_TEST_EXISTS))
-+ return TRUE;
- dir = g_dir_open (path_remotes, 0, error);
- if (dir == NULL)
- return FALSE;
Added: fix-missing-name.patch
===================================================================
--- fix-missing-name.patch (rev 0)
+++ fix-missing-name.patch 2017-06-20 12:15:06 UTC (rev 239021)
@@ -0,0 +1,21 @@
+From de5dd8f33dbc643d7e55087eef29f5a59b6dda1c Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 19 Jun 2017 13:26:47 +0100
+Subject: [PATCH] trivial: Include the name in fwupd_device_to_string()
+
+---
+ libfwupd/fwupd-device.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libfwupd/fwupd-device.c b/libfwupd/fwupd-device.c
+index af2af77..091879d 100644
+--- a/libfwupd/fwupd-device.c
++++ b/libfwupd/fwupd-device.c
+@@ -1011,6 +1011,7 @@ fwupd_device_to_string (FwupdDevice *device)
+ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_GUID, guid);
+ }
+ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_ID, priv->id);
++ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_NAME, priv->name);
+ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_DESCRIPTION, priv->description);
+ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_PLUGIN, priv->provider);
+ fwupd_pad_kv_dfl (str, FWUPD_RESULT_KEY_DEVICE_FLAGS, priv->flags);
Deleted: fix-missing-test-files.patch
===================================================================
--- fix-missing-test-files.patch 2017-06-20 11:52:37 UTC (rev 239020)
+++ fix-missing-test-files.patch 2017-06-20 12:15:06 UTC (rev 239021)
@@ -1,111 +0,0 @@
-From ad9b22480a63225a32f092fc36407586183bd04f Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Wed, 7 Jun 2017 17:08:49 +0100
-Subject: [PATCH] trivial: Fix missing test files
-
-Resolves: https://github.com/hughsie/fwupd/issues/129
----
- data/tests/hwids/bios_major_release | 1 +
- data/tests/hwids/bios_minor_release | 1 +
- data/tests/hwids/bios_vendor | 1 +
- data/tests/hwids/bios_version | 1 +
- data/tests/hwids/board_name | 1 +
- data/tests/hwids/board_vendor | 1 +
- data/tests/hwids/chassis_type | 1 +
- data/tests/hwids/product_family | 1 +
- data/tests/hwids/product_name | 1 +
- data/tests/hwids/product_sku | 1 +
- data/tests/hwids/sys_vendor | 1 +
- 11 files changed, 11 insertions(+)
- create mode 100644 data/tests/hwids/bios_major_release
- create mode 100644 data/tests/hwids/bios_minor_release
- create mode 100644 data/tests/hwids/bios_vendor
- create mode 100644 data/tests/hwids/bios_version
- create mode 100644 data/tests/hwids/board_name
- create mode 100644 data/tests/hwids/board_vendor
- create mode 100644 data/tests/hwids/chassis_type
- create mode 100644 data/tests/hwids/product_family
- create mode 100644 data/tests/hwids/product_name
- create mode 100644 data/tests/hwids/product_sku
- create mode 100644 data/tests/hwids/sys_vendor
-
-diff --git a/data/tests/hwids/bios_major_release b/data/tests/hwids/bios_major_release
-new file mode 100644
-index 0000000..6496923
---- /dev/null
-+++ b/data/tests/hwids/bios_major_release
-@@ -0,0 +1 @@
-+04
-diff --git a/data/tests/hwids/bios_minor_release b/data/tests/hwids/bios_minor_release
-new file mode 100644
-index 0000000..cd672a5
---- /dev/null
-+++ b/data/tests/hwids/bios_minor_release
-@@ -0,0 +1 @@
-+06
-diff --git a/data/tests/hwids/bios_vendor b/data/tests/hwids/bios_vendor
-new file mode 100644
-index 0000000..a591bed
---- /dev/null
-+++ b/data/tests/hwids/bios_vendor
-@@ -0,0 +1 @@
-+American Megatrends Inc.
-diff --git a/data/tests/hwids/bios_version b/data/tests/hwids/bios_version
-new file mode 100644
-index 0000000..44acfeb
---- /dev/null
-+++ b/data/tests/hwids/bios_version
-@@ -0,0 +1 @@
-+1201
-diff --git a/data/tests/hwids/board_name b/data/tests/hwids/board_name
-new file mode 100644
-index 0000000..127a591
---- /dev/null
-+++ b/data/tests/hwids/board_name
-@@ -0,0 +1 @@
-+To be filled by O.E.M.
-diff --git a/data/tests/hwids/board_vendor b/data/tests/hwids/board_vendor
-new file mode 100644
-index 0000000..127a591
---- /dev/null
-+++ b/data/tests/hwids/board_vendor
-@@ -0,0 +1 @@
-+To be filled by O.E.M.
-diff --git a/data/tests/hwids/chassis_type b/data/tests/hwids/chassis_type
-new file mode 100644
-index 0000000..00750ed
---- /dev/null
-+++ b/data/tests/hwids/chassis_type
-@@ -0,0 +1 @@
-+3
-diff --git a/data/tests/hwids/product_family b/data/tests/hwids/product_family
-new file mode 100644
-index 0000000..127a591
---- /dev/null
-+++ b/data/tests/hwids/product_family
-@@ -0,0 +1 @@
-+To be filled by O.E.M.
-diff --git a/data/tests/hwids/product_name b/data/tests/hwids/product_name
-new file mode 100644
-index 0000000..127a591
---- /dev/null
-+++ b/data/tests/hwids/product_name
-@@ -0,0 +1 @@
-+To be filled by O.E.M.
-diff --git a/data/tests/hwids/product_sku b/data/tests/hwids/product_sku
-new file mode 100644
-index 0000000..e45d663
---- /dev/null
-+++ b/data/tests/hwids/product_sku
-@@ -0,0 +1 @@
-+SKU
-diff --git a/data/tests/hwids/sys_vendor b/data/tests/hwids/sys_vendor
-new file mode 100644
-index 0000000..127a591
---- /dev/null
-+++ b/data/tests/hwids/sys_vendor
-@@ -0,0 +1 @@
-+To be filled by O.E.M.
---
-2.13.1
-
Deleted: fix-refresh-crash.patch
===================================================================
--- fix-refresh-crash.patch 2017-06-20 11:52:37 UTC (rev 239020)
+++ fix-refresh-crash.patch 2017-06-20 12:15:06 UTC (rev 239021)
@@ -1,29 +0,0 @@
-From b38a4fdfd631a800d4171a4eb3e519075755f430 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Tue, 13 Jun 2017 15:23:58 +0100
-Subject: [PATCH] Fix a crash when refreshing metadata
-
-When processing the file handles it seems g_variant_get() actually wants to
-write the fd integer. This bug does not happen every time, and seems to vanish
-every time under valgrind.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460429
----
- src/fu-main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/fu-main.c b/src/fu-main.c
-index f1fdd68..f9b1973 100644
---- a/src/fu-main.c
-+++ b/src/fu-main.c
-@@ -2087,8 +2087,8 @@ fu_main_daemon_method_call (GDBusConnection *connection, const gchar *sender,
- gint fd_data;
- gint fd_sig;
-
-- g_variant_get (parameters, "(&shh)", &id);
-- g_debug ("Called %s(%s)", method_name, id);
-+ g_variant_get (parameters, "(&shh)", &id, &fd_data, &fd_sig);
-+ g_debug ("Called %s(%s,%i,%i)", method_name, id, fd_data, fd_sig);
-
- message = g_dbus_method_invocation_get_message (invocation);
- fd_list = g_dbus_message_get_unix_fd_list (message);
Added: fix-test-failure.patch
===================================================================
--- fix-test-failure.patch (rev 0)
+++ fix-test-failure.patch 2017-06-20 12:15:06 UTC (rev 239021)
@@ -0,0 +1,21 @@
+From 0eaca2da65d376ddd3ec170286feee5e88d68433 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 19 Jun 2017 14:01:27 +0100
+Subject: [PATCH] trivial: Fix test failure with de5dd8f3
+
+---
+ libfwupd/fwupd-self-test.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libfwupd/fwupd-self-test.c b/libfwupd/fwupd-self-test.c
+index 7597fff..f3b14b8 100644
+--- a/libfwupd/fwupd-self-test.c
++++ b/libfwupd/fwupd-self-test.c
+@@ -139,6 +139,7 @@ fwupd_result_func (void)
+ " Guid: 2082b5e0-7a64-478a-b1b2-e3404fab6dad\n"
+ " Guid: 00000000-0000-0000-0000-000000000000\n"
+ " DeviceID: USB:foo\n"
++ " DisplayName: ColorHug2\n"
+ " Flags: allow-offline|require-ac\n"
+ " FirmwareHash: SHA1(beefdead)\n"
+ " Created: 1970-01-01\n"
More information about the arch-commits
mailing list