Ticket #2142: 0001-Add-patch-for-GConf-to-tolerate-a-new-attribute-adde.patch

File 0001-Add-patch-for-GConf-to-tolerate-a-new-attribute-adde.patch, 2.8 KB (added by tomeu, 12 years ago)
  • config/modulesets/glucose-external.modules

    From aeebc01e3ee18e9edfa90c9d7b1ee74aec93c64a Mon Sep 17 00:00:00 2001
    From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
    Date: Tue, 24 Aug 2010 20:31:52 +0200
    Subject: [PATCH] Add patch for GConf to tolerate a new attribute added to schemas #2142
    
    ---
     config/modulesets/glucose-external.modules         |    1 +
     .../patches/gconf-dbus-gettext_domain.patch        |   37 ++++++++++++++++++++
     2 files changed, 38 insertions(+), 0 deletions(-)
     create mode 100644 config/modulesets/patches/gconf-dbus-gettext_domain.patch
    
    diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
    index 04cc65a..7743d41 100644
    a b  
    157157            version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/>
    158158    <patches>
    159159      <patch file="gconf-dbus-defaultpath.patch" strip="0"/>
     160      <patch file="gconf-dbus-gettext_domain.patch" strip="1"/>
    160161    </patches>
    161162  </tarball>
    162163  <autotools id="dbus-glib" autogen-sh="configure">
  • new file config/modulesets/patches/gconf-dbus-gettext_domain.patch

    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
    - +  
     1diff -rup GConf-dbus-2.16.0.orig/backends/markup-tree.c GConf-dbus-2.16.0/backends/markup-tree.c
     2--- GConf-dbus-2.16.0.orig/backends/markup-tree.c       2010-08-24 20:14:09.451684551 +0200
     3+++ GConf-dbus-2.16.0/backends/markup-tree.c    2010-08-24 20:15:29.482681571 +0200
     4@@ -2339,7 +2339,7 @@ parse_value_element (GMarkupParseContext
     5   const char *list_type;
     6   const char *owner;
     7   GConfValueType vtype;
     8-  const char *dummy1, *dummy2, *dummy3, *dummy4;
     9+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
     10   
     11 #if 0
     12   g_assert (ELEMENT_IS ("entry") ||
     13@@ -2376,6 +2376,7 @@ parse_value_element (GMarkupParseContext
     14                           "muser", &dummy2,
     15                           "mtime", &dummy3,
     16                           "schema", &dummy4,
     17+                          "gettext_domain", &dummy5,
     18 
     19                           NULL))
     20     return;
     21@@ -2682,7 +2683,7 @@ parse_entry_element (GMarkupParseContext
     22       const char *schema;
     23       const char *type;
     24       const char *dummy1, *dummy2, *dummy3, *dummy4;
     25-      const char *dummy5, *dummy6, *dummy7;
     26+      const char *dummy5, *dummy6, *dummy7, *dummy8;
     27       GConfValue *value;
     28       GError *tmp_err;
     29 
     30@@ -2710,6 +2711,7 @@ parse_entry_element (GMarkupParseContext
     31                               "car_type", &dummy5,
     32                               "cdr_type", &dummy6,
     33                               "owner", &dummy7,
     34+                              "gettext_domain", &dummy8,
     35                               NULL))
     36         return;
     37