[arch-commits] Commit in fwupd/trunk (3 files)

[Bruno Pagani]

    Date: Wednesday, July 5, 2017 @ 08:32:24
  Author: archange
Revision: 242381

upgpkg: fwupd 0.9.5-2

Upstream update

Modified:
  fwupd/trunk/PKGBUILD
Deleted:
  fwupd/trunk/fix-missing-name.patch
  fwupd/trunk/fix-test-failure.patch

------------------------+
 PKGBUILD               |   22 +++++++++-------------
 fix-missing-name.patch |   21 ---------------------
 fix-test-failure.patch |   21 ---------------------
 3 files changed, 9 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-05 08:29:42 UTC (rev 242380)
+++ PKGBUILD	2017-07-05 08:32:24 UTC (rev 242381)
@@ -3,7 +3,7 @@
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 
 pkgname=fwupd
-pkgver=0.9.4
+pkgver=0.9.5
 pkgrel=2
 pkgdesc='A simple daemon to allow session software to update firmware'
 arch=('i686' 'x86_64')
@@ -13,19 +13,9 @@
 makedepends=('meson' 'valgrind' 'docbook-utils' 'docbook-sgml' 'perl-sgmls'
              '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-name.patch'
-        'fix-test-failure.patch')
-sha256sums=('ac6c02df4a00d541a205f17c0fa681cc5fe9161dd20cc28045c28cbe43b042e0'
-            '2a620759ccceaa1e06e81ad47467804f5bffc2a0e83e1cc25f351f94d2444900'
-            'e684937330f4fffd32fea3db0f444fcbd0250009905c3c76693bdc6eccb425da')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
+sha256sums=('876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e')
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    patch -p1 -i ../fix-missing-name.patch
-    patch -p1 -i ../fix-test-failure.patch
-}
-
 build() {
     cd ${pkgname}-${pkgver}
 
@@ -46,7 +36,13 @@
 
 package() {
     DESTDIR="${pkgdir}" ninja -C build install
+<<<<<<< .mine
+    # Remove the tests
+    rm -r ${pkgdir}/usr/share/installed-tests/
+||||||| .r239021
+=======
 
     # Fixup mode to match polkit
     install -d -o root -g 102 -m 750 "${pkgdir}/usr/share/polkit-1/rules.d"
+>>>>>>> .r242380
 }

Deleted: fix-missing-name.patch
===================================================================
--- fix-missing-name.patch	2017-07-05 08:29:42 UTC (rev 242380)
+++ fix-missing-name.patch	2017-07-05 08:32:24 UTC (rev 242381)
@@ -1,21 +0,0 @@
-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-test-failure.patch
===================================================================
--- fix-test-failure.patch	2017-07-05 08:29:42 UTC (rev 242380)
+++ fix-test-failure.patch	2017-07-05 08:32:24 UTC (rev 242381)
@@ -1,21 +0,0 @@
-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"