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