Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c0d24b16e3328f7bd2f7d75462529fcfb9e9470c
commit c0d24b16e3328f7bd2f7d75462529fcfb9e9470c Author: Baste <[email protected]> Date: Tue Oct 13 11:52:30 2015 +0200 gvfs-1.26.1-1-x86_64 - 1.26.0 -> 1.26.1 diff --git a/source/xapps/gvfs/FrugalBuild b/source/xapps/gvfs/FrugalBuild index f77ae7a..c92e362 100644 --- a/source/xapps/gvfs/FrugalBuild +++ b/source/xapps/gvfs/FrugalBuild @@ -4,10 +4,8 @@ USE_DEBUG=${USE_DEBUG:-"n"} -options+=('asneeded') - pkgname=gvfs -pkgver=1.26.0 +pkgver=1.26.1 pkgrel=1 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/"; @@ -24,8 +22,7 @@ _F_gnome_glib="y" _F_gnome_devel="n" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet -#source=($source tmpfilesd.patch) -sha1sums=('88e47b1ca2d87d97716c8410f220dd94c5a6821c') +sha1sums=('4e9675388ec28e22916dd273d6a83416161b1a56') subpkgs=("${subpkgs[@]}" "gvfs-apple") subdescs=("${subdescs[@]}" "gvfs with iPhone and iPod touch support") diff --git a/source/xapps/gvfs/gvfs-libsoup.diff b/source/xapps/gvfs/gvfs-libsoup.diff deleted file mode 100644 index 5437816..0000000 --- a/source/xapps/gvfs/gvfs-libsoup.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur gvfs-1.2.3/configure.ac gvfs-1.2.3.new/configure.ac ---- gvfs-1.2.3/configure.ac 2009-05-18 17:24:03.000000000 +0530 -+++ gvfs-1.2.3.new/configure.ac 2009-07-13 11:26:23.000000000 +0530 -@@ -130,6 +130,11 @@ - if test "x$msg_http" = "xyes"; then - PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0) - AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built]) -+ AC_DEFINE(HAVE_LIBSOUP_GNOME, 1,[Define to 1 if libsoup-gnome is used]) -+ else -+ PKG_CHECK_EXISTS(libsoup-2.4 >= 2.25.1, msg_http=yes) -+ PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0) -+ AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built]) - fi - fi - -diff -Naur gvfs-1.2.3/daemon/gvfsbackendhttp.c gvfs-1.2.3.new/daemon/gvfsbackendhttp.c ---- gvfs-1.2.3/daemon/gvfsbackendhttp.c 2009-04-20 16:11:37.000000000 +0530 -+++ gvfs-1.2.3.new/daemon/gvfsbackendhttp.c 2009-07-13 11:27:14.000000000 +0530 -@@ -33,7 +33,10 @@ - #include <glib/gi18n.h> - #include <gio/gio.h> - -+#ifdef HAVE_LIBSOUP_GNOME - #include <libsoup/soup-gnome.h> -+#endif -+ - #include "gvfsbackendhttp.h" - #include "gvfsjobopenforread.h" - #include "gvfsjobread.h" -@@ -92,11 +95,13 @@ - "gvfs/" VERSION, - NULL); - -+#ifdef HAVE_LIBSOUP_GNOME - /* Proxy handling */ - proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_GNOME, NULL); - soup_session_add_feature (backend->session, proxy_resolver); - soup_session_add_feature (backend->session_async, proxy_resolver); - g_object_unref (proxy_resolver); -+#endif - - /* Logging */ - debug = g_getenv ("GVFS_HTTP_DEBUG"); diff --git a/source/xapps/gvfs/tmpfilesd.patch b/source/xapps/gvfs/tmpfilesd.patch deleted file mode 100644 index c6aaffb..0000000 --- a/source/xapps/gvfs/tmpfilesd.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 657330aa51ec65b9e5c247365bf5eb067ef62915 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek <[email protected]> -Date: Wed, 06 Feb 2013 15:02:06 +0000 -Subject: fuse: Install systemd tmpfiles.d exclusion file - -We need to tell systemd to stay out of our fuse mounts before -any data are destroyed. - -This patch reuses libsystemd-login detection as long as there is no -general header or pkg-config file in systemd. - -https://bugzilla.redhat.com/show_bug.cgi?id=902743 -https://bugs.archlinux.org/task/32715 -https://bugzilla.gnome.org/show_bug.cgi?id=560658 ---- -diff --git a/client/Makefile.am b/client/Makefile.am -index 5613d58..356bb57 100644 ---- a/client/Makefile.am -+++ b/client/Makefile.am -@@ -81,4 +81,19 @@ gvfsd_fuse_LDADD = \ - $(top_builddir)/common/libgvfscommon.la \ - $(GLIB_LIBS) $(FUSE_LIBS) - -+ -+# FIXME: reusing USE_LIBSYSTEMD_LOGIN as systemd has no universal header or pkg-config file -+if USE_LIBSYSTEMD_LOGIN -+ -+# FIXME: hardcoded path (systemd doesn't use lib64) -+tmpfilesddir = $(prefix)/lib/tmpfiles.d -+tmpfilesd_DATA = gvfsd-fuse-tmpfiles.conf -+ -+endif -+ - endif -+ -+ -+EXTRA_DIST = \ -+ gvfsd-fuse-tmpfiles.conf \ -+ $(NULL) -diff --git a/client/gvfsd-fuse-tmpfiles.conf b/client/gvfsd-fuse-tmpfiles.conf -new file mode 100644 -index 0000000..d808f2e ---- a/dev/null -+++ b/client/gvfsd-fuse-tmpfiles.conf -@@ -0,0 +1,14 @@ -+# This is a systemd tmpfiles.d configuration file -+# -+# tmpfiles.d defaults are set to clean /run/user every now and then -+# which includes our gvfs-fuse mount being mounted in /run/user/<id>/gvfs -+# -+# This file adds an exclusion rule so that user data don't get automatically -+# cleaned up (i.e. destroyed). -+# -+# Due to our fuse mount restrictions root can't access nor stat the mountpoint -+# resulting in warning spitted out by the systemd-tmpfiles process. Please -+# ignore it for the time being until proper solution is found: -+# https://bugzilla.gnome.org/show_bug.cgi?id=560658 -+ -+x /run/user/*/gvfs --- -cgit v0.9.0.2 -
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
