Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23245326 Move gvfs to Userland and update to 1.26.0
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 19 Aug 2016 19:20:14 -0700
changeset 6648 8dbded6934b2
parent 6647 713709ce4043
child 6649 99bdd93a7668
23245326 Move gvfs to Userland and update to 1.26.0 PSARC/2010/143 GNOME 2.30
components/gnome/gvfs/Makefile file | annotate | diff | comparison | revisions
components/gnome/gvfs/gvfs.p5m file | annotate | diff | comparison | revisions
components/gnome/gvfs/patches/01-major-minor.patch file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gvfs/Makefile	Fri Aug 19 19:20:14 2016 -0700
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            32_and_64
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		gvfs
+COMPONENT_VERSION=	1.26.0
+COMPONENT_PROJECT_URL=  https://wiki.gnome.org/Projects/gvfs
+COMPONENT_ARCHIVE_HASH= \
+	sha256:6d43e8b33a5c1588525875f9d3979b515f648da1d567d0ce3d337a18f5ff8c32
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			25202
+
+# Needs updated glib2, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Assumes GNU xgettext in PATH.
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# Requires a reconf due to 01-major-minor.patch changing configure.ac.
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -iv);
+
+# Assumes GNU xgettext is first in $PATH.
+COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
+
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-archive
+CONFIGURE_OPTIONS += --enable-avahi
+CONFIGURE_OPTIONS += --enable-bash-completion
+CONFIGURE_OPTIONS += --enable-documentation
+CONFIGURE_OPTIONS += --enable-goa
+CONFIGURE_OPTIONS += --disable-gphoto2
+CONFIGURE_OPTIONS += --enable-gtk
+CONFIGURE_OPTIONS += --enable-http
+CONFIGURE_OPTIONS += --enable-keyring
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --with-pic
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/libsecret
+REQUIRED_PACKAGES += library/libarchive
+REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += system/library/security/libgcrypt
+REQUIRED_PACKAGES += system/network/avahi
+REQUIRED_PACKAGES += library/gnome/gcr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gvfs/gvfs.p5m	Fri Aug 19 19:20:14 2016 -0700
@@ -0,0 +1,233 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/gnome/gvfs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The GNOME Virtual file system framework"
+set name=pkg.description \
+    value="GVfs is a userspace virtual filesystem designed to work with the I/O abstraction of GIO. It installs several modules that are automatically used by applications using the APIs of libgio."
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2010/143
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file usr/bin/$(MACH64)/gvfs-cat path=usr/bin/gvfs-cat
+file usr/bin/$(MACH64)/gvfs-copy path=usr/bin/gvfs-copy
+file usr/bin/$(MACH64)/gvfs-info path=usr/bin/gvfs-info
+file usr/bin/$(MACH64)/gvfs-less path=usr/bin/gvfs-less
+file usr/bin/$(MACH64)/gvfs-ls path=usr/bin/gvfs-ls
+file usr/bin/$(MACH64)/gvfs-mime path=usr/bin/gvfs-mime
+file usr/bin/$(MACH64)/gvfs-mkdir path=usr/bin/gvfs-mkdir
+file usr/bin/$(MACH64)/gvfs-monitor-dir path=usr/bin/gvfs-monitor-dir
+file usr/bin/$(MACH64)/gvfs-monitor-file path=usr/bin/gvfs-monitor-file
+file usr/bin/$(MACH64)/gvfs-mount path=usr/bin/gvfs-mount
+file usr/bin/$(MACH64)/gvfs-move path=usr/bin/gvfs-move
+file usr/bin/$(MACH64)/gvfs-open path=usr/bin/gvfs-open
+file usr/bin/$(MACH64)/gvfs-rename path=usr/bin/gvfs-rename
+file usr/bin/$(MACH64)/gvfs-rm path=usr/bin/gvfs-rm
+file usr/bin/$(MACH64)/gvfs-save path=usr/bin/gvfs-save
+file usr/bin/$(MACH64)/gvfs-set-attribute path=usr/bin/gvfs-set-attribute
+file usr/bin/$(MACH64)/gvfs-trash path=usr/bin/gvfs-trash
+file usr/bin/$(MACH64)/gvfs-tree path=usr/bin/gvfs-tree
+file path=usr/include/gvfs-client/gvfs/gvfsurimapper.h
+file path=usr/include/gvfs-client/gvfs/gvfsuriutils.h
+file path=usr/lib/$(MACH64)/gio/modules/libgioremote-volume-monitor.so
+file path=usr/lib/$(MACH64)/gio/modules/libgvfsdbus.so
+file path=usr/lib/$(MACH64)/gvfs/libgvfscommon.so
+file path=usr/lib/$(MACH64)/gvfs/libgvfsdaemon.so
+file path=usr/lib/$(MACH64)/gvfsd mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-afp mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-afp-browse mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-archive mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-burn mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-computer mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-dav mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-dnssd mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-ftp mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-http mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-localtest mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-metadata mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-network mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-recent mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-sftp mode=0555
+file path=usr/lib/$(MACH64)/gvfsd-trash mode=0555
+file path=usr/lib/gio/modules/libgioremote-volume-monitor.so
+file path=usr/lib/gio/modules/libgvfsdbus.so
+file path=usr/lib/gvfs/libgvfscommon.so
+file path=usr/lib/gvfs/libgvfsdaemon.so
+file path=usr/lib/gvfsd mode=0555
+file path=usr/lib/gvfsd-afp mode=0555
+file path=usr/lib/gvfsd-afp-browse mode=0555
+file path=usr/lib/gvfsd-archive mode=0555
+file path=usr/lib/gvfsd-burn mode=0555
+file path=usr/lib/gvfsd-computer mode=0555
+file path=usr/lib/gvfsd-dav mode=0555
+file path=usr/lib/gvfsd-dnssd mode=0555
+file path=usr/lib/gvfsd-ftp mode=0555
+file path=usr/lib/gvfsd-http mode=0555
+file path=usr/lib/gvfsd-localtest mode=0555
+file path=usr/lib/gvfsd-metadata mode=0555
+file path=usr/lib/gvfsd-network mode=0555
+file path=usr/lib/gvfsd-recent mode=0555
+file path=usr/lib/gvfsd-sftp mode=0555
+file path=usr/lib/gvfsd-trash mode=0555
+file path=usr/share/GConf/gsettings/gvfs-dns-sd.convert
+file path=usr/share/bash-completion/completions/gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-copy target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-info target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-less target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-ls target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-mkdir target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-monitor-dir target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-monitor-file \
+    target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-move target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-open target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-rename target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-rm target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-save target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-set-attribute \
+    target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-trash target=gvfs-cat
+link path=usr/share/bash-completion/completions/gvfs-tree target=gvfs-cat
+file path=usr/share/dbus-1/services/gvfs-daemon.service
+file path=usr/share/dbus-1/services/gvfs-metadata.service
+file path=usr/share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
+file path=usr/share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
+file path=usr/share/gvfs/mounts/afp-browse.mount
+file path=usr/share/gvfs/mounts/afp.mount
+file path=usr/share/gvfs/mounts/archive.mount
+file path=usr/share/gvfs/mounts/burn.mount
+file path=usr/share/gvfs/mounts/computer.mount
+file path=usr/share/gvfs/mounts/dav+sd.mount
+file path=usr/share/gvfs/mounts/dav.mount
+file path=usr/share/gvfs/mounts/dns-sd.mount
+file path=usr/share/gvfs/mounts/ftp.mount
+file path=usr/share/gvfs/mounts/http.mount
+file path=usr/share/gvfs/mounts/localtest.mount
+file path=usr/share/gvfs/mounts/network.mount
+file path=usr/share/gvfs/mounts/recent.mount
+file path=usr/share/gvfs/mounts/sftp.mount
+file path=usr/share/gvfs/mounts/trash.mount
+file path=usr/share/locale/af/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ar/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/as/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ast/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/be/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/bg/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/bn/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/bs/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ca/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/cs/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/da/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/de/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/el/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/eo/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/es/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/et/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/eu/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/fa/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/fi/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/fr/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ga/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/gl/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/gu/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/he/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/hi/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/hu/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/id/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/it/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ja/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/kk/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/kn/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ko/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ku/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/lt/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/lv/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/mai/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/mk/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ml/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/mr/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/nb/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/nds/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/nl/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/nn/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/or/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/pa/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/pl/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/pt/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ro/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ru/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sk/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sl/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sq/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sr/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/sv/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ta/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/te/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/tg/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/th/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/tr/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/ug/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/uk/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/vi/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/gvfs.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+file path=usr/share/man/man1/gvfs-cat.1
+file path=usr/share/man/man1/gvfs-copy.1
+file path=usr/share/man/man1/gvfs-info.1
+file path=usr/share/man/man1/gvfs-less.1
+file path=usr/share/man/man1/gvfs-ls.1
+file path=usr/share/man/man1/gvfs-mime.1
+file path=usr/share/man/man1/gvfs-mkdir.1
+file path=usr/share/man/man1/gvfs-monitor-dir.1
+file path=usr/share/man/man1/gvfs-monitor-file.1
+file path=usr/share/man/man1/gvfs-mount.1
+file path=usr/share/man/man1/gvfs-move.1
+file path=usr/share/man/man1/gvfs-open.1
+file path=usr/share/man/man1/gvfs-rename.1
+file path=usr/share/man/man1/gvfs-rm.1
+file path=usr/share/man/man1/gvfs-save.1
+file path=usr/share/man/man1/gvfs-set-attribute.1
+file path=usr/share/man/man1/gvfs-trash.1
+file path=usr/share/man/man1/gvfs-tree.1
+file path=usr/share/man/man1/gvfsd-fuse.1
+file path=usr/share/man/man1/gvfsd-metadata.1
+file path=usr/share/man/man1/gvfsd.1
+file path=usr/share/man/man7/gvfs.7
+license COPYING license=LGPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gvfs/patches/01-major-minor.patch	Fri Aug 19 19:20:14 2016 -0700
@@ -0,0 +1,43 @@
+From 3be9a4eb3a024f7adf605fe57da1491f7549c3a2 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sun, 20 Dec 2015 19:33:37 -0800
+Subject: [PATCH] metadata: need to include <sys/mkdev.h> on Solaris for
+ major() & minor()
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ configure.ac        | 2 +-
+ metadata/metatree.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb358c6..3672b00 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -772,7 +772,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+ dnl ==========================================================================
+ dnl Look for various fs info getters
+ 
+-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h])
++AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h sys/mkdev.h])
+ AC_CHECK_FUNCS(statvfs statfs)
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
+ #include <sys/stat.h>
+diff --git a/metadata/metatree.c b/metadata/metatree.c
+index 89942cb..b5eeb36 100644
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
+@@ -9,6 +9,10 @@
+ #include <stdlib.h>
+ #include <time.h>
+ 
++#if HAVE_SYS_MKDEV_H
++#include <sys/mkdev.h> /* needed for major() & minor() on Solaris */
++#endif
++
+ #include "metatree.h"
+ #include "metabuilder.h"
+ #include <glib.h>
+-- 
+2.6.1
+
--- a/components/meta-packages/incorporation-cache	Sat Aug 13 10:52:26 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Fri Aug 19 19:20:14 2016 -0700
@@ -75,7 +75,6 @@
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
-consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
upstream/oracle/userland-gate