[SM-Commit] GIT changes to master grimoire by Robin Cook (59f45e5599b7c07fa6ff3b07b14ceb3a1a8751e3)

Robin Cook scm at sourcemage.org
Fri Mar 11 17:01:22 EST 2011


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 gnome2-libs/gvfs/HISTORY              |    4 ++++
 gnome2-libs/gvfs/PRE_BUILD            |    5 +++++
 gnome2-libs/gvfs/gvfs-gconf-fix.patch |   19 +++++++++++++++++++
 3 files changed, 28 insertions(+)

New commits:
commit 59f45e5599b7c07fa6ff3b07b14ceb3a1a8751e3
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    gvfs: added PRE_BUILD to apply patch

diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index d6d5da0..9aeb1b5 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,7 @@
+2011-03-11 Robin Cook <rcook at wyrms.net>
+	* PRE_BUILD: added to apply patch to fix building with gconf
+	  http://bugs.gentoo.org/show_bug.cgi?id=346055
+
 2011-01-23 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added missing dependencies
 
diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
new file mode 100755
index 0000000..2728e04
--- /dev/null
+++ b/gnome2-libs/gvfs/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+
+patch -p1 < $SCRIPT_DIRECTORY/gvfs-gconf-fix.patch
+
diff --git a/gnome2-libs/gvfs/gvfs-gconf-fix.patch b/gnome2-libs/gvfs/gvfs-gconf-fix.patch
new file mode 100644
index 0000000..edd7992
--- /dev/null
+++ b/gnome2-libs/gvfs/gvfs-gconf-fix.patch
@@ -0,0 +1,19 @@
+diff -ur gvfs-orig/gconf/gapplookupgconf.h gvfs-mod/gconf/gapplookupgconf.h
+--- gvfs-orig/gconf/gapplookupgconf.h	2011-03-11 15:48:20.674000008 -0600
++++ gvfs-mod/gconf/gapplookupgconf.h	2011-03-11 15:52:15.559000006 -0600
+@@ -25,8 +25,14 @@
+ 
+ #include <glib-object.h>
+ #include <gio/gio.h>
+-#include <gio/gdesktopappinfo.h>
+ 
++#ifdef G_DISABLE_DEPRECATED
++#undef G_DISABLE_DEPRECATED
++#include <gio/gdesktopappinfo.h>
++#define G_DISABLE_DEPRECATED
++#else
++#include <gio/gdesktopappinfo.h>
++#endif
+ 
+ G_BEGIN_DECLS
+ 



More information about the SM-Commit mailing list