rpms/GConf2/F-12 GConf-gettext.patch, 1.1, 1.2 GConf2.spec, 1.113, 1.114
Matthias Clasen
mclasen at fedoraproject.org
Wed Oct 7 23:39:36 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/GConf2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19005
Modified Files:
GConf-gettext.patch GConf2.spec
Log Message:
Fix a problem with schema translations
GConf-gettext.patch:
backends/markup-tree.c | 36 ++++++++++++++++++++++++++++++
doc/gconf-1.0.dtd | 2 -
gconf/GConfX.idl | 1
gconf/gconf-internals.c | 9 +++++++
gconf/gconf-schema.c | 57 ++++++++++++++++++++++++++++++++++++++++--------
gconf/gconf-schema.h | 3 ++
gconf/gconftool.c | 16 +++++++++++++
7 files changed, 114 insertions(+), 10 deletions(-)
Index: GConf-gettext.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/F-12/GConf-gettext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- GConf-gettext.patch 27 Apr 2009 16:52:33 -0000 1.1
+++ GConf-gettext.patch 7 Oct 2009 23:39:34 -0000 1.2
@@ -1,7 +1,10 @@
-diff -up GConf-2.26.0/backends/markup-tree.c.gettext GConf-2.26.0/backends/markup-tree.c
---- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
+# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
+# Ubuntu: https://bugs.launchpad.net/bugs/123025
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/backends/markup-tree.c gconf-2.28.0.new/backends/markup-tree.c
+--- gconf-2.28.0/backends/markup-tree.c 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/backends/markup-tree.c 2009-10-07 22:28:21.000000000 +0200
+@@ -52,6 +57,7 @@
char *schema_name;
char *mod_user;
GTime mod_time;
@@ -9,7 +12,7 @@ diff -up GConf-2.26.0/backends/markup-tr
};
static LocalSchemaInfo* local_schema_info_new (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry
+@@ -1593,6 +1599,8 @@
gconf_schema_get_type (schema));
gconf_schema_set_owner (current_schema,
gconf_schema_get_owner (schema));
@@ -18,7 +21,7 @@ diff -up GConf-2.26.0/backends/markup-tr
}
/* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
+@@ -1805,6 +1813,8 @@
else if (c_local_schema && c_local_schema->long_desc)
gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
@@ -27,26 +30,45 @@ diff -up GConf-2.26.0/backends/markup-tr
return retval;
}
}
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
+@@ -2325,9 +2335,11 @@
+ /* check out the crack; "ltype" is for nodes storing a list,
+ * and "list_type" is for nodes storing a schema
+ */
++ const char *gettext_domain;
const char *ltype;
const char *list_type;
const char *owner;
+
GConfValueType vtype;
-- const char *dummy1, *dummy2, *dummy3, *dummy4;
-+ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
+ const char *dummy1, *dummy2, *dummy3, *dummy4;
- #if 0
- g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
- "muser", &dummy2,
- "mtime", &dummy3,
- "schema", &dummy4,
-+ "gettext_domain", &dummy5,
-
- NULL))
- return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2349,6 +2361,7 @@
+ car_type = NULL;
+ cdr_type = NULL;
+ owner = NULL;
++ gettext_domain = NULL;
+
+ if (!locate_attributes (context, element_name, attribute_names, attribute_values,
+ error,
+@@ -2360,6 +2373,7 @@
+ "car_type", &car_type,
+ "cdr_type", &cdr_type,
+ "owner", &owner,
++ "gettext_domain", &gettext_domain,
+
+ /* And these are just to eat any error messages */
+ "name", &dummy1,
+@@ -2574,6 +2588,9 @@
+ if (owner)
+ gconf_schema_set_owner (schema, owner);
+
++ if (gettext_domain)
++ gconf_schema_set_gettext_domain (schema, gettext_domain);
++
+ gconf_value_set_schema_nocopy (*retval, schema);
+ }
+ break;
+@@ -2672,6 +2689,7 @@
const char *mtime;
const char *schema;
const char *type;
@@ -54,7 +76,7 @@ diff -up GConf-2.26.0/backends/markup-tr
const char *dummy1, *dummy2, *dummy3, *dummy4;
const char *dummy5, *dummy6, *dummy7;
GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2682,6 +2700,7 @@
mtime = NULL;
schema = NULL;
type = NULL;
@@ -62,7 +84,7 @@ diff -up GConf-2.26.0/backends/markup-tr
if (!locate_attributes (context, element_name, attribute_names, attribute_values,
error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2690,6 +2709,7 @@
"mtime", &mtime,
"schema", &schema,
"type", &type,
@@ -70,7 +92,7 @@ diff -up GConf-2.26.0/backends/markup-tr
/* These are allowed but we don't use them until
* parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
+@@ -2757,6 +2777,9 @@
*/
if (schema)
entry->schema_name = g_strdup (schema);
@@ -80,7 +102,7 @@ diff -up GConf-2.26.0/backends/markup-tr
}
else
{
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
+@@ -3704,6 +3727,7 @@
GConfSchema *schema;
GConfValueType stype;
const char *owner;
@@ -88,7 +110,7 @@ diff -up GConf-2.26.0/backends/markup-tr
schema = gconf_value_get_schema (value);
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
+@@ -3729,6 +3753,23 @@
g_free (s);
}
@@ -112,9 +134,9 @@ diff -up GConf-2.26.0/backends/markup-tr
if (stype == GCONF_VALUE_LIST)
{
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/doc/gconf-1.0.dtd gconf-2.28.0.new/doc/gconf-1.0.dtd
+--- gconf-2.28.0/doc/gconf-1.0.dtd 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/doc/gconf-1.0.dtd 2009-10-07 22:28:20.000000000 +0200
@@ -7,7 +7,7 @@
<!-- A single schema. What I am trying to say is "this set of
elements, in any order". Duplicate elements (apart from <locale>) are
@@ -124,10 +146,10 @@ diff -up GConf-2.26.0/doc/gconf-1.0.dtd.
<!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
<!ELEMENT key (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-internals.c gconf-2.28.0.new/gconf/gconf-internals.c
+--- gconf-2.28.0/gconf/gconf-internals.c 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-internals.c 2009-10-07 22:28:20.000000000 +0200
+@@ -513,6 +513,7 @@
cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
@@ -135,7 +157,7 @@ diff -up GConf-2.26.0/gconf/gconf-intern
{
gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
+@@ -600,6 +601,14 @@
gconf_schema_set_owner(sc, cs->owner);
}
@@ -150,10 +172,10 @@ diff -up GConf-2.26.0/gconf/gconf-intern
{
GConfValue* val;
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-schema.c gconf-2.28.0.new/gconf/gconf-schema.c
+--- gconf-2.28.0/gconf/gconf-schema.c 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-schema.c 2009-10-07 22:28:20.000000000 +0200
+@@ -32,9 +32,10 @@
GConfValueType car_type; /* Pair car type of the described entry */
GConfValueType cdr_type; /* Pair cdr type of the described entry */
gchar* locale; /* Schema locale */
@@ -165,7 +187,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
GConfValue* default_value; /* Default value of the key */
} GConfRealSchema;
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
+@@ -63,7 +64,6 @@
g_free (real->locale);
g_free (real->short_desc);
g_free (real->long_desc);
@@ -173,7 +195,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
if (real->default_value)
gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
+@@ -91,7 +91,9 @@
dest->long_desc = g_strdup (real->long_desc);
@@ -184,7 +206,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
+@@ -136,6 +138,17 @@
REAL_SCHEMA (sc)->locale = NULL;
}
@@ -202,7 +224,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
void
gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
{
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
+@@ -169,11 +182,8 @@
{
g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
@@ -215,7 +237,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
else
REAL_SCHEMA (sc)->owner = NULL;
}
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
+@@ -228,6 +238,14 @@
return FALSE;
}
@@ -230,7 +252,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
{
g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
+@@ -299,11 +317,32 @@
}
const char*
@@ -264,7 +286,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
}
const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
+@@ -311,7 +350,7 @@
{
g_return_val_if_fail (schema != NULL, NULL);
@@ -273,10 +295,10 @@ diff -up GConf-2.26.0/gconf/gconf-schema
}
const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-schema.h gconf-2.28.0.new/gconf/gconf-schema.h
+--- gconf-2.28.0/gconf/gconf-schema.h 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-schema.h 2009-10-07 22:28:20.000000000 +0200
+@@ -48,6 +48,8 @@
GConfValueType type);
void gconf_schema_set_locale (GConfSchema *sc,
const gchar *locale);
@@ -285,7 +307,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
void gconf_schema_set_short_desc (GConfSchema *sc,
const gchar *desc);
void gconf_schema_set_long_desc (GConfSchema *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
+@@ -65,6 +67,7 @@
GConfValueType gconf_schema_get_car_type (const GConfSchema *schema);
GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema);
const char* gconf_schema_get_locale (const GConfSchema *schema);
@@ -293,10 +315,10 @@ diff -up GConf-2.26.0/gconf/gconf-schema
const char* gconf_schema_get_short_desc (const GConfSchema *schema);
const char* gconf_schema_get_long_desc (const GConfSchema *schema);
const char* gconf_schema_get_owner (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconftool.c gconf-2.28.0.new/gconf/gconftool.c
+--- gconf-2.28.0/gconf/gconftool.c 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconftool.c 2009-10-07 22:28:20.000000000 +0200
+@@ -3295,6 +3295,7 @@
GConfValueType cdr_type;
GConfValue* global_default;
GHashTable* hash;
@@ -304,7 +326,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
};
static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
+@@ -3547,6 +3548,15 @@
else
g_printerr (_("WARNING: empty <applyto> node"));
}
@@ -320,7 +342,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
else
g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
+@@ -3636,6 +3646,9 @@
if (info->owner != NULL)
gconf_schema_set_owner(schema, info->owner);
@@ -330,7 +352,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
xmlFree(name);
/* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
+@@ -3765,6 +3778,7 @@
info.apply_to = NULL;
info.owner = NULL;
info.global_default = NULL;
@@ -338,7 +360,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
info.hash = g_hash_table_new(g_str_hash, g_str_equal);
extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
+@@ -3801,6 +3815,8 @@
; /* nothing */
else if (strcmp((char *)iter->name, "applyto") == 0)
; /* nothing */
@@ -347,10 +369,10 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
else if (strcmp((char *)iter->name, "locale") == 0)
{
process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/GConfX.idl gconf-2.28.0.new/gconf/GConfX.idl
+--- gconf-2.28.0/gconf/GConfX.idl 2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/GConfX.idl 2009-10-07 22:28:20.000000000 +0200
+@@ -16,6 +16,7 @@
string short_desc;
string long_desc;
string owner;
Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/F-12/GConf2.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- GConf2.spec 23 Sep 2009 22:21:50 -0000 1.113
+++ GConf2.spec 7 Oct 2009 23:39:35 -0000 1.114
@@ -7,7 +7,7 @@
Summary: A process-transparent configuration system
Name: GConf2
Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Base
Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
@@ -151,6 +151,9 @@ fi
%{_libdir}/pkgconfig/*
%changelog
+* Wed Oct 7 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix a problem with schema translations
+
* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
- Update to 2.28.0
More information about the fedora-extras-commits
mailing list