diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-apps/fwupd | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-apps/fwupd')
-rw-r--r-- | sys-apps/fwupd/Manifest | 13 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch | 20 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch | 13 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch | 57 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.2.11.ebuild | 1 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.3.6.ebuild | 163 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.3.8.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.3.9-r1.ebuild (renamed from sys-apps/fwupd/fwupd-1.3.7.ebuild) | 9 |
8 files changed, 103 insertions, 176 deletions
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index deea970a727a..f2fdb36c6f98 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,11 +1,12 @@ AUX fwupd-1.3.8-report_uploading.patch 875 BLAKE2B 460db033bdb0ea865402ce938b586221c3543e9b4e0dc4e09504f1364a4cfff81e59cf38eb9732b89075eec8000f9afdb3ccf26002f829a4ae4ecf21ce92a723 SHA512 f89718b2aa695b44a2f382e6c5f5e0114f4086710d112d33c764f8450d8c2cfc4d3b14ee87c9f76c9c155d8fd2f70c5701a267487476bae190825978080a0879 +AUX fwupd-1.3.9-fwupdtool_path.patch 673 BLAKE2B cd77da5466d8e4bfaff10f89ed983b8b25ace977644f6f93035ad61ef0178fb4324e631648fa6433af3d3219659e5c084670e6153b3c4a42d8509fbb05bebbfb SHA512 814225d098030dfabff8bd15fa7a68bc929e3f8288c8411f844c9b9994d7f539d77bdf3ef06c7079972a8905eb29dc0f7856733ac6649112a911eddb1d884d3b +AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9 +AUX fwupd-1.3.9-optional_agent_man_page.patch 1705 BLAKE2B b53e843f8495b6b5bfaef76ec3fa05b834c5989b9cf52a5e18a2dc5893dd9d87fae494d1965f71ff8007994f329c368694e9c3ae746e03e3d45bc0bef09e9e5a SHA512 b537288ff6ec860cb6d958c34b29ca4eeaa6212654c3306aba031eec944667ca3522448a77e1cba9bb9a8e65555868c291deb12adf21cc390d0f992f3fd8c08b AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de -DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78 -DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4 -EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5 -EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343 -EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f -EBUILD fwupd-1.3.8.ebuild 4209 BLAKE2B de17002a4e62e9ebabb9e96a7e119be7ec2415f9fdf22a1e3396b9f8af2b63fe47047d6cf071e1a8011434b9183f6ef0718f4a2add45f85349da4389367e7791 SHA512 8d1c1a2c84ac2c6ae675e81b87bf9270cb8c583735f42fba57518d402171666e8b0ee676bc6bdedc67bd5a2b11115e867f3b5cf2f838186c35d52cc625a00fe9 +DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4 +EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd +EBUILD fwupd-1.3.8.ebuild 4147 BLAKE2B aba1f982b217a437d855cad900206a45509e2f6a1c102b24a1401aa8aedc113a8df1332ff13bdd052c21d5eebe1b62512a7dcbac2a135a0cea0d6daba29157a1 SHA512 d41f3455527b8bb26ae8ccbbef163269e774791c80a023ea3ac07cb3864582aedeec15448e53341430374bde74fe346cd06f23bab0cc5f793aab6337cad24eaf +EBUILD fwupd-1.3.9-r1.ebuild 4196 BLAKE2B 40c1921df28ed69702666f33793937b6aeac82d02067423ec95076c92ebe10f7a2842a4c85a85b13d8e14e914b2106e9c4e1f50cf711d33d873933b84322d0ee SHA512 dc7d75a074887c8bdb9fa9536846d0d578ea1e4d3416eabbe97a3cb68a10be343909ef142a7d93c90fcc4506cc2ca716cc64b33a194c59e6f2b7ec778f67f6fd MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch new file mode 100644 index 000000000000..a01e5fbe570d --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch @@ -0,0 +1,20 @@ +From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001 +From: Dennis Kadioglu <dkadioglu@web.de> +Date: Thu, 5 Mar 2020 09:37:56 +0100 +Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool + to bindir + +--- + data/fwupd.shutdown.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in +index 4c027e7ab..53b334555 100755 +--- a/data/fwupd.shutdown.in ++++ b/data/fwupd.shutdown.in +@@ -4,4 +4,4 @@ + [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0 + + # activate firmware when we have a read-only filesysten +-@libexecdir@/fwupd/fwupdtool activate ++@bindir@/fwupdtool activate 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 new file mode 100644 index 000000000000..526fe7700ed0 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch @@ -0,0 +1,13 @@ +Enable logind plugin when -Delogind=true is set as well + +--- fwupd-1.3.9/plugins/meson.build ++++ fwupd-1.3.9/plugins/meson.build +@@ -27,7 +27,7 @@ + subdir('wacom-raw') + endif + +-if get_option('systemd') ++if get_option('systemd') or get_option('elogind') + subdir('logind') + endif + diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch new file mode 100644 index 000000000000..6c9898557ffd --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch @@ -0,0 +1,57 @@ +From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Fri, 6 Mar 2020 16:00:23 +0100 +Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not + requested + +Otherwise build fails with: + + src/meson.build:196:2: ERROR: Unknown variable "fwupdagent". + +Gentoo-bug: https://bugs.gentoo.org/711682 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + src/meson.build | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 46a9c4ded..e9aac607e 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -193,20 +193,22 @@ if build_daemon and get_option('man') + install : true, + install_dir : join_paths(mandir, 'man1'), + ) +- custom_target('fwupdagent-man', +- input : fwupdagent, +- output : 'fwupdagent.1', +- command : [ +- help2man, '@INPUT@', +- '--no-info', +- '--output', '@OUTPUT@', +- '--name', 'Firmware updating agent', +- '--manual', 'User Commands', +- '--version-string', fwupd_version, +- ], +- install : true, +- install_dir : join_paths(mandir, 'man1'), +- ) ++ if get_option('agent') ++ custom_target('fwupdagent-man', ++ input : fwupdagent, ++ output : 'fwupdagent.1', ++ command : [ ++ help2man, '@INPUT@', ++ '--no-info', ++ '--output', '@OUTPUT@', ++ '--name', 'Firmware updating agent', ++ '--manual', 'User Commands', ++ '--version-string', fwupd_version, ++ ], ++ install : true, ++ install_dir : join_paths(mandir, 'man1'), ++ ) ++ endif + endif + if get_option('man') + custom_target('fwupdtool-man', diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild index 345dba19aaac..7239b28afeae 100644 --- a/sys-apps/fwupd/fwupd-1.2.11.ebuild +++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild @@ -55,7 +55,6 @@ RDEPEND="${PYTHON_DEPS} pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) - thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype diff --git a/sys-apps/fwupd/fwupd-1.3.6.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild deleted file mode 100644 index a9c5006ef34e..000000000000 --- a/sys-apps/fwupd/fwupd-1.3.6.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit linux-info meson python-single-r1 vala xdg toolchain-funcs - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ^^ ( consolekit elogind minimal systemd ) - dell? ( uefi ) - minimal? ( !introspection ) -" -RESTRICT="!test? ( test )" - -BDEPEND="$(vala_depend) - virtual/pkgconfig - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection ) - man? ( - app-text/docbook-sgml-utils - sys-apps/help2man - ) - test? ( - thunderbolt? ( dev-util/umockdev ) - net-libs/gnutls[tools] - ) -" -DEPEND="${PYTHON_DEPS} - >=app-arch/gcab-1.0 - app-arch/libarchive:= - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 - dev-libs/json-glib - dev-libs/libgpg-error - dev-libs/libgudev:= - >=dev-libs/libgusb-0.2.9[introspection?] - >=dev-libs/libxmlb-0.1.13 - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] - ') - >=net-libs/libsoup-2.51.92:2.4[introspection?] - virtual/libelf:0= - virtual/udev - consolekit? ( >=sys-auth/consolekit-1.0.0 ) - dell? ( - sys-libs/efivar - >=sys-libs/libsmbios-2.4.0 - ) - elogind? ( sys-auth/elogind ) - gpg? ( - app-crypt/gpgme - dev-libs/libgpg-error - ) - !minimal? ( - >=sys-auth/polkit-0.103 - ) - nvme? ( sys-libs/efivar ) - pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) - redfish? ( sys-libs/efivar ) - systemd? ( >=sys-apps/systemd-211 ) - thunderbolt? ( - sys-apps/thunderbolt-software-user-space - ) - tpm? ( app-crypt/tpm2-tss ) - uefi? ( - app-crypt/tpm2-tss - media-libs/fontconfig - media-libs/freetype - sys-boot/gnu-efi - sys-boot/efibootmgr - >=sys-libs/efivar-33 - x11-libs/cairo - ) -" -RDEPEND=" - ${DEPEND} - sys-apps/dbus -" - -pkg_setup() { - tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530 - - python-single-r1_pkg_setup - if use nvme; then - kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" - fi -} - -src_prepare() { - default - # c.f. https://github.com/fwupd/fwupd/issues/1414 - sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ - -i plugins/thunderbolt/meson.build || die - vala_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var - -Dbuild="$(usex minimal standalone all)" - $(meson_use agent) - $(meson_use amt plugin_amt) - $(meson_use consolekit) - $(meson_use dell plugin_dell) - $(meson_use elogind) - $(meson_use gpg) - $(meson_use gtk-doc gtkdoc) - $(meson_use man) - $(meson_use nvme plugin_nvme) - $(meson_use pkcs7) - $(meson_use redfish plugin_redfish) - $(meson_use synaptics plugin_synaptics) - $(meson_use systemd) - $(meson_use test tests) - $(meson_use thunderbolt plugin_thunderbolt) - $(meson_use tpm plugin_tpm) - $(meson_use uefi plugin_uefi) - # Requires libflashrom which our sys-apps/flashrom - # package does not provide - -Dplugin_flashrom="false" - # Dependencies are not available (yet?) - -Dplugin_modem_manager="false" - ) - export CACHE_DIRECTORY="${T}" - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use minimal ; then - sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \ - "${FILESDIR}"/${PN}-r1 \ - > "${T}"/${PN} || die - doinitd "${T}"/${PN} - - if ! use systemd ; then - # Don't timeout when fwupd is running (#673140) - sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ - -i "${ED}"/etc/${PN}/daemon.conf || die - fi - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "In case you are using openrc as init system" - elog "and you're upgrading from <fwupd-1.1.0, you" - elog "need to start the fwupd daemon via the openrc" - elog "init script that comes with this package." -} diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild index ca087051eeb6..52570fdd06bb 100644 --- a/sys-apps/fwupd/fwupd-1.3.8.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild @@ -70,9 +70,6 @@ DEPEND="${PYTHON_DEPS} pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) - thunderbolt? ( - sys-apps/thunderbolt-software-user-space - ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss diff --git a/sys-apps/fwupd/fwupd-1.3.7.ebuild b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild index becbfc3095f6..9e00025905ca 100644 --- a/sys-apps/fwupd/fwupd-1.3.7.ebuild +++ b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild @@ -70,9 +70,6 @@ DEPEND="${PYTHON_DEPS} pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) - thunderbolt? ( - sys-apps/thunderbolt-software-user-space - ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss @@ -91,6 +88,12 @@ RDEPEND=" sys-apps/dbus " +PATCHES=( + "${FILESDIR}/${PN}-1.3.9-logind_plugin.patch" + "${FILESDIR}/${P}-optional_agent_man_page.patch" + "${FILESDIR}/${P}-fwupdtool_path.patch" +) + pkg_setup() { python-single-r1_pkg_setup if use nvme; then |