* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2020-01-11 20:01 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-01-11 20:01 UTC (permalink / raw
To: gentoo-commits
commit: b4cb80b8eae65263ead65a95d8907ee47fdc3d25
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 19:50:06 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 20:01:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cb80b8
gnome-base/gvfs: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/Manifest | 2 -
gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch | 21 ----
gnome-base/gvfs/gvfs-1.32.2.ebuild | 135 ----------------------
3 files changed, 158 deletions(-)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index f57bd2ca2bb..d861872e052 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1 @@
-DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
-DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
deleted file mode 100644
index b2d2a91f5a7..00000000000
--- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=776532
-https://bugs.gentoo.org/580234
-
---- a/metadata/meta-daemon.c
-+++ b/metadata/meta-daemon.c
-@@ -27,6 +27,7 @@
- #include <glib/gstdio.h>
- #include <locale.h>
- #include <stdlib.h>
-+#include <sys/sysmacros.h>
- #include "metatree.h"
- #include "gvfsdaemonprotocol.h"
- #include "metadata-dbus.h"
---- a/metadata/metatree.c
-+++ b/metadata/metatree.c
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
deleted file mode 100644
index 627cbbe441e..00000000000
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
- cdda? ( udev )
- elogind? ( !systemd udisks )
- google? ( gnome-online-accounts )
- mtp? ( udev )
- udisks? ( udev )
- systemd? ( !elogind udisks )
-"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
- app-crypt/gcr:=
- >=dev-libs/glib-2.51:2
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- elogind? ( >=sys-auth/elogind-229:0= )
- fuse? ( >=sys-fs/fuse-2.8.0:0 )
- gnome-keyring? ( app-crypt/libsecret )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
- google? (
- >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
- >=net-libs/gnome-online-accounts-3.17.1:= )
- gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-2.42:2.4 )
- ios? (
- >=app-pda/libimobiledevice-1.2:=
- >=app-pda/libplist-1:= )
- mtp? (
- >=dev-libs/libusb-1.0.21
- >=media-libs/libmtp-1.1.12 )
- nfs? ( >=net-fs/libnfs-1.9.8 )
- policykit? (
- sys-auth/polkit
- sys-libs/libcap )
- samba? ( >=net-fs/samba-4[client] )
- systemd? ( >=sys-apps/systemd-206:0= )
- udev? (
- cdda? ( dev-libs/libcdio-paranoia )
- >=dev-libs/libgudev-147:=
- virtual/libudev:= )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/gtk-doc-am
- test? (
- >=dev-python/twisted-16
- || (
- net-analyzer/netcat
- net-analyzer/netcat6 ) )
- !udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
- "${WORKDIR}"/patches/ #599482, 641522, gnome-3-24 backports
- "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- # --disable-obexftp, upstream bug #729945
- gnome2_src_configure \
- --disable-gdu \
- --enable-documentation \
- --enable-gcr \
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- $(use_enable afp) \
- $(use_enable archive) \
- $(use_enable bluray) \
- $(use_enable cdda) \
- $(use_enable elogind libelogind) \
- $(use_enable fuse) \
- $(use_enable gnome-keyring keyring) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable google) \
- $(use_enable gphoto2) \
- $(use_enable gtk) \
- $(use_enable http) \
- $(use_enable ios afc) \
- $(use_enable mtp libmtp) \
- $(use_enable mtp libusb) \
- $(use_enable nfs) \
- $(use_enable policykit admin) \
- $(use_enable samba) \
- $(use_enable systemd libsystemd-login) \
- $(use_enable udev gudev) \
- $(use_enable udev) \
- $(use_enable udisks udisks2) \
- $(use_enable zeroconf avahi)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2022-05-31 18:52 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-05-31 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 96adb37528fcb695210522f8bcd68d3bab61a9a1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 18:49:22 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 31 18:52:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96adb375
Revert "gnome-base/gvfs: Drop old versions"
This reverts commit 22102a2cce8afe3af433ecf3bd417693ace4c427.
dev-libs/totem-pl-parser needs gvfs[http], which is masked on versions
1.50+ due to the libsoup:3 dependency.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/gvfs/Manifest | 2 +
gnome-base/gvfs/files/meson-0.61.patch | 33 +++++++
gnome-base/gvfs/gvfs-1.48.1-r1.ebuild | 152 +++++++++++++++++++++++++++++++++
gnome-base/gvfs/gvfs-1.50.0.ebuild | 149 ++++++++++++++++++++++++++++++++
4 files changed, 336 insertions(+)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 9d1a834d621a..1bd1661714df 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,2 +1,4 @@
+DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
+DIST gvfs-1.50.0.tar.xz 1213456 BLAKE2B a560794677693f449fd71f314d18a8ad8bb38ce6ac6eb312d020fd4ed2b55c9e1939cecc993869b3f489c0ebddfa057bf76af04e6c6f700323dc7b99fa052af1 SHA512 6eea3c59b239fe9674a83db4e182c0ea2ab7d56e29f5d5c4a7af9cb3cb0fd9222721796754f2f502291049c158e8bd3771cbc5262d10bfa684c207cb3281dcce
DIST gvfs-1.50.1.tar.xz 1214536 BLAKE2B 678c89d08255e577afb3a4999cef341fc5449c5ab615c5e089b14cbd2d0a882830dff71af6ab7a978d8b23a3aaeea197badd21d8c4e702588e626f3b4d917c55 SHA512 7a1ea47658dbd74673e1aea7c344d3f9e8a26fab844a26220cedcb19da6b4a0cac6b369d2b5107f649d6e7b2331894c89df04c6dce3630be4b289e23f56127a5
DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch
new file mode 100644
index 000000000000..20e03388d7c6
--- /dev/null
+++ b/gnome-base/gvfs/files/meson-0.61.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831840
+https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133
+
+From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 21 Jan 2022 08:32:31 +0100
+Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+
+Related: https://github.com/mesonbuild/meson/issues/9441
+Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
+(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0)
+---
+ daemon/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index dffeef3e..bdc506fe 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+2.34.1
+
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
new file mode 100644
index 000000000000..38deee759bc2
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.65.1: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
+ virtual/tmpfiles
+ )
+ 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? (
+ virtual/libusb:1
+ >=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.18.0:=[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/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
+ test? ( dev-libs/libgdata )
+"
+
+PATCHES=(
+ "${FILESDIR}/meson-0.61.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() {
+ if use fuse; then
+ tmpfiles_process gvfsd-fuse-tmpfiles.conf
+ fi
+
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/gvfs/gvfs-1.50.0.ebuild b/gnome-base/gvfs/gvfs-1.50.0.ebuild
new file mode 100644
index 000000000000..61a64ed1d03f
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.50.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.70.0: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-3.0.0:3.0
+ )
+ zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+ udev? ( >=dev-libs/libgudev-147:= )
+ fuse? (
+ >=sys-fs/fuse-3.0.0:3
+ virtual/tmpfiles
+ )
+ 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? (
+ virtual/libusb:1
+ >=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.18.0:=[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/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
+ test? ( dev-libs/libgdata )
+"
+
+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
+ -Dprivileged_group=wheel
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ if use fuse; then
+ tmpfiles_process gvfsd-fuse-tmpfiles.conf
+ fi
+
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2020-07-18 10:57 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-07-18 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 2ca507c7d233cf27beab30e1bcf626026288203e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 10:40:23 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 10:57:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca507c7
gnome-base/gvfs: fix compatibility with libplist-2.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/files/libplist-2.2.patch | 30 ++++++++++++++++++++++++++++++
gnome-base/gvfs/gvfs-1.42.2.ebuild | 1 +
2 files changed, 31 insertions(+)
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 00000000000..72634b58b69
--- /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 <hadess@hadess.net>
+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 9d564417391..799db1bc3d9 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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2019-07-23 18:34 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-07-23 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 885e8c1e16f17802d657b7c0079aaa4bc18d01e3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 18:20:20 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 18:20:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885e8c1e
gnome-base/gvfs: security bump to 1.38.3
Bug: https://bugs.gentoo.org/690144
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/Manifest | 1 +
.../gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 ++++++
gnome-base/gvfs/gvfs-1.38.3.ebuild | 136 +++++++++++++++++++++
3 files changed, 172 insertions(+)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index cdb6a298c3c..54e8010399d 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,4 @@
DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
DIST gvfs-1.38.2.tar.xz 1202808 BLAKE2B 31150c10e042b262a55f4a072496138f47532ec55c2cae564d7c1a7a06b043bf131a91a633757fc02a0a31fc052a6ae64bd25d357cf60efa10b9490c6d1a9d84 SHA512 b6982f2c23cae057aebd00dab52b4f21f8bcef79fc5e97c098d54a9ebf997913f53146bd1760065454198c94a66f1bc1fc5325b08fea10e63a755fad87321488
+DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch
new file mode 100644
index 00000000000..f3fe513d06e
--- /dev/null
+++ b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch
@@ -0,0 +1,35 @@
+From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Thu, 18 Jul 2019 03:38:41 -0500
+Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
+
+On Slackware development branch with gvfs-1.40.2, I just noticed this:
+ # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
+ libgvfscommon.so => not found
+
+After some backtracking, it seems that this first occurred in the
+switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
+
+Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
+assistance with troubleshooting this.
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ daemon/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index 7f2608bd..0006f35e 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
+ dependencies: deps,
+ c_args: cflags,
+ install: true,
++ install_rpath: gvfs_rpath,
+ install_dir: gvfs_pkglibdir
+ )
+
+--
+2.20.1
+
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
new file mode 100644
index 00000000000..4daf8b8ab96
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.38.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+# 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.57.2:2
+ 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.42.0:2.4 )
+ zeroconf? ( >=net-dns/avahi-0.6 )
+ udev? ( >=virtual/libgudev-147:= )
+ fuse? ( >=sys-fs/fuse-2.8.0:0 )
+ 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.9:=[crypt,gnome-online-accounts] )
+ gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+ nfs? ( >=net-fs/libnfs-1.9.8 )
+ net-misc/openssh
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.4
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+"
+
+PATCHES=(
+ # from gnome-3-30 branch, fixes RPATH of libgvfsdaemon.so
+ "${FILESDIR}"/${PV}-gvfsdaemon-rpath.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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2015-12-30 10:24 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-12-30 10:24 UTC (permalink / raw
To: gentoo-commits
commit: b2b44f7083b4ef85fe581f522eba2501f9d68e85
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 10:18:41 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 10:24:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b44f70
gnome-base/gvfs: Drop old
Package-Manager: portage-2.2.26
gnome-base/gvfs/Manifest | 1 -
.../gvfs/files/gvfs-1.22.4-fix-parallel.patch | 25 -----
gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch | 54 ---------
gnome-base/gvfs/gvfs-1.22.4.ebuild | 124 ---------------------
gnome-base/gvfs/gvfs-1.24.2.ebuild | 121 --------------------
5 files changed, 325 deletions(-)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index a8e682e..1f559a5 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,2 @@
-DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c
DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f
DIST gvfs-1.26.2.tar.xz 1680404 SHA256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 SHA512 0745b850d476311c5d1de357f902ff0c18f34be05fc2d047e1435b2ca3732ce6e2f95f9bd41ce100ed590939c45c6f7dcf8274799c7b552d80f56af7919df110 WHIRLPOOL 86116ac7878252e9078c1215198787a96c987e0ac0ef5e06bda24938ec142f7f073755bfa5409aee208ba516a6c36698798a4772d214c9897cbece0d50b6defb
diff --git a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch b/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
deleted file mode 100644
index 9e2ed66..0000000
--- a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 62c4c2af399dba0566ae69353f127472fa3e3364 Mon Sep 17 00:00:00 2001
-From: Ross Lagerwall <rosslagerwall@gmail.com>
-Date: Mon, 16 Mar 2015 00:06:07 +0000
-Subject: completion: Fix parallel installation
-
-Use install-data-hook rather than install-data-local as
-install-data-hook runs after the other install rules have run. This is
-important for a parallel install so that the destination directory
-already exists when the symlinks are created.
-
-diff --git a/programs/completion/Makefile.am b/programs/completion/Makefile.am
-index 06833e5..971e4ee 100644
---- a/programs/completion/Makefile.am
-+++ b/programs/completion/Makefile.am
-@@ -35,6 +35,6 @@ uninstall-symlinks:
- rm -f $(DESTDIR)$(BASHCOMP_DIR)/$$file; \
- done
-
--install-data-local: install-symlinks
-+install-data-hook: install-symlinks
-
- uninstall-local: uninstall-symlinks
---
-cgit v0.10.2
-
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
deleted file mode 100644
index 09b822f..0000000
--- a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d663c85f0356d7800638c5eaa1a49e6c26bdfa33 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Fri, 27 Feb 2015 10:22:22 +0100
-Subject: afp: Change g_error to g_warning for read errors
-
-Use g_warning rather than g_error when a read error occurs to prevent
-spurious crash reports since there are many different ways for a read
-from the network to fail.
-
-[Cherry-picked from gnome-3-14/14369db2a8fc
- Commit message written by Ross Lagerwall.]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710490
----
- daemon/gvfsafpconnection.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c
-index c8ccad7..abe1422 100644
---- a/daemon/gvfsafpconnection.c
-+++ b/daemon/gvfsafpconnection.c
-@@ -1078,12 +1078,12 @@ read_data_cb (GObject *object, GAsyncResult *res, gpointer user_data)
- g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
- {
- g_message (_("Host closed connection"));
-- exit(0);
- }
- else
- {
-- g_error ("FAIL!!! \"%s\"\n", err->message);
-+ g_warning ("FAIL!!! \"%s\"\n", err->message);
- }
-+ exit (0);
- }
-
- dispatch_reply (afp_connection);
-@@ -1120,12 +1120,12 @@ read_dsi_header_cb (GObject *object, GAsyncResult *res, gpointer user_data)
- g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
- {
- g_message (_("Host closed connection"));
-- exit(0);
- }
- else
- {
-- g_error ("FAIL!!! \"%s\"\n", err->message);
-+ g_warning ("FAIL!!! \"%s\"\n", err->message);
- }
-+ exit (0);
- }
-
- dsi_header = &priv->read_dsi_header;
---
-cgit v0.11.2
-
diff --git a/gnome-base/gvfs/gvfs-1.22.4.ebuild b/gnome-base/gvfs/gvfs-1.22.4.ebuild
deleted file mode 100644
index b59111e..0000000
--- a/gnome-base/gvfs/gvfs-1.22.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
- cdda? ( udev )
- mtp? ( udev )
- udisks? ( udev )
- systemd? ( udisks )
-"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
- >=dev-libs/glib-2.37:2
- sys-apps/dbus
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-2.42:2.4 )
- ios? (
- >=app-pda/libimobiledevice-1.1.5:=
- >=app-pda/libplist-1:= )
- libsecret? ( app-crypt/libsecret )
- mtp? ( >=media-libs/libmtp-1.1.6 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
- systemd? ( sys-apps/systemd:0= )
- udev? (
- cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
- virtual/libgudev:=
- virtual/libudev:= )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- test? (
- >=dev-python/twisted-core-12.3.0
- || (
- net-analyzer/netcat
- net-analyzer/netcat6 ) )
- !udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
-
- # Uncomment when eautoreconf stops being needed always
- #eautoreconf
- fi
-
- # Fix parallel installation, bug #543812 (from 'master')
- epatch "${FILESDIR}/${PN}-1.22.4-fix-parallel.patch"
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- # --disable-obexftp, upstream bug #729945
- gnome2_src_configure \
- --enable-bash-completion \
- --with-bash-completion-dir="$(get_bashcompdir)" \
- --disable-gdu \
- --disable-hal \
- --disable-obexftp \
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
- --enable-documentation \
- $(use_enable afp) \
- $(use_enable archive) \
- $(use_enable bluray) \
- $(use_enable cdda) \
- $(use_enable fuse) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gphoto2) \
- $(use_enable gtk) \
- $(use_enable ios afc) \
- $(use_enable mtp libmtp) \
- $(use_enable udev) \
- $(use_enable udev gudev) \
- $(use_enable http) \
- $(use_enable libsecret keyring) \
- $(use_enable samba) \
- $(use_enable systemd libsystemd-login) \
- $(use_enable udisks udisks2) \
- $(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.24.2.ebuild b/gnome-base/gvfs/gvfs-1.24.2.ebuild
deleted file mode 100644
index fc38b08..0000000
--- a/gnome-base/gvfs/gvfs-1.24.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
- cdda? ( udev )
- mtp? ( udev )
- udisks? ( udev )
- systemd? ( udisks )
-"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
- >=dev-libs/glib-2.43.2:2
- sys-apps/dbus
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-2.42:2.4 )
- ios? (
- >=app-pda/libimobiledevice-1.1.5:=
- >=app-pda/libplist-1:= )
- libsecret? ( app-crypt/libsecret )
- mtp? ( >=media-libs/libmtp-1.1.6 )
- nfs? ( >=net-fs/libnfs-1.9.7 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
- systemd? ( sys-apps/systemd:0= )
- udev? (
- cdda? ( dev-libs/libcdio-paranoia )
- virtual/libgudev:=
- virtual/libudev:= )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- test? (
- >=dev-python/twisted-core-12.3.0
- || (
- net-analyzer/netcat
- net-analyzer/netcat6 ) )
- !udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
-
- # Uncomment when eautoreconf stops being needed always
- eautoreconf
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- # --disable-obexftp, upstream bug #729945
- gnome2_src_configure \
- --enable-bash-completion \
- --with-bash-completion-dir="$(get_bashcompdir)" \
- --disable-gdu \
- --disable-hal \
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
- --enable-documentation \
- $(use_enable afp) \
- $(use_enable archive) \
- $(use_enable bluray) \
- $(use_enable cdda) \
- $(use_enable fuse) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gphoto2) \
- $(use_enable gtk) \
- $(use_enable ios afc) \
- $(use_enable mtp libmtp) \
- $(use_enable nfs) \
- $(use_enable udev) \
- $(use_enable udev gudev) \
- $(use_enable http) \
- $(use_enable libsecret keyring) \
- $(use_enable samba) \
- $(use_enable systemd libsystemd-login) \
- $(use_enable udisks udisks2) \
- $(use_enable zeroconf avahi)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/
@ 2015-10-24 8:05 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-10-24 8:05 UTC (permalink / raw
To: gentoo-commits
commit: fe2cd112b93977fb9adc01346de0b4d26c76572d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 08:05:00 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 08:05:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2cd112
gnome-base/gvfs: Apply upstream fixes, also including a fix for crash reported in bug #560592 (by Michael Orlitzky); drop old.
Package-Manager: portage-2.2.23
gnome-base/gvfs/Manifest | 2 -
.../gvfs/files/gvfs-1.24.2-crash-monitor.patch | 33 ++++++
gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch | 54 ++++++++++
.../gvfs/files/gvfs-1.24.2-guard-caches.patch | 56 ++++++++++
.../gvfs/files/gvfs-1.24.2-remote-proxy.patch | 74 +++++++++++++
.../gvfs/files/gvfs-1.24.2-untrashable.patch | 28 +++++
gnome-base/gvfs/gvfs-1.22.3.ebuild | 119 ---------------------
.../{gvfs-1.24.1.ebuild => gvfs-1.24.2-r1.ebuild} | 18 +++-
8 files changed, 260 insertions(+), 124 deletions(-)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5139869..f2af856 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,2 @@
-DIST gvfs-1.22.3.tar.xz 1588072 SHA256 c778342e09a84d8c69b1b7ce7f943f6f2444a995bb0c0754ef1746afa8935182 SHA512 17e79047ce8f979ae15c99423ddc6d50a1d276151d4c0e1cc7e0c4958e0a9ed8bc4c0db8a38272eab50922bad6a51d915a2cd4cf41dfb0873faa49e1a3028ba7 WHIRLPOOL 2de23d3537683fcdb0af2fac42c98e05daf9cf4f5fb0d9e05dfa7b25e03852f2774ba1a1cfbebbd0602bbbbcbdbe36279dd9de6328fb3f495e2209c246b8a70a
DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c
-DIST gvfs-1.24.1.tar.xz 1624212 SHA256 d38367ce189415c36fd19dca478bc9b80694b495c3458e74fb0f13d1ac9df1f9 SHA512 f4208e38a7a6a9c7c994bde62d6499e9eb327c7b85dd6bec46e22aa5c3423214eb5ff2092c7cc3945e28c7a7d2c1bcb5cc9e29df67c9b601fbf9e7b9092de95f WHIRLPOOL 96f178f91502165fc3f3b5ea800a2cbaa88baad6f692017745fbd6cb81f3c1ad405a0d342641a9a94c567400bfcdf061cd4aa6bac76c29106f5cd30f79b0021e
DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch b/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch
new file mode 100644
index 0000000..0e8c49a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-crash-monitor.patch
@@ -0,0 +1,33 @@
+From c259305847b1ebde1ae89a3c921a13b6c0b67116 Mon Sep 17 00:00:00 2001
+From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
+Date: Tue, 6 Oct 2015 15:09:04 +0900
+Subject: Avoid crash when no monitor implementations exist.
+
+The GVariantBuilder is unable to create any GVariant for
+an untyped array - while an empty vector is a valid variant,
+it is not valid for an untyped array.
+
+Passing the resulting null to gvfs_dbus_daemon_complete_cancel()
+causes gvfs to abort with a g_error().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756105
+---
+ daemon/gvfsdaemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
+index 7bc334b..b7a3b88 100644
+--- a/daemon/gvfsdaemon.c
++++ b/daemon/gvfsdaemon.c
+@@ -957,7 +957,7 @@ handle_list_monitor_implementations (GVfsDBusDaemon *object,
+
+ impls = g_vfs_list_monitor_implementations ();
+
+- g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ssbia{sv})"));
+
+ for (l = impls; l != NULL; l = l->next)
+ {
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
new file mode 100644
index 0000000..09b822f
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch
@@ -0,0 +1,54 @@
+From d663c85f0356d7800638c5eaa1a49e6c26bdfa33 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 27 Feb 2015 10:22:22 +0100
+Subject: afp: Change g_error to g_warning for read errors
+
+Use g_warning rather than g_error when a read error occurs to prevent
+spurious crash reports since there are many different ways for a read
+from the network to fail.
+
+[Cherry-picked from gnome-3-14/14369db2a8fc
+ Commit message written by Ross Lagerwall.]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710490
+---
+ daemon/gvfsafpconnection.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c
+index c8ccad7..abe1422 100644
+--- a/daemon/gvfsafpconnection.c
++++ b/daemon/gvfsafpconnection.c
+@@ -1078,12 +1078,12 @@ read_data_cb (GObject *object, GAsyncResult *res, gpointer user_data)
+ g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
+ {
+ g_message (_("Host closed connection"));
+- exit(0);
+ }
+ else
+ {
+- g_error ("FAIL!!! \"%s\"\n", err->message);
++ g_warning ("FAIL!!! \"%s\"\n", err->message);
+ }
++ exit (0);
+ }
+
+ dispatch_reply (afp_connection);
+@@ -1120,12 +1120,12 @@ read_dsi_header_cb (GObject *object, GAsyncResult *res, gpointer user_data)
+ g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED))
+ {
+ g_message (_("Host closed connection"));
+- exit(0);
+ }
+ else
+ {
+- g_error ("FAIL!!! \"%s\"\n", err->message);
++ g_warning ("FAIL!!! \"%s\"\n", err->message);
+ }
++ exit (0);
+ }
+
+ dsi_header = &priv->read_dsi_header;
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch b/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch
new file mode 100644
index 0000000..4bf90ad
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-guard-caches.patch
@@ -0,0 +1,56 @@
+From 1220260f96a9ce2beb659da30888ea9648719e9a Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Wed, 30 Sep 2015 12:38:55 +0200
+Subject: proxy volume monitor: Guard access to the internal caches
+
+Accesses to the drives, volumes and mounts hash tables should be
+guarded by the proxy_vm mutex.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755805
+---
+ monitor/proxy/gproxyvolumemonitor.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 623cb14..17474a8 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -867,6 +867,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor)
+ GProxyVolume *volume;
+ GProxyMount *mount;
+
++ G_LOCK (proxy_vm);
++
+ seed_monitor (monitor);
+
+ /* emit signals for all the drives/volumes/mounts "added" */
+@@ -881,6 +883,8 @@ name_owner_appeared (GProxyVolumeMonitor *monitor)
+ g_hash_table_iter_init (&hash_iter, monitor->mounts);
+ while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount))
+ signal_emit_in_idle (monitor, "mount-added", mount);
++
++ G_UNLOCK (proxy_vm);
+ }
+
+ static void
+@@ -891,6 +895,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor)
+ GProxyVolume *volume;
+ GProxyMount *mount;
+
++ G_LOCK (proxy_vm);
++
+ g_hash_table_iter_init (&hash_iter, monitor->mounts);
+ while (g_hash_table_iter_next (&hash_iter, NULL, (gpointer) &mount))
+ {
+@@ -914,6 +920,8 @@ name_owner_vanished (GProxyVolumeMonitor *monitor)
+ signal_emit_in_idle (monitor, "drive-disconnected", drive);
+ }
+ g_hash_table_remove_all (monitor->drives);
++
++ G_UNLOCK (proxy_vm);
+ }
+
+ static void
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch b/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch
new file mode 100644
index 0000000..bc47a1a
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-remote-proxy.patch
@@ -0,0 +1,74 @@
+From d19a4bc2475705f8252f8952c446b57b31661453 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 16 Oct 2015 13:35:34 +0200
+Subject: proxy volume monitor: Properly handle failure to create a remote
+ proxy
+
+We should finish constructing the innards of the object and not leave
+it in an inconsistent state when we hit an error. The other option
+would be to litter the rest of the code with NULL checks, but that
+would be ugly and prone to errors.
+
+We should also ensure that the reference counting stays consistent with
+the non-error paths.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755805
+---
+ monitor/proxy/gproxyvolumemonitor.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
+index 17474a8..a7466f0 100644
+--- a/monitor/proxy/gproxyvolumemonitor.c
++++ b/monitor/proxy/gproxyvolumemonitor.c
+@@ -972,10 +972,7 @@ g_proxy_volume_monitor_constructor (GType type,
+ klass = G_PROXY_VOLUME_MONITOR_CLASS (g_type_class_peek (type));
+ object = g_hash_table_lookup (the_volume_monitors, (gpointer) type);
+ if (object != NULL)
+- {
+- g_object_ref (object);
+- goto out;
+- }
++ goto out;
+
+ dbus_name = klass->dbus_name;
+
+@@ -988,6 +985,10 @@ g_proxy_volume_monitor_constructor (GType type,
+
+ monitor = G_PROXY_VOLUME_MONITOR (object);
+
++ monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++ monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++ monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
++
+ error = NULL;
+ monitor->proxy = gvfs_remote_volume_monitor_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -1022,10 +1023,6 @@ g_proxy_volume_monitor_constructor (GType type,
+ g_signal_connect (monitor->proxy, "volume-changed", G_CALLBACK (volume_changed), monitor);
+ g_signal_connect (monitor->proxy, "volume-removed", G_CALLBACK (volume_removed), monitor);
+
+- monitor->drives = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+- monitor->volumes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+- monitor->mounts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+-
+ /* listen to when the owner of the service appears/disappears */
+ g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
+ /* initially seed drives/volumes/mounts if we have an owner */
+@@ -1038,12 +1035,12 @@ g_proxy_volume_monitor_constructor (GType type,
+
+ g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
+
++ out:
+ /* Take an extra reference to make the instance live forever - see also
+ * the dispose() and finalize() vfuncs
+ */
+ g_object_ref (object);
+
+- out:
+ G_UNLOCK (proxy_vm);
+ return object;
+ }
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch b/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch
new file mode 100644
index 0000000..69a7629
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.24.2-untrashable.patch
@@ -0,0 +1,28 @@
+From 7bcfc873fd54e565836228ab030782885e133ebb Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 21 Aug 2015 16:54:46 +0200
+Subject: dav: Mark files as untrashable
+
+Otherwise nautilus will offer the wrong action in its UI.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=753934
+---
+ daemon/gvfsbackenddav.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
+index 2d2704a..94e8b1c 100644
+--- a/daemon/gvfsbackenddav.c
++++ b/daemon/gvfsbackenddav.c
+@@ -974,6 +974,8 @@ ms_response_to_file_info (MsResponse *response,
+ if (basename && basename[0] == '.')
+ g_file_info_set_is_hidden (info, TRUE);
+
++ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE);
++
+ file_type = G_FILE_TYPE_REGULAR;
+ mime_type = NULL;
+
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gvfs/gvfs-1.22.3.ebuild b/gnome-base/gvfs/gvfs-1.22.3.ebuild
deleted file mode 100644
index 7189d4f..0000000
--- a/gnome-base/gvfs/gvfs-1.22.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://git.gnome.org/browse/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
- cdda? ( udev )
- mtp? ( udev )
- udisks? ( udev )
- systemd? ( udisks )
-"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND="
- >=dev-libs/glib-2.37:2
- sys-apps/dbus
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-2.42:2.4 )
- ios? (
- >=app-pda/libimobiledevice-1.1.5:=
- >=app-pda/libplist-1:= )
- libsecret? ( app-crypt/libsecret )
- mtp? ( >=media-libs/libmtp-1.1.6 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
- systemd? ( sys-apps/systemd:0= )
- udev? (
- cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
- virtual/libgudev:=
- virtual/libudev:= )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- test? (
- >=dev-python/twisted-core-12.3.0
- || (
- net-analyzer/netcat
- net-analyzer/netcat6 ) )
- !udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
-
- eautoreconf
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- # --disable-obexftp, upstream bug #729945
- gnome2_src_configure \
- --enable-bash-completion \
- --with-bash-completion-dir="$(get_bashcompdir)" \
- --disable-gdu \
- --disable-hal \
- --disable-obexftp \
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
- --enable-documentation \
- $(use_enable afp) \
- $(use_enable archive) \
- $(use_enable bluray) \
- $(use_enable cdda) \
- $(use_enable fuse) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gphoto2) \
- $(use_enable gtk) \
- $(use_enable ios afc) \
- $(use_enable mtp libmtp) \
- $(use_enable udev) \
- $(use_enable udev gudev) \
- $(use_enable http) \
- $(use_enable libsecret keyring) \
- $(use_enable samba) \
- $(use_enable systemd libsystemd-login) \
- $(use_enable udisks udisks2) \
- $(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.24.1.ebuild b/gnome-base/gvfs/gvfs-1.24.2-r1.ebuild
similarity index 81%
rename from gnome-base/gvfs/gvfs-1.24.1.ebuild
rename to gnome-base/gvfs/gvfs-1.24.2-r1.ebuild
index ec36f94..99d12d8 100644
--- a/gnome-base/gvfs/gvfs-1.24.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.24.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
+IUSE="afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
REQUIRED_USE="
cdda? ( udev )
mtp? ( udev )
@@ -33,6 +33,7 @@ RDEPEND="
archive? ( app-arch/libarchive:= )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
+ gnome-keyring? ( app-crypt/libsecret )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
@@ -40,7 +41,6 @@ RDEPEND="
ios? (
>=app-pda/libimobiledevice-1.1.5:=
>=app-pda/libplist-1:= )
- libsecret? ( app-crypt/libsecret )
mtp? ( >=media-libs/libmtp-1.1.6 )
nfs? ( >=net-fs/libnfs-1.9.7 )
samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
@@ -76,6 +76,18 @@ RESTRICT="test"
src_prepare() {
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+ # dav: Mark files as untrashable (from '3.16' branch)
+ epatch "${FILESDIR}"/${P}-untrashable.patch
+
+ # proxy volume monitor: Guard access to the internal caches (from '3.16' branch)
+ epatch "${FILESDIR}"/${P}-guard-caches.patch
+
+ # proxy volume monitor: Properly handle failure to create a remote proxy (from '3.16' branch)
+ epatch "${FILESDIR}"/${P}-remote-proxy.patch
+
+ # Avoid crash when no monitor implementations exist (from '3.16' branch)
+ epatch "${FILESDIR}"/${P}-crash-monitor.patch
+
if ! use udev; then
sed -e 's/gvfsd-burn/ /' \
-e 's/burn.mount.in/ /' \
@@ -104,6 +116,7 @@ src_configure() {
$(use_enable bluray) \
$(use_enable cdda) \
$(use_enable fuse) \
+ $(use_enable gnome-keyring keyring) \
$(use_enable gnome-online-accounts goa) \
$(use_enable gphoto2) \
$(use_enable gtk) \
@@ -113,7 +126,6 @@ src_configure() {
$(use_enable udev) \
$(use_enable udev gudev) \
$(use_enable http) \
- $(use_enable libsecret keyring) \
$(use_enable samba) \
$(use_enable systemd libsystemd-login) \
$(use_enable udisks udisks2) \
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-31 18:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-11 20:01 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/, gnome-base/gvfs/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-05-31 18:52 Matt Turner
2020-07-18 10:57 Mart Raudsepp
2019-07-23 18:34 Mart Raudsepp
2015-12-30 10:24 Pacho Ramos
2015-10-24 8:05 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox