diff options
Diffstat (limited to 'sys-apps/flatpak')
| -rw-r--r-- | sys-apps/flatpak/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch | 42 | ||||
| -rw-r--r-- | sys-apps/flatpak/flatpak-1.12.2-r1.ebuild | 106 |
3 files changed, 150 insertions, 0 deletions
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index 137983c4303d..ff2e0cb5b5f8 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,5 +1,7 @@ +AUX flatpak-1.12.2-pyparsing-3.0.2-compat.patch 1694 BLAKE2B 88c7bd915e670f99c26c7d868fa5f85e2e0b9071b3dd342bb7ba476d0be3747ae7c1713d8a6617a3d57d9f30613c43a7ab1f55daa9de83c8b2b42d4e121a3976 SHA512 a67d011d8be0d1077f47ae561c3a875ac2bb99d908ffba477bc7cb180f52e7fb3c9be10b76563ee5eb129469cf500e92e66b7bf1fe6564fd95f083e0fe0a2845 DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f EBUILD flatpak-1.10.5.ebuild 2417 BLAKE2B c6101934112c06a45808d798916d8bbbb422b945671d3b57f958f59030e7b4f7e5143de10a3955263c51b50060cc8ea8ed3b83af5cd95c6ecb4a58ed215fe73c SHA512 3da93b5a0a7581d4dd8e15970834b9044f17ecca60304c24143fc06280c710197ab8c11981e49a10d9c8cba54c0093e3074c16e30c1b963ea707850c9353e606 +EBUILD flatpak-1.12.2-r1.ebuild 2486 BLAKE2B 9115921fb2e836293ef37565803d2592469f703123fd9a46522dc6dba0475ee99c3c9cad2e8ffe771b6f665330e14a804876557fb1556b0f501f8810bb775c9d SHA512 3840079a8ff08b9deb741e314b35a01cd60ba6621e723d77afb5ba8424f7caa8c09faedca807d20c043cf31c88d68fde10918cd6f0c72e9913c0fa68abd64324 EBUILD flatpak-1.12.2.ebuild 2423 BLAKE2B 0c40f9666929437cd0d6656143c41568c5a968dcd3215a9117fae3f1a84c9d2eb9f9833ae5db1b5b36de1c4913dc6f3e2d51ead94f28c7d4e4b816f4d398492b SHA512 7c579099711ab8033fba546c2ed922b02a56b4aafb51e45021fff81ceb31b635950d629e8743eb25bf763341c57d1da4e61bb9b7e64c5d20c427c6fbce70e965 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464 diff --git a/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch b/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch new file mode 100644 index 000000000000..237c659e36f8 --- /dev/null +++ b/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch @@ -0,0 +1,42 @@ +https://gitlab.gnome.org/alexl/variant-schema-compiler/-/merge_requests/11.patch + +From 8850e4d0da76a85c5f9926cd40e148e0b29bddac Mon Sep 17 00:00:00 2001 +From: Phaedrus Leeds <mwleeds@protonmail.com> +Date: Thu, 16 Dec 2021 10:50:10 -0800 +Subject: [PATCH] Fix runtime error when using pyparsing >= 3.0.2 + +Ever since this commit +(https://github.com/pyparsing/pyparsing/commit/4ab17bb55) +variant-schema-compiler has failed to execute when used by Flatpak like +this: +$ variant-schema-compiler/variant-schema-compiler --outfile-header +common/flatpak-variant-private.h --outfile +common/flatpak-variant-impl-private.h --prefix var +./data/flatpak-variants.gv + +For some reason our use of leaveWhitespace() to ensure that a named type +has a ' right before its name no longer works. But fortunately pyparsing +has a Combine() which does exactly what we want. + +See https://github.com/flatpak/flatpak/issues/4534 + +Fixes https://gitlab.gnome.org/alexl/variant-schema-compiler/-/issues/4 +--- + variant-schema-compiler | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/subprojects/variant-schema-compiler/variant-schema-compiler ++++ b/subprojects/variant-schema-compiler/variant-schema-compiler +@@ -1740,7 +1740,7 @@ def handleNameableType(toks): + add_named_type(typename_prefix + name, type) + return type + +-nameableType = (Optional((Suppress("'") + ident).leaveWhitespace()) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType) ++nameableType = (Optional(Combine(Suppress("'") + ident)) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType) + + typeSpec <<= basicType ^ variantType ^ namedType ^ nameableType + +-- +GitLab + + diff --git a/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild b/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild new file mode 100644 index 000000000000..93fb30b800bc --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit autotools linux-info python-any-r1 + +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" +DESCRIPTION="Linux application sandboxing and distribution framework" +HOMEPAGE="https://flatpak.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc gtk kde introspection policykit seccomp systemd" +RESTRICT+=" test" + +RDEPEND=" + acct-group/flatpak + acct-user/flatpak + >=app-arch/libarchive-2.8:= + app-arch/zstd:= + >=app-crypt/gpgme-1.1.8:= + >=dev-libs/appstream-glib-0.5.10:= + >=dev-libs/glib-2.56:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + dev-libs/libassuan:= + >=dev-util/ostree-2020.8:=[gpg(+)] + || ( + dev-util/ostree[curl] + dev-util/ostree[soup] + ) + >=gnome-base/dconf-0.26:= + >=net-libs/libsoup-2.4:= + sys-apps/bubblewrap + sys-apps/dbus + >=sys-fs/fuse-2.9.9:0= + sys-apps/xdg-dbus-proxy + x11-apps/xauth + x11-libs/gdk-pixbuf:2= + x11-libs/libXau:= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +# pyparsing version pinned for https://bugs.gentoo.org/825230 +BDEPEND=" + >=sys-devel/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + sys-devel/bison + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + >=dev-util/gtk-doc-1.20 + dev-libs/libxslt + ) + $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') +" + +PDEPEND=" + gtk? ( sys-apps/xdg-desktop-portal-gtk ) + kde? ( kde-plasma/xdg-desktop-portal-kde ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.12.2-pyparsing-3.0.2-compat.patch +) + +python_check_deps() { + has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +pkg_setup() { + local CONFIG_CHECK="~USER_NS" + linux-info_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + # This line fails because locales are in /usr/lib/locale/locale-archive. + sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die +} + +src_configure() { + local myeconfargs=( + --enable-sandboxed-triggers + --enable-xauth + --localstatedir="${EPREFIX}"/var + --with-system-bubblewrap + --with-system-dbus-proxy + $(use_enable doc documentation) + $(use_enable doc gtk-doc) + $(use_enable introspection) + $(use_enable policykit system-helper) + $(use_enable seccomp) + $(use_with systemd) + ) + + econf "${myeconfargs[@]}" +} |