aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/fwupd/APKBUILD10
-rw-r--r--community/fwupd/fix-version.patch17
2 files changed, 23 insertions, 4 deletions
diff --git a/community/fwupd/APKBUILD b/community/fwupd/APKBUILD
index d5bd76c7b8..64cb3b2500 100644
--- a/community/fwupd/APKBUILD
+++ b/community/fwupd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=fwupd
-pkgver=1.3.3
+pkgver=1.3.4
pkgrel=0
pkgdesc="Firmware update daemon"
url="https://fwupd.org/"
@@ -9,7 +9,7 @@ arch="x86_64 x86"
license="LGPL-2.1-or-later"
depends="dbus"
makedepends="meson help2man linux-headers gnutls-utils
- python py3-pillow py3-gobject3 py3-cairo ttf-opensans
+ python3 py3-pillow py3-gobject3 py3-cairo ttf-opensans
glib-dev libgudev-dev libgusb-dev libgcab-dev json-glib-dev
gobject-introspection-dev vala cairo-dev fontconfig-dev freetype-dev
polkit-dev libxmlb-dev libarchive-dev libsoup-dev gpgme-dev eudev-dev gnutls-dev
@@ -20,6 +20,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
source="fwupd-$pkgver.tar.gz::https://github.com/hughsie/fwupd/archive/$pkgver.tar.gz
$pkgname.initd
fixes.patch
+ fix-version.patch
"
build() {
@@ -69,6 +70,7 @@ package() {
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
}
-sha512sums="b8f0d88fa9c1c8219dd040775d76207f1be87294ebb5f38043b77a670a1601cc597a711f5635aa3d164a08ee0dd068dd22514acae96f6fc5ad20d35099d02f50 fwupd-1.3.3.tar.gz
+sha512sums="00b6ba394c74252c1c7eba5e5e1fd92f234fb6db6de8bca69fbc578bf3b12790867b6adaef6c422c801d28990d390bbe8af67ab0f5bd3a744adbeb053708a254 fwupd-1.3.4.tar.gz
ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766 fwupd.initd
-0298319cb5249326ef2576612165a1c4775128fcbd58a19367385816873b56d59cfdcc2d0ef8c95e92fc7a454974aede361de43f132c024272cb5fce7b6dbbcb fixes.patch"
+0298319cb5249326ef2576612165a1c4775128fcbd58a19367385816873b56d59cfdcc2d0ef8c95e92fc7a454974aede361de43f132c024272cb5fce7b6dbbcb fixes.patch
+fcd75b9f367d970c2d08e53fbd6a98f553726dbcae2b2e92ab15ad564cdd9f0ea29574f4ad06e98923deab78ab2c1220cf5aceab839b6f2c7de3652b5551227b fix-version.patch"
diff --git a/community/fwupd/fix-version.patch b/community/fwupd/fix-version.patch
new file mode 100644
index 0000000000..37e6759dd4
--- /dev/null
+++ b/community/fwupd/fix-version.patch
@@ -0,0 +1,17 @@
+get_version_git() uses git describe which describes the aports repo, it is supposed to fail and use get_version() instead
+
+diff --git a/contrib/get-version.py b/contrib/get-version.py
+index 0a678ca..f6fe0d7 100755
+--- a/contrib/get-version.py
++++ b/contrib/get-version.py
+@@ -39,9 +39,4 @@ def get_version():
+
+ if __name__ == '__main__':
+
+- version = get_version_git()
+- if version:
+- version = sanitize_for_ci(version)
+- else:
+- version = get_version()
+- print(version)
++ print(get_version())