1 |
commit: e9383563a1f114c0214768ffc446e0959c5890b8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 17 09:10:49 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 17 09:10:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9383563 |
7 |
|
8 |
sys-apps/fwupd: Bump to version 1.3.8 |
9 |
|
10 |
Thanks-to: AE <vltg0903 <AT> gmx.net> |
11 |
Closes: https://bugs.gentoo.org/709496 |
12 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
sys-apps/fwupd/Manifest | 1 + |
16 |
.../fwupd/files/fwupd-1.3.8-report_uploading.patch | 34 +++++ |
17 |
sys-apps/fwupd/fwupd-1.3.8.ebuild | 168 +++++++++++++++++++++ |
18 |
3 files changed, 203 insertions(+) |
19 |
|
20 |
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest |
21 |
index f37c760c4c2..4d30214b4a0 100644 |
22 |
--- a/sys-apps/fwupd/Manifest |
23 |
+++ b/sys-apps/fwupd/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de |
26 |
DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78 |
27 |
DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e |
28 |
+DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4 |
29 |
|
30 |
diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..c0e006a7536 |
33 |
--- /dev/null |
34 |
+++ b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch |
35 |
@@ -0,0 +1,34 @@ |
36 |
+From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001 |
37 |
+From: Mario Limonciello <mario.limonciello@××××.com> |
38 |
+Date: Thu, 13 Feb 2020 12:06:41 -0600 |
39 |
+Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in |
40 |
+ e076d48afb74d1447936d353f12781755f13b047 |
41 |
+ |
42 |
+Fixes: #1770 |
43 |
+--- |
44 |
+ src/fu-util.c | 8 ++------ |
45 |
+ 1 file changed, 2 insertions(+), 6 deletions(-) |
46 |
+ |
47 |
+diff --git a/src/fu-util.c b/src/fu-util.c |
48 |
+index 5bcffedeb..e6531c90c 100644 |
49 |
+--- a/src/fu-util.c |
50 |
++++ b/src/fu-util.c |
51 |
+@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError |
52 |
+ NULL, error)) |
53 |
+ return FALSE; |
54 |
+ } |
55 |
+- return TRUE; |
56 |
++ break; |
57 |
+ default: |
58 |
+ break; |
59 |
+ } |
60 |
+ |
61 |
+- g_set_error_literal (error, |
62 |
+- FWUPD_ERROR, |
63 |
+- FWUPD_ERROR_NOTHING_TO_DO, |
64 |
+- "invalid option selected"); |
65 |
+- return FALSE; |
66 |
++ return TRUE; |
67 |
+ } |
68 |
+ |
69 |
+ static gboolean |
70 |
|
71 |
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..ca087051eeb |
74 |
--- /dev/null |
75 |
+++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild |
76 |
@@ -0,0 +1,168 @@ |
77 |
+# Copyright 1999-2020 Gentoo Authors |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI=7 |
81 |
+ |
82 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
83 |
+ |
84 |
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs |
85 |
+ |
86 |
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" |
87 |
+HOMEPAGE="https://fwupd.org" |
88 |
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
89 |
+ |
90 |
+LICENSE="LGPL-2.1+" |
91 |
+SLOT="0" |
92 |
+KEYWORDS="~amd64 ~arm ~x86" |
93 |
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" |
94 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
95 |
+ ^^ ( consolekit elogind minimal systemd ) |
96 |
+ dell? ( uefi ) |
97 |
+ minimal? ( !introspection ) |
98 |
+" |
99 |
+RESTRICT="!test? ( test )" |
100 |
+ |
101 |
+BDEPEND="$(vala_depend) |
102 |
+ virtual/pkgconfig |
103 |
+ gtk-doc? ( dev-util/gtk-doc ) |
104 |
+ introspection? ( dev-libs/gobject-introspection ) |
105 |
+ man? ( |
106 |
+ app-text/docbook-sgml-utils |
107 |
+ sys-apps/help2man |
108 |
+ ) |
109 |
+ test? ( |
110 |
+ thunderbolt? ( dev-util/umockdev ) |
111 |
+ net-libs/gnutls[tools] |
112 |
+ ) |
113 |
+" |
114 |
+DEPEND="${PYTHON_DEPS} |
115 |
+ >=app-arch/gcab-1.0 |
116 |
+ app-arch/libarchive:= |
117 |
+ dev-db/sqlite |
118 |
+ >=dev-libs/glib-2.45.8:2 |
119 |
+ dev-libs/json-glib |
120 |
+ dev-libs/libgpg-error |
121 |
+ dev-libs/libgudev:= |
122 |
+ >=dev-libs/libgusb-0.2.9[introspection?] |
123 |
+ >=dev-libs/libxmlb-0.1.13 |
124 |
+ $(python_gen_cond_dep ' |
125 |
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}] |
126 |
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}] |
127 |
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] |
128 |
+ ') |
129 |
+ >=net-libs/libsoup-2.51.92:2.4[introspection?] |
130 |
+ virtual/libelf:0= |
131 |
+ virtual/udev |
132 |
+ consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
133 |
+ dell? ( |
134 |
+ sys-libs/efivar |
135 |
+ >=sys-libs/libsmbios-2.4.0 |
136 |
+ ) |
137 |
+ elogind? ( sys-auth/elogind ) |
138 |
+ gpg? ( |
139 |
+ app-crypt/gpgme |
140 |
+ dev-libs/libgpg-error |
141 |
+ ) |
142 |
+ !minimal? ( |
143 |
+ >=sys-auth/polkit-0.103 |
144 |
+ ) |
145 |
+ nvme? ( sys-libs/efivar ) |
146 |
+ pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) |
147 |
+ redfish? ( sys-libs/efivar ) |
148 |
+ systemd? ( >=sys-apps/systemd-211 ) |
149 |
+ thunderbolt? ( |
150 |
+ sys-apps/thunderbolt-software-user-space |
151 |
+ ) |
152 |
+ tpm? ( app-crypt/tpm2-tss ) |
153 |
+ uefi? ( |
154 |
+ app-crypt/tpm2-tss |
155 |
+ media-libs/fontconfig |
156 |
+ media-libs/freetype |
157 |
+ sys-boot/gnu-efi |
158 |
+ sys-boot/efibootmgr |
159 |
+ >=sys-libs/efivar-33 |
160 |
+ x11-libs/cairo |
161 |
+ ) |
162 |
+" |
163 |
+# Block sci-chemistry/chemical-mime-data for bug #701900 |
164 |
+RDEPEND=" |
165 |
+ !<sci-chemistry/chemical-mime-data-0.1.94-r4 |
166 |
+ ${DEPEND} |
167 |
+ sys-apps/dbus |
168 |
+" |
169 |
+ |
170 |
+PATCHES=( |
171 |
+ # https://github.com/fwupd/fwupd/issues/1770 |
172 |
+ "${FILESDIR}"/${P}-report_uploading.patch |
173 |
+) |
174 |
+ |
175 |
+pkg_setup() { |
176 |
+ python-single-r1_pkg_setup |
177 |
+ if use nvme; then |
178 |
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" |
179 |
+ fi |
180 |
+} |
181 |
+ |
182 |
+src_prepare() { |
183 |
+ default |
184 |
+ # c.f. https://github.com/fwupd/fwupd/issues/1414 |
185 |
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ |
186 |
+ -i plugins/thunderbolt/meson.build || die |
187 |
+ vala_src_prepare |
188 |
+} |
189 |
+ |
190 |
+src_configure() { |
191 |
+ local emesonargs=( |
192 |
+ --localstatedir "${EPREFIX}"/var |
193 |
+ -Dbuild="$(usex minimal standalone all)" |
194 |
+ $(meson_use agent) |
195 |
+ $(meson_use amt plugin_amt) |
196 |
+ $(meson_use consolekit) |
197 |
+ $(meson_use dell plugin_dell) |
198 |
+ $(meson_use elogind) |
199 |
+ $(meson_use gpg) |
200 |
+ $(meson_use gtk-doc gtkdoc) |
201 |
+ $(meson_use man) |
202 |
+ $(meson_use nvme plugin_nvme) |
203 |
+ $(meson_use pkcs7) |
204 |
+ $(meson_use redfish plugin_redfish) |
205 |
+ $(meson_use synaptics plugin_synaptics) |
206 |
+ $(meson_use systemd) |
207 |
+ $(meson_use test tests) |
208 |
+ $(meson_use thunderbolt plugin_thunderbolt) |
209 |
+ $(meson_use tpm plugin_tpm) |
210 |
+ $(meson_use uefi plugin_uefi) |
211 |
+ # Requires libflashrom which our sys-apps/flashrom |
212 |
+ # package does not provide |
213 |
+ -Dplugin_flashrom="false" |
214 |
+ # Dependencies are not available (yet?) |
215 |
+ -Dplugin_modem_manager="false" |
216 |
+ ) |
217 |
+ export CACHE_DIRECTORY="${T}" |
218 |
+ meson_src_configure |
219 |
+} |
220 |
+ |
221 |
+src_install() { |
222 |
+ meson_src_install |
223 |
+ |
224 |
+ if ! use minimal ; then |
225 |
+ sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ |
226 |
+ "${FILESDIR}"/${PN}-r1 \ |
227 |
+ > "${T}"/${PN} || die |
228 |
+ doinitd "${T}"/${PN} |
229 |
+ |
230 |
+ if ! use systemd ; then |
231 |
+ # Don't timeout when fwupd is running (#673140) |
232 |
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ |
233 |
+ -i "${ED}"/etc/${PN}/daemon.conf || die |
234 |
+ fi |
235 |
+ fi |
236 |
+} |
237 |
+ |
238 |
+pkg_postinst() { |
239 |
+ xdg_pkg_postinst |
240 |
+ elog "In case you are using openrc as init system" |
241 |
+ elog "and you're upgrading from <fwupd-1.1.0, you" |
242 |
+ elog "need to start the fwupd daemon via the openrc" |
243 |
+ elog "init script that comes with this package." |
244 |
+} |