Diff fwupd-1.8.15 with a fwupd-1.9.3

/usr/portage/sys-apps/fwupd/fwupd-1.9.3.ebuild 2023-10-09 14:52:35.372368498 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
PYTHON_COMPAT=( python3_{9..11} )
6
PYTHON_COMPAT=( python3_{10..12} )
7 7

  
8 8
inherit meson python-single-r1 vala udev xdg
9 9

  
......
48 48
COMMON_DEPEND="${PYTHON_DEPS}
49 49
	>=app-arch/gcab-1.0
50 50
	app-arch/xz-utils
51
	>=dev-libs/glib-2.58:2
52
	dev-libs/json-glib
53
	dev-libs/libgudev:=
51
	>=dev-libs/glib-2.68:2
52
	>=dev-libs/json-glib-1.6.0
53
	>=dev-libs/libgudev-232:=
54 54
	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
55
	>=dev-libs/libxmlb-0.1.13:=[introspection?]
55
	>=dev-libs/libxmlb-0.3.6:=[introspection?]
56 56
	$(python_gen_cond_dep '
57 57
		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
58 58
	')
59
	net-misc/curl
59
	>=net-misc/curl-7.62.0
60 60
	archive? ( app-arch/libarchive:= )
61
	cbor? ( dev-libs/libcbor:= )
61
	cbor? ( >=dev-libs/libcbor-0.7.0:= )
62 62
	dell? (
63 63
		>=app-crypt/tpm2-tss-2.0
64 64
		>=sys-libs/libsmbios-2.4.0
65 65
	)
66 66
	elogind? ( >=sys-auth/elogind-211 )
67 67
	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
68
	gnutls? ( net-libs/gnutls )
69
	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
68
	gnutls? ( >=net-libs/gnutls-3.6.0 )
69
	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
70 70
	logitech? ( dev-libs/protobuf-c:= )
71 71
	lzma? ( app-arch/xz-utils )
72
	modemmanager? ( net-misc/modemmanager[qmi] )
72
	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
73 73
	policykit? ( >=sys-auth/polkit-0.114 )
74 74
	sqlite? ( dev-db/sqlite )
75 75
	systemd? ( >=sys-apps/systemd-211 )
......
91 91
	x11-libs/pango[introspection]
92 92
"
93 93

  
94
PATCHES=(
95
	"${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
96
)
97

  
98 94
src_prepare() {
99 95
	default
100 96

  
......
173 169

  
174 170
	if ! use minimal ; then
175 171
		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
172
	fi
176 173

  
177
		if ! use systemd ; then
178
			# Don't timeout when fwupd is running (#673140)
179
			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
180
				-i "${ED}"/etc/${PN}/daemon.conf || die
181
		fi
174
	if use test; then
175
		# Preventing tests from being installed in the first place is a moving target,
176
		# just axe them all afterwards.
177
		rm -rf "${ED}"/etc/fwupd/remotes.d/fwupd-tests.conf \
178
			"${ED}"/usr/libexec/installed-tests \
179
			"${ED}"/usr/share/fwupd/device-tests \
180
			"${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
181
			"${ED}"/usr/share/installed-tests \
182
		|| die
182 183
	fi
183 184
}
184 185

  
Thank you!