diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-12-10 12:23:15 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-10 12:23:15 +0100 |
| commit | 353f3592cef10e024ad591b8746a7771368dd381 (patch) | |
| tree | 82bfe2234a13c1130312960f703822ea793935f0 /community/fwupd | |
| parent | 01b0377b33182db5f41d5c4e9486ba58d681bca7 (diff) | |
| download | aports-353f3592cef10e024ad591b8746a7771368dd381.tar.bz2 aports-353f3592cef10e024ad591b8746a7771368dd381.tar.xz | |
community/fwupd: fix daemon support
Diffstat (limited to 'community/fwupd')
| -rw-r--r-- | community/fwupd/APKBUILD | 5 | ||||
| -rw-r--r-- | community/fwupd/fix-version.patch | 28 |
2 files changed, 13 insertions, 20 deletions
diff --git a/community/fwupd/APKBUILD b/community/fwupd/APKBUILD index 43a33391ba..592d40a394 100644 --- a/community/fwupd/APKBUILD +++ b/community/fwupd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=fwupd pkgver=1.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="Firmware update daemon" url="https://fwupd.org/" arch="x86_64 x86" @@ -31,7 +31,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --buildtype=release \ - -Ddaemon=true \ -Dagent=true \ -Dconsolekit=true \ -Dfirmware-packager=true \ @@ -72,5 +71,5 @@ package() { sha512sums="b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd fwupd-1.3.5.tar.gz ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766 fwupd.initd -fcd75b9f367d970c2d08e53fbd6a98f553726dbcae2b2e92ab15ad564cdd9f0ea29574f4ad06e98923deab78ab2c1220cf5aceab839b6f2c7de3652b5551227b fix-version.patch +9ca5b469d6e5ae13c43bff6496a0781b53b1d870ef0492553d2244213cb695a095befb3586baefb68466b4897ddd18136f785d8de1c489ac1148558d49e9674e fix-version.patch 4a5cc7cb87b91345ad98e11ebbc67e0e8c1b124e7e01376f58886a0858cc68ef96f8edc46a41793f407821d2d5c9e91f7a962d4149732e803f6dde579a8c1b3b fix-lib64-bubblewrap-bind.patch" diff --git a/community/fwupd/fix-version.patch b/community/fwupd/fix-version.patch index 37e6759dd4..be4a369c6f 100644 --- a/community/fwupd/fix-version.patch +++ b/community/fwupd/fix-version.patch @@ -1,17 +1,11 @@ -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()) +diff --git a/meson.build b/meson.build +index 959fc0d..0251e0c 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('fwupd', 'c', +- version : run_command('contrib/get-version.py').stdout().strip(), ++ version : '1.3.5', + license : 'LGPL-2.1+', + meson_version : '>=0.47.0', + default_options : ['warning_level=2', 'c_std=c99'], |