Date: Wednesday, July 5, 2017 @ 08:33:25 Author: archange Revision: 242383
archrelease: copy trunk to community-i686, community-x86_64 Added: fwupd/repos/community-i686/PKGBUILD (from rev 242382, fwupd/trunk/PKGBUILD) fwupd/repos/community-x86_64/PKGBUILD (from rev 242382, fwupd/trunk/PKGBUILD) Deleted: fwupd/repos/community-i686/PKGBUILD fwupd/repos/community-i686/fix-missing-name.patch fwupd/repos/community-i686/fix-test-failure.patch fwupd/repos/community-x86_64/PKGBUILD fwupd/repos/community-x86_64/fix-missing-name.patch fwupd/repos/community-x86_64/fix-test-failure.patch -----------------------------------------+ /PKGBUILD | 96 ++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 52 ---------------- community-i686/fix-missing-name.patch | 21 ------ community-i686/fix-test-failure.patch | 21 ------ community-x86_64/PKGBUILD | 52 ---------------- community-x86_64/fix-missing-name.patch | 21 ------ community-x86_64/fix-test-failure.patch | 21 ------ 7 files changed, 96 insertions(+), 188 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-07-05 08:32:59 UTC (rev 242382) +++ community-i686/PKGBUILD 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archa...@archlinux.org> -# Contributor: Mirco Tischler <mt-ml at gmx dot de> - -pkgname=fwupd -pkgver=0.9.4 -pkgrel=2 -pkgdesc='A simple daemon to allow session software to update firmware' -arch=('i686' 'x86_64') -url='https://github.com/hughsie/fwupd' -license=('GPL2') -depends=('appstream-glib' 'fwupdate' 'colord') -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') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i ../fix-missing-name.patch - patch -p1 -i ../fix-test-failure.patch -} - -build() { - cd ${pkgname}-${pkgver} - - meson --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --buildtype=release \ - ../build - - ninja -v -C ../build -} - -check() { - cd build - mesontest -} - -package() { - DESTDIR="${pkgdir}" ninja -C build install - - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "${pkgdir}/usr/share/polkit-1/rules.d" -} Copied: fwupd/repos/community-i686/PKGBUILD (from rev 242382, fwupd/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-07-05 08:33:25 UTC (rev 242383) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archa...@archlinux.org> +# Contributor: Mirco Tischler <mt-ml at gmx dot de> + +pkgname=fwupd +pkgver=0.9.5 +pkgrel=1 +pkgdesc='A simple daemon to allow session software to update firmware' +arch=('i686' 'x86_64') +url='https://github.com/hughsie/fwupd' +license=('GPL2') +depends=('appstream-glib' 'fwupdate' 'colord') +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") +sha256sums=('876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e') + +build() { + cd ${pkgname}-${pkgver} + + meson --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --buildtype=release \ + ../build + + ninja -v -C ../build +} + +check() { + cd build + mesontest +} + +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: community-i686/fix-missing-name.patch =================================================================== --- community-i686/fix-missing-name.patch 2017-07-05 08:32:59 UTC (rev 242382) +++ community-i686/fix-missing-name.patch 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,21 +0,0 @@ -From de5dd8f33dbc643d7e55087eef29f5a59b6dda1c Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@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: community-i686/fix-test-failure.patch =================================================================== --- community-i686/fix-test-failure.patch 2017-07-05 08:32:59 UTC (rev 242382) +++ community-i686/fix-test-failure.patch 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,21 +0,0 @@ -From 0eaca2da65d376ddd3ec170286feee5e88d68433 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@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" Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-07-05 08:32:59 UTC (rev 242382) +++ community-x86_64/PKGBUILD 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archa...@archlinux.org> -# Contributor: Mirco Tischler <mt-ml at gmx dot de> - -pkgname=fwupd -pkgver=0.9.4 -pkgrel=2 -pkgdesc='A simple daemon to allow session software to update firmware' -arch=('i686' 'x86_64') -url='https://github.com/hughsie/fwupd' -license=('GPL2') -depends=('appstream-glib' 'fwupdate' 'colord') -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') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i ../fix-missing-name.patch - patch -p1 -i ../fix-test-failure.patch -} - -build() { - cd ${pkgname}-${pkgver} - - meson --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --buildtype=release \ - ../build - - ninja -v -C ../build -} - -check() { - cd build - mesontest -} - -package() { - DESTDIR="${pkgdir}" ninja -C build install - - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "${pkgdir}/usr/share/polkit-1/rules.d" -} Copied: fwupd/repos/community-x86_64/PKGBUILD (from rev 242382, fwupd/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-07-05 08:33:25 UTC (rev 242383) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archa...@archlinux.org> +# Contributor: Mirco Tischler <mt-ml at gmx dot de> + +pkgname=fwupd +pkgver=0.9.5 +pkgrel=1 +pkgdesc='A simple daemon to allow session software to update firmware' +arch=('i686' 'x86_64') +url='https://github.com/hughsie/fwupd' +license=('GPL2') +depends=('appstream-glib' 'fwupdate' 'colord') +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") +sha256sums=('876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e') + +build() { + cd ${pkgname}-${pkgver} + + meson --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --buildtype=release \ + ../build + + ninja -v -C ../build +} + +check() { + cd build + mesontest +} + +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: community-x86_64/fix-missing-name.patch =================================================================== --- community-x86_64/fix-missing-name.patch 2017-07-05 08:32:59 UTC (rev 242382) +++ community-x86_64/fix-missing-name.patch 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,21 +0,0 @@ -From de5dd8f33dbc643d7e55087eef29f5a59b6dda1c Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@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: community-x86_64/fix-test-failure.patch =================================================================== --- community-x86_64/fix-test-failure.patch 2017-07-05 08:32:59 UTC (rev 242382) +++ community-x86_64/fix-test-failure.patch 2017-07-05 08:33:25 UTC (rev 242383) @@ -1,21 +0,0 @@ -From 0eaca2da65d376ddd3ec170286feee5e88d68433 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <rich...@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"