From 399fa07bfac673a8846466b16c76549e329b55b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 May 2023 10:17:50 +0100 Subject: gentoo auto-resync : 20:05:2023 - 10:17:50 --- sys-apps/flatpak/Manifest | 3 +- .../files/flatpak-1.14.4-fuse-3-slotted.patch | 57 ++++++++++ sys-apps/flatpak/flatpak-1.14.4-r2.ebuild | 112 -------------------- sys-apps/flatpak/flatpak-1.14.4-r3.ebuild | 115 +++++++++++++++++++++ 4 files changed, 174 insertions(+), 113 deletions(-) create mode 100644 sys-apps/flatpak/files/flatpak-1.14.4-fuse-3-slotted.patch delete mode 100644 sys-apps/flatpak/flatpak-1.14.4-r2.ebuild create mode 100644 sys-apps/flatpak/flatpak-1.14.4-r3.ebuild (limited to 'sys-apps/flatpak') diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index 85ca9267d020..0ecdb0e636bb 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,7 +1,8 @@ +AUX flatpak-1.14.4-fuse-3-slotted.patch 2044 BLAKE2B 338410cf66583755bcb4924e7b89adcd51a8f78d6e31edc5ea80fe74ec257e0d3d0f1e7802962ec65836ce6152b2a39baed379be335811da70dc5f700105a59e SHA512 eeddad1b19099d3f9f8442ad7c570bea2503ac7118b821152d7ecf7f8b3bb4d40403d5460b3dc20dc745f9c2cadce6045a8a52fac15fcfc370c5bff0a0305697 AUX flatpak-update.service 215 BLAKE2B 803cd26340f06385a753fe29346e464c97cd5bb8045d75ebf2f48b05cbe16f2eaad6f64186ffcdb72eb8b2747a0b43f620fb5a728531c338063e6f2cd2e5627e SHA512 2391f0eed3b5e9d6a48ae043b3165b75f4ecb2ca51ffccfdc61d5b21b11b96cb677420eb4d886f85f2e8d083833ab6149f8007f905a55ae8323ebc7c490490f2 AUX flatpak-update.timer 122 BLAKE2B 1a353a6dee620b5b031451c17e53522b9a4f7f19c2ae85b5ed39615645c4572783bc981002eded8d30a438731bd782a2b405d62656ee3336b7e51cf08a8ef411 SHA512 147296decb8f6d0b07065bb67d96388501aadfbc0de19250d2f3ee0c3585e8c1c702b380d40cd06e4a47ab9b683ad62c29e54c955ac26a735fc0c5b2bc9df2ee DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14 SHA512 5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57 DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0 EBUILD flatpak-1.12.8.ebuild 2521 BLAKE2B a40a8e244e916c304d3fcabc6ef5d1ed34b13324186d3612df8d897bd9ad48c146ca2c16c18eb47d399daed883077fb335b2a652c66a73c5273d12f96a7f976f SHA512 8ea51cc5ba42827c09259a2e6d1ca49a19dbde19f0eea7406e7d2ee018a571b58206c3e39903cf96c827fd3b1ee1d6922d2556f1efccd6e1879382d9d08b6a78 -EBUILD flatpak-1.14.4-r2.ebuild 2723 BLAKE2B 9e9e03781f0e8154253317c507c74070530eacb3437dd4c614dc0d8d3a210a9da3dc321eda862186f8c24872fe69075b21bff13f5d320c93575c259cc694618a SHA512 47cda04eec26a6475955be32e1ed085a294df9777a7dcbba651dff5ac1ecf89ae8ebda10b848555cc2f27154b88e41a94dc8dc991f973f4758428f43503589d7 +EBUILD flatpak-1.14.4-r3.ebuild 2727 BLAKE2B 7a5184c61378185440b0a67bfa58acda18b29d9fe6b4c76d96ff3e95afcae812dd8726cb20c49f13acab164a567c7ea6e83dde9c9062d8b67bb3caf7ef80de2f SHA512 f8dfc00dcb2ac248b792be9a16fc55c075739098c759986a51ff0db0d9c890294c3e69d229ecb9404edb4da0a7957b1d6984e12ccf212495e246babeba9d22b8 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464 diff --git a/sys-apps/flatpak/files/flatpak-1.14.4-fuse-3-slotted.patch b/sys-apps/flatpak/files/flatpak-1.14.4-fuse-3-slotted.patch new file mode 100644 index 000000000000..a0db209fae2f --- /dev/null +++ b/sys-apps/flatpak/files/flatpak-1.14.4-fuse-3-slotted.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/906653 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo, + + fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE, + error, +- "fusermount", "-u", "-z", mnt_dir, ++ "fusermount3", "-u", "-z", mnt_dir, + NULL); + if (g_subprocess_wait_check (fusermount, NULL, error)) + { +--- a/tests/can-use-fuse.c ++++ b/tests/can-use-fuse.c +@@ -53,11 +53,11 @@ check_fuse (void) + return FALSE; + } + +- fusermount = g_find_program_in_path ("fusermount"); ++ fusermount = g_find_program_in_path ("fusermount3"); + + if (fusermount == NULL) + { +- cannot_use_fuse = g_strdup ("fusermount not found in PATH"); ++ cannot_use_fuse = g_strdup ("fusermount3 not found in PATH"); + return FALSE; + } + +@@ -69,7 +69,7 @@ check_fuse (void) + + if (!g_file_test ("/etc/mtab", G_FILE_TEST_EXISTS)) + { +- cannot_use_fuse = g_strdup ("fusermount won't work without /etc/mtab"); ++ cannot_use_fuse = g_strdup ("fusermount3 won't work without /etc/mtab"); + return FALSE; + } + +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -542,7 +542,7 @@ skip_one_without_bwrap () { + } + + skip_without_fuse () { +- fusermount --version >/dev/null 2>&1 || skip "no fusermount" ++ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3" + + capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \ + skip "No cap_sys_admin in bounding set, can't use FUSE" +@@ -608,7 +608,7 @@ commit_to_path () { + cleanup () { + /bin/kill -9 $DBUS_SESSION_BUS_PID + gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true +- fusermount -u $XDG_RUNTIME_DIR/doc >&2 || : ++ fusermount3 -u $XDG_RUNTIME_DIR/doc >&2 || : + kill $(jobs -p) &> /dev/null || true + if test -n "${TEST_SKIP_CLEANUP:-}"; then + echo "# Skipping cleanup of ${TEST_DATA_DIR}" diff --git a/sys-apps/flatpak/flatpak-1.14.4-r2.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r2.ebuild deleted file mode 100644 index 8b4eb2299d25..000000000000 --- a/sys-apps/flatpak/flatpak-1.14.4-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9,10,11} ) - -inherit linux-info python-any-r1 systemd - -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 ~loong ~ppc64 ~riscv x86" -IUSE="doc introspection policykit seccomp systemd X" -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-0.12:= - >=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] - >=gnome-base/dconf-0.26:= - gnome-base/gsettings-desktop-schemas - net-misc/curl:= - >=sys-apps/bubblewrap-0.5.0 - sys-apps/dbus - >=sys-fs/fuse-3.1.1:3= - sys-apps/xdg-dbus-proxy - X? ( - x11-apps/xauth - x11-libs/libXau:= - ) - x11-libs/gdk-pixbuf:2= - 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? ( - app-text/xmlto - dev-libs/libxslt - ) - $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') -" - -PDEPEND="sys-apps/xdg-desktop-portal" - -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 - --localstatedir="${EPREFIX}"/var - --with-system-bubblewrap - --with-system-dbus-proxy - $(use_enable X xauth) - $(use_enable doc documentation) - $(use_enable doc docbook-docs) - $(use_enable introspection) - $(use_enable policykit system-helper) - $(use_enable seccomp) - $(use_with systemd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 - find "${ED}" -name '*.la' -delete || die - # resolve conflict with acct-user/flatpak for #856706 - rm -rf "${ED}/usr/lib/sysusers.d" - - if use systemd; then - systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer} - fi -} diff --git a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild new file mode 100644 index 000000000000..d18fc746ae60 --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild @@ -0,0 +1,115 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9,10,11} ) + +inherit linux-info python-any-r1 systemd + +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 ~loong ~ppc64 ~riscv x86" +IUSE="doc introspection policykit seccomp systemd X" +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-0.12:= + >=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] + >=gnome-base/dconf-0.26:= + gnome-base/gsettings-desktop-schemas + net-misc/curl:= + >=sys-apps/bubblewrap-0.5.0 + sys-apps/dbus + >=sys-fs/fuse-3.1.1:3= + sys-apps/xdg-dbus-proxy + X? ( + x11-apps/xauth + x11-libs/libXau:= + ) + x11-libs/gdk-pixbuf:2= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + sys-devel/bison + $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + app-text/xmlto + dev-libs/libxslt + ) +" + +PDEPEND="sys-apps/xdg-desktop-portal" + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch +) + +python_check_deps() { + python_has_version "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 + --localstatedir="${EPREFIX}"/var + --with-system-bubblewrap + --with-system-dbus-proxy + $(use_enable X xauth) + $(use_enable doc documentation) + $(use_enable doc docbook-docs) + $(use_enable introspection) + $(use_enable policykit system-helper) + $(use_enable seccomp) + $(use_with systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 + find "${ED}" -name '*.la' -delete || die + # resolve conflict with acct-user/flatpak for #856706 + rm -rf "${ED}/usr/lib/sysusers.d" + + if use systemd; then + systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer} + fi +} -- cgit v1.2.3