From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- gnome-base/gvfs/Manifest | 5 +- gnome-base/gvfs/files/libplist-2.2.patch | 30 +++++++ gnome-base/gvfs/gvfs-1.42.2.ebuild | 1 + gnome-base/gvfs/gvfs-1.44.1.ebuild | 139 +++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 gnome-base/gvfs/files/libplist-2.2.patch create mode 100644 gnome-base/gvfs/gvfs-1.44.1.ebuild (limited to 'gnome-base/gvfs') diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 0e26de3e4e36..6441d1b12448 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,4 +1,7 @@ +AUX libplist-2.2.patch 985 BLAKE2B cfb16b82634dfde00af05d96e3b0561b6bcbd246369b3048f807fee14fcfefdf1f2a9a39afaba9237109c051eb60f16a28916ef26e9f63fa0bcfff7e5cdefad4 SHA512 f6a9c6a2744063495ca95bfd47807a0883835504356948797e6d7015783d7f3b2504ac9ea791435301d2b4c063ef5642c53e485192c0008e0242e1754e567085 DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0 DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c -EBUILD gvfs-1.42.2.ebuild 3851 BLAKE2B 97775a41744d5ec07cd3571c0aebca51690a06264164d97eddd641f943f454f95b78e6677e1622c35d563a1d9b75a17463cf89b749726339c2a66dab0ce96aea SHA512 bb04c71b2c39a01a742a46da0b31f5473701cb17a892f56567d5f133754b5e2eb8991193de0cef387bc0b00530259ac8d5102409a536240db47904e97883fdac +DIST gvfs-1.44.1.tar.xz 1222040 BLAKE2B 5a412395cf0edbdb78aea43eabd4fc0ec68f53b9f681cd6181b1c2ee09a01f90e024f75d44302eefdd9d3888512ec4fe672125eec3c79fe691d0f66dacde7bce SHA512 d936e70e6daa6a7494e5cc333a53afe82b601e34e2e54b207d9a4aefdc35dd068997832be750a6857144a48fa37065cb7e6b25378952007b06988ad07dfc6006 +EBUILD gvfs-1.42.2.ebuild 3885 BLAKE2B ee95e9a9667b1bc767bfabb200d566d8f8a31082c26b08c9a305b9677602223efc7ade9f18e7b7a3ae65799735fa4194ee48ba651b6cf1a5fa187494e74aa335 SHA512 93439634631eb7cb3bb0c8685abe4833790e4447f28443566c1aabd3339edfe3a68af8c0d84f74d818887a23488dc6b14cd1b09c73580eb3e564c3ba3a56a959 +EBUILD gvfs-1.44.1.ebuild 3798 BLAKE2B 8865b820a6b7c23c4c11fce62d1ef0bff769e8f7abc5925c576c1ce3a53fe334b7fd912ab11c42b20ce0bcbf3bc43514cee3dcdc489653a446a0a32a0f6b29a6 SHA512 53f68c2c6bb655eb4bc06c5b8129697f9239812206409a90e87e588b55d59a3e225b7033a60abc9372dc24481bff55e9d74bcaea340fe02508dee843fb8c5ae4 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/files/libplist-2.2.patch b/gnome-base/gvfs/files/libplist-2.2.patch new file mode 100644 index 000000000000..72634b58b69f --- /dev/null +++ b/gnome-base/gvfs/files/libplist-2.2.patch @@ -0,0 +1,30 @@ +From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 16 Jun 2020 13:28:35 +0200 +Subject: [PATCH] afc: Add support for libplist-2.2 + +Which changed name from libplist to libplist-2.0 to embed its API +version number in the library name. +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1750f65c..187bfd55 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind) + enable_afc = get_option('afc') + if enable_afc + libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2') +- libplist_dep = dependency('libplist', version: '>= 0.15') ++ libplist_dep = dependency('libplist-2.0', required: false) ++ if not libplist_dep.found() ++ libplist_dep = dependency('libplist', version: '>= 0.15') ++ endif + endif + + # *** Check if we should build with GOA volume monitor *** +-- +2.20.1 + diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild index 9d564417391f..799db1bc3d99 100644 --- a/gnome-base/gvfs/gvfs-1.42.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild @@ -76,6 +76,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}"/patches + "${FILESDIR}"/libplist-2.2.patch ) src_configure() { diff --git a/gnome-base/gvfs/gvfs-1.44.1.ebuild b/gnome-base/gvfs/gvfs-1.44.1.ebuild new file mode 100644 index 000000000000..b7efa067dcc3 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.44.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson systemd xdg + +DESCRIPTION="Virtual filesystem implementation for GIO" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +RESTRICT="!test? ( test )" +# elogind/systemd only relevant to udisks (in v1.38.1) +REQUIRED_USE=" + ?? ( elogind systemd ) + cdda? ( udev ) + google? ( gnome-online-accounts ) + gphoto2? ( udev ) + mtp? ( udev ) + udisks? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.57.2:2 + >=gnome-base/gsettings-desktop-schemas-3.33.0 + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + sys-apps/dbus + app-crypt/gcr:= + policykit? ( + >=sys-auth/polkit-0.114 + sys-libs/libcap ) + http? ( + dev-libs/libxml2:2 + >=net-libs/libsoup-2.58.0:2.4 ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + udev? ( >=dev-libs/libgudev-147:= ) + fuse? ( >=sys-fs/fuse-3.0.0:3 ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + systemd? ( >=sys-apps/systemd-206:0= ) + elogind? ( >=sys-auth/elogind-229:0= ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) + gnome-keyring? ( app-crypt/libsecret ) + bluray? ( media-libs/libbluray:= ) + mtp? ( + >=dev-libs/libusb-1.0.21 + >=media-libs/libmtp-1.1.15 ) + samba? ( >=net-fs/samba-4[client] ) + archive? ( app-arch/libarchive:= ) + cdda? ( + dev-libs/libcdio:0= + >=dev-libs/libcdio-paranoia-0.78.2 ) + google? ( >=dev-libs/libgdata-0.17.11:=[crypt,gnome-online-accounts] ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + net-misc/openssh +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/meson-0.49 + dev-util/glib-utils + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-util/gdbus-codegen +" + +PATCHES=( + "${FILESDIR}"/libplist-2.2.patch +) + +src_configure() { + local enable_logind="false" + if use systemd || use elogind; then + enable_logind="true" + fi + + local enable_gcrypt="false" + if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes + enable_gcrypt="true" + fi + + local enable_libusb="false" + if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes + enable_libusb="true" + fi + + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(meson_use policykit admin) + $(meson_use ios afc) + $(meson_use afp) + $(meson_use archive) + $(meson_use cdda) + $(meson_use zeroconf dnssd) + $(meson_use gnome-online-accounts goa) + $(meson_use google) + $(meson_use gphoto2) + $(meson_use http) + $(meson_use mtp) + $(meson_use nfs) + -Dsftp=true + $(meson_use samba smb) + $(meson_use udisks udisks2) + $(meson_use bluray) + $(meson_use fuse) + -Dgcr=true + -Dgcrypt=${enable_gcrypt} + $(meson_use udev gudev) + $(meson_use gnome-keyring keyring) + -Dlogind=${enable_logind} + -Dlibusb=${enable_libusb} + -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 + -Dinstalled_tests=false + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + gnome2_giomodule_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + gnome2_giomodule_cache_update +} -- cgit v1.2.3