[Buildroot] [PATCH 1/3] gvfs: update to latest upstream version (1.8.2)

[Buildroot] [PATCH 1/3] gvfs: update to latest upstream version (1.8.2)

[Sven Neumann]

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
 package/gvfs/gvfs.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index adfa966..bd370b5 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -3,8 +3,8 @@
 # gvfs
 #
 #############################################################
-GVFS_VERSION_MAJOR = 1.6
-GVFS_VERSION_MINOR = 6
+GVFS_VERSION_MAJOR = 1.8
+GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
-- 
1.7.1

[Buildroot] [PATCH 2/3] gvfs: drop dbus-glib dependency

[Sven Neumann]

Drop the dbus-glib dependency as gvfs uses dbus directly.

Also change dependency on the XML parser for dbus to be more
in sync with the dbus package.

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
 package/gvfs/Config.in |    6 ++++--
 package/gvfs/gvfs.mk   |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 04fce93..38eb093 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -2,10 +2,9 @@ config BR2_PACKAGE_GVFS
 	bool "gvfs"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2 # dbus
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
 	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_SHARED_MIME_INFO
 	help
 	  gvfs is a userspace virtual filesystem where mount runs as a
@@ -18,3 +17,6 @@ config BR2_PACKAGE_GVFS
 
 comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
 	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+
+comment "gvfs requires expat or libxml2 (for dbus)"
+	depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index bd370b5..f208973 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -11,7 +11,7 @@ GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = NO
 GVFS_INSTALL_TARGET = YES
 GVFS_AUTORECONF = NO
-GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus-glib shared-mime-info
+GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
 
 GVFS_CONF_OPT = \
 	--disable-gconf			\
-- 
1.7.1

[Buildroot] [PATCH 3/3] gvfs: fix installation of gsettings schemas

[Sven Neumann]

Install gvfs into staging and compile the installed schemas for
use on the target.
---
 package/gvfs/gvfs.mk |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index f208973..b0fcf3d 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -8,7 +8,7 @@ GVFS_VERSION_MINOR = 2
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).$(GVFS_VERSION_MINOR)
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.gz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
-GVFS_INSTALL_STAGING = NO
+GVFS_INSTALL_STAGING = YES
 GVFS_INSTALL_TARGET = YES
 GVFS_AUTORECONF = NO
 GVFS_DEPENDENCIES = host-pkg-config host-libglib2 libglib2 dbus shared-mime-info
@@ -71,6 +71,17 @@ define GVFS_REMOVE_USELESS_BINARY
 	rm $(TARGET_DIR)/usr/bin/gvfs-less
 endef
 
-GVFS_POST_INSTALL_TARGET_HOOKS += GVFS_REMOVE_USELESS_BINARY
+define GVFS_REMOVE_TARGET_SCHEMAS
+	rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml
+endef
+
+define GVFS_COMPILE_SCHEMAS
+	$(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
+endef
+
+GVFS_POST_INSTALL_TARGET_HOOKS += \
+	GVFS_REMOVE_USELESS_BINARY	\
+	GVFS_REMOVE_TARGET_SCHEMAS	\
+	GVFS_COMPILE_SCHEMAS
 
 $(eval $(call AUTOTARGETS,package,gvfs))
-- 
1.7.1

[Buildroot] [PATCH 3/3] gvfs: fix installation of gsettings schemas

[Thomas Petazzoni]

Le Wed, 13 Jul 2011 18:54:49 +0200,
Sven Neumann <s.neumann@raumfeld.com> a ?crit :

> -GVFS_POST_INSTALL_TARGET_HOOKS += GVFS_REMOVE_USELESS_BINARY
> +define GVFS_REMOVE_TARGET_SCHEMAS
> +	rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml
> +endef
> +
> +define GVFS_COMPILE_SCHEMAS
> +	$(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
> +endef
> +
> +GVFS_POST_INSTALL_TARGET_HOOKS += \
> +	GVFS_REMOVE_USELESS_BINARY	\
> +	GVFS_REMOVE_TARGET_SCHEMAS	\
> +	GVFS_COMPILE_SCHEMAS

I have no idea what those schemas are, but why do you remove them in
GVFS_REMOVE_TARGET_SCHEMAS to generate them again in
GVFS_COMPILE_SCHEMAS ?

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 3/3] gvfs: fix installation of gsettings schemas

[Sven Neumann]

On Wed, 2011-07-13 at 19:11 +0200, Thomas Petazzoni wrote:
> Le Wed, 13 Jul 2011 18:54:49 +0200,
> Sven Neumann <s.neumann@raumfeld.com> a ?crit :
> 
> > -GVFS_POST_INSTALL_TARGET_HOOKS += GVFS_REMOVE_USELESS_BINARY
> > +define GVFS_REMOVE_TARGET_SCHEMAS
> > +	rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml
> > +endef
> > +
> > +define GVFS_COMPILE_SCHEMAS
> > +	$(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
> > +endef
> > +
> > +GVFS_POST_INSTALL_TARGET_HOOKS += \
> > +	GVFS_REMOVE_USELESS_BINARY	\
> > +	GVFS_REMOVE_TARGET_SCHEMAS	\
> > +	GVFS_COMPILE_SCHEMAS
> 
> I have no idea what those schemas are, but why do you remove them in
> GVFS_REMOVE_TARGET_SCHEMAS to generate them again in
> GVFS_COMPILE_SCHEMAS ?

The schemas are XML files, usually installed
in /usr/share/glib-2.0/schemas. In that directory there's also a
pre-compiled summary of all schemas, called gschemas.compiled. And this
file is what is actually used at run-time. So each package that provides
such schemas is supposed to add their XML files
to /usr/share/glib-2.0/schemas and then run glib-compile-schemas to
update gschemas.compiled.

The solution I went with is to install the schemas in staging-dir and to
use these as the source for the schema compilation. The compiled form is
then put into the target-dir.


Sven

[Buildroot] [PATCH 1/3] gvfs: update to latest upstream version (1.8.2)

[Peter Korsgaard]

>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:

 Sven> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/3] gvfs: drop dbus-glib dependency

[Peter Korsgaard]

>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:

 Sven> Drop the dbus-glib dependency as gvfs uses dbus directly.
 Sven> Also change dependency on the XML parser for dbus to be more
 Sven> in sync with the dbus package.

 Sven> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
 Sven> ---
 Sven>  package/gvfs/Config.in |    6 ++++--
 Sven>  package/gvfs/gvfs.mk   |    2 +-
 Sven>  2 files changed, 5 insertions(+), 3 deletions(-)

 Sven> diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
 Sven> index 04fce93..38eb093 100644
 Sven> --- a/package/gvfs/Config.in
 Sven> +++ b/package/gvfs/Config.in
 Sven> @@ -2,10 +2,9 @@ config BR2_PACKAGE_GVFS
 Sven>  	bool "gvfs"
 Sven>  	depends on BR2_LARGEFILE
 Sven>  	depends on BR2_USE_WCHAR # glib2
 Sven> +	depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2 # dbus
 Sven>  	select BR2_PACKAGE_LIBGLIB2
 Sven> -	select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
 Sven>  	select BR2_PACKAGE_DBUS
 Sven> -	select BR2_PACKAGE_DBUS_GLIB
 Sven>  	select BR2_PACKAGE_SHARED_MIME_INFO

mconf unfortunately complains about recursive dependencies because of
libxml2, bus as shared-mime-info already selects libxml2 we can drop the
expat || libxml2 and simply select dbus instead.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/3] gvfs: fix installation of gsettings schemas

[Peter Korsgaard]

>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:

 Sven> Install gvfs into staging and compile the installed schemas for
 Sven> use on the target.

Committed, thanks.

-- 
Bye, Peter Korsgaard