File gvfs-glib-2.27.patch of Package gvfs

Overview Repositories Revisions Requests Users Attributes Meta

File gvfs-glib-2.27.patch of Package gvfs

commit 6115bf7549fc2a9171d7cd5eaec6bc1a58dfb8b2
Author: Vincent Untz <vuntz@gnome.org>
Date:   Fri Nov 19 10:00:36 2010 +0100

Do not build app lookup extension if we have glib >= 2.27.1
    
    https://bugzilla.gnome.org/show_bug.cgi?id=635252

diff --git a/configure.ac b/configure.ac
index ed70e54..5f05f57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,14 @@ fi
 
 AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"])
 
+dnl *************************************************************
+dnl *** Check if we can build gconf-based gio extension point ***
+dnl *************************************************************
+
+msg_gconf_gio=no
+PKG_CHECK_EXISTS(gio-2.0 <= 2.27.1, msg_gconf_gio=yes)
+AM_CONDITIONAL(USE_GCONF_GIO, [test "$msg_gconf_gio" = "yes"])
+
 dnl ********************************************
 dnl *** Check for expat (for obexftp and gdu ***
 dnl ********************************************
@@ -726,6 +734,7 @@ echo "
 	archive support:              $msg_archive
 	AFC support:                  $msg_afc
         GConf support:                $msg_gconf
+        GConf-based GIO extension:    $msg_gconf_gio
         DNS-SD support:               $msg_avahi
 	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
 	Build GDU volume monitor:     $msg_gdu
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 85d4d8d..af1433e 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -4,8 +4,10 @@ NULL =
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
 
 if USE_GCONF
+if USE_GCONF_GIO
 giomodules_LTLIBRARIES = libgiogconf.la
 endif
+endif
 
 libgiogconf_la_SOURCES =				\
 	gapplookupgconf.c gapplookupgconf.h		\

Places

File gvfs-glib-2.27.patch of Package gvfs

Places