From ae471ef38c50cec8429e071e3a8eb17124414c35 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Tue, 24 Aug 2010 18:31:52 +0000
Subject: Add patch for GConf to tolerate a new attribute added to schemas #2142

---
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 33aaa9a..d76b1f0 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -146,6 +146,7 @@
             version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/>
     <patches>
       <patch file="gconf-dbus-defaultpath.patch" strip="0"/>
+      <patch file="gconf-dbus-gettext_domain.patch" strip="1"/>
     </patches>
   </tarball>
   <autotools id="dbus-glib" autogen-sh="configure">
diff --git a/config/modulesets/patches/gconf-dbus-gettext_domain.patch b/config/modulesets/patches/gconf-dbus-gettext_domain.patch
new file mode 100644
index 0000000..3b966e6
--- /dev/null
+++ b/config/modulesets/patches/gconf-dbus-gettext_domain.patch
@@ -0,0 +1,37 @@
+diff -rup GConf-dbus-2.16.0.orig/backends/markup-tree.c GConf-dbus-2.16.0/backends/markup-tree.c
+--- GConf-dbus-2.16.0.orig/backends/markup-tree.c	2010-08-24 20:14:09.451684551 +0200
++++ GConf-dbus-2.16.0/backends/markup-tree.c	2010-08-24 20:15:29.482681571 +0200
+@@ -2339,7 +2339,7 @@ parse_value_element (GMarkupParseContext
+   const char *list_type;
+   const char *owner;
+   GConfValueType vtype;
+-  const char *dummy1, *dummy2, *dummy3, *dummy4;
++  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
+   
+ #if 0
+   g_assert (ELEMENT_IS ("entry") ||
+@@ -2376,6 +2376,7 @@ parse_value_element (GMarkupParseContext
+                           "muser", &dummy2,
+                           "mtime", &dummy3,
+                           "schema", &dummy4,
++                          "gettext_domain", &dummy5,
+ 
+                           NULL))
+     return;
+@@ -2682,7 +2683,7 @@ parse_entry_element (GMarkupParseContext
+       const char *schema;
+       const char *type;
+       const char *dummy1, *dummy2, *dummy3, *dummy4;
+-      const char *dummy5, *dummy6, *dummy7;
++      const char *dummy5, *dummy6, *dummy7, *dummy8;
+       GConfValue *value;
+       GError *tmp_err;
+ 
+@@ -2710,6 +2711,7 @@ parse_entry_element (GMarkupParseContext
+                               "car_type", &dummy5,
+                               "cdr_type", &dummy6,
+                               "owner", &dummy7,
++                              "gettext_domain", &dummy8,
+                               NULL))
+         return;
+ 
--
cgit v0.9.1