pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 555796 from home:xiaoguang_wang:branches:GNOME:Factory

Browse Source 
- Add glib2-gsettings-overrides-per-session.patch: gsettings
  default value can be overridden depending on session
  (bgo#746592 bsc#1070090).

  + Bugs fixed: bgo#686895, bgo#688704, bgo#602715, bgo#688377,
  + GTask (the new GAsyncResult implementation) has landed
    - bgo#624991 GSettings mapping for G_TYPE_STRV
    - g_mkstemp_full is a variant of g_mkstemp that allows to
    - bgo#593232 g_rand_new: read no more than requested from
  + GIO:
  + GIO:
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
- add gcc-c++ to buildreqires to work around libtool problem
    * New API to enable out-of-process volume monitors:
      g_signal_override_class_handler
- fix build
    icons for mime types
    additional GIO modules
    bgo#521045, bgo#521672, bgo#521946, bgo#522335, bgo#523015,
- obsolete glib2-<arch> via baselibs.conf
  recommendation of gvfs.
- Tag patches
   * g_win32_get_package_installation_directory_of_module: new
     function which supersedes
    * The MD5 implementation works correctly on buffers
  it easier to write threadsafe one-time initialization functions
* Add g_string_chunk_clear() for clearing a
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
- removed obsolete patch glib2-unexpanded-variables.patch (#249204)
  343825 Double expansion in m4macros/glib-gettext.m4 will fail with

OBS-URL: https://build.opensuse.org/request/show/555796
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=352
This commit is contained in:
Dominique Leuenberger 2017-12-13 10:18:47 +00:00 committed by Git OBS Bridge
parent 421687ee74
commit 30a2510db5
3 changed files with 455 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

353
glib2-gsettings-overrides-per-session.patch Normal file
View File

@ -0,0 +1,353 @@
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 2dc8c7171..59fb68ee7 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -179,6 +179,8 @@ typedef struct
GString *unparsed_default_value;
GVariant *default_value;
+ GVariantDict *desktop_overrides;
+
GString *strinfo;
gboolean is_enum;
gboolean is_flags;
@@ -731,6 +733,11 @@ key_state_serialise (KeyState *state)
g_variant_builder_add (&builder, "(y(**))", 'r',
state->minimum, state->maximum);
+ /* per-desktop overrides */
+ if (state->desktop_overrides)
+ g_variant_builder_add (&builder, "(y@a{sv})", 'd',
+ g_variant_dict_end (state->desktop_overrides));
+
state->serialised = g_variant_builder_end (&builder);
}
@@ -768,6 +775,9 @@ key_state_free (gpointer data)
if (state->serialised)
g_variant_unref (state->serialised);
+ if (state->desktop_overrides)
+ g_variant_dict_unref (state->desktop_overrides);
+
g_slice_free (KeyState, state);
}
@@ -1878,6 +1888,8 @@ set_overrides (GHashTable *schema_table,
gchar **groups;
gint i;
+ g_debug ("Processing override file '%s'", filename);
+
key_file = g_key_file_new ();
if (!g_key_file_load_from_file (key_file, filename, 0, &error))
{
@@ -1900,18 +1912,31 @@ set_overrides (GHashTable *schema_table,
for (i = 0; groups[i]; i++)
{
const gchar *group = groups[i];
+ const gchar *schema_name;
+ const gchar *desktop_id;
SchemaState *schema;
+ gchar **pieces;
gchar **keys;
gint j;
- schema = g_hash_table_lookup (schema_table, group);
+ pieces = g_strsplit (group, ":", 2);
+ schema_name = pieces[0];
+ desktop_id = pieces[1];
+
+ g_debug ("Processing group '%s' (schema '%s', %s)",
+ group, schema_name, desktop_id ? desktop_id : "all desktops");
+
+ schema = g_hash_table_lookup (schema_table, schema_name);
if (schema == NULL)
- /* Having the schema not be installed is expected to be a
- * common case. Don't even emit an error message about
- * that.
- */
- continue;
+ {
+ /* Having the schema not be installed is expected to be a
+ * common case. Don't even emit an error message about
+ * that.
+ */
+ g_strfreev (pieces);
+ continue;
+ }
keys = g_key_file_get_keys (key_file, group, NULL, NULL);
g_assert (keys != NULL);
@@ -1939,6 +1964,32 @@ set_overrides (GHashTable *schema_table,
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
+ g_strfreev (pieces);
+ g_strfreev (groups);
+ g_strfreev (keys);
+
+ return FALSE;
+ }
+
+ if (desktop_id != NULL && state->l10n)
+ {
+ /* Let's avoid the n*m case of per-desktop localised
+ * default values, and just forbid it.
+ */
+ fprintf (stderr,
+ _("cannot provide per-desktop overrides for localised "
+ "key '%s' in schema '%s' (override file '%s')"),
+ key, group, filename);
+
+ if (!strict)
+ {
+ fprintf (stderr, _("; ignoring override for this key.\n"));
+ continue;
+ }
+
+ fprintf (stderr, _(" and --strict was specified; exiting.\n"));
+ g_key_file_free (key_file);
+ g_strfreev (pieces);
g_strfreev (groups);
g_strfreev (keys);
@@ -1969,6 +2020,7 @@ set_overrides (GHashTable *schema_table,
fprintf (stderr, _("--strict was specified; exiting.\n"));
g_key_file_free (key_file);
+ g_strfreev (pieces);
g_strfreev (groups);
g_strfreev (keys);
@@ -1997,6 +2049,7 @@ set_overrides (GHashTable *schema_table,
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
+ g_strfreev (pieces);
g_strfreev (groups);
g_strfreev (keys);
@@ -2025,6 +2078,7 @@ set_overrides (GHashTable *schema_table,
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
+ g_strfreev (pieces);
g_strfreev (groups);
g_strfreev (keys);
@@ -2032,11 +2086,24 @@ set_overrides (GHashTable *schema_table,
}
}
- g_variant_unref (state->default_value);
- state->default_value = value;
+ if (desktop_id != NULL)
+ {
+ if (state->desktop_overrides == NULL)
+ state->desktop_overrides = g_variant_dict_new (NULL);
+
+ g_variant_dict_insert_value (state->desktop_overrides, desktop_id, value);
+ g_variant_unref (value);
+ }
+ else
+ {
+ g_variant_unref (state->default_value);
+ state->default_value = value;
+ }
+
g_free (string);
}
+ g_strfreev (pieces);
g_strfreev (keys);
}
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 7b0b6a162..5a91ec0d6 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
- value = g_settings_schema_key_get_translated_default (&skey);
-
- if (value == NULL)
- value = g_variant_ref (skey.default_value);
+ value = g_settings_schema_key_get_default_value (&skey);
g_settings_schema_key_clear (&skey);
@@ -1304,10 +1301,7 @@ g_settings_get_default_value (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, TRUE);
if (value == NULL)
- value = g_settings_schema_key_get_translated_default (&skey);
-
- if (value == NULL)
- value = g_variant_ref (skey.default_value);
+ value = g_settings_schema_key_get_default_value (&skey);
g_settings_schema_key_clear (&skey);
@@ -1360,10 +1354,7 @@ g_settings_get_enum (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
- value = g_settings_schema_key_get_translated_default (&skey);
-
- if (value == NULL)
- value = g_variant_ref (skey.default_value);
+ value = g_settings_schema_key_get_default_value (&skey);
result = g_settings_schema_key_to_enum (&skey, value);
g_settings_schema_key_clear (&skey);
@@ -1473,10 +1464,7 @@ g_settings_get_flags (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
- value = g_settings_schema_key_get_translated_default (&skey);
-
- if (value == NULL)
- value = g_variant_ref (skey.default_value);
+ value = g_settings_schema_key_get_default_value (&skey);
result = g_settings_schema_key_to_flags (&skey, value);
g_settings_schema_key_clear (&skey);
@@ -1751,6 +1739,13 @@ g_settings_get_mapped (GSettings *settings,
if (okay) goto okay;
}
+ if ((value = g_settings_schema_key_get_per_desktop_default (&skey)))
+ {
+ okay = mapping (value, &result, user_data);
+ g_variant_unref (value);
+ if (okay) goto okay;
+ }
+
if (mapping (skey.default_value, &result, user_data))
goto okay;
@@ -2661,6 +2656,20 @@ g_settings_binding_key_changed (GSettings *settings,
if (variant == NULL)
{
+ variant = g_settings_schema_key_get_per_desktop_default (&binding->key);
+ if (variant &&
+ !binding->get_mapping (&value, variant, binding->user_data))
+ {
+ g_error ("Per-desktop default value for key '%s' in schema '%s' "
+ "was rejected by the binding mapping function.",
+ binding->key.name, g_settings_schema_get_id (binding->key.schema));
+ g_variant_unref (variant);
+ variant = NULL;
+ }
+ }
+
+ if (variant == NULL)
+ {
variant = g_variant_ref (binding->key.default_value);
if (!binding->get_mapping (&value, variant, binding->user_data))
g_error ("The schema default value for key '%s' in schema '%s' "
diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h
index f54de3b34..5f996b4bc 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.h
@@ -37,6 +37,7 @@ struct _GSettingsSchemaKey
const GVariantType *type;
GVariant *minimum, *maximum;
GVariant *default_value;
+ GVariant *desktop_overrides;
gint ref_count;
};
@@ -58,6 +59,7 @@ gboolean g_settings_schema_key_type_check (GSettin
GVariant * g_settings_schema_key_range_fixup (GSettingsSchemaKey *key,
GVariant *value);
GVariant * g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key);
+GVariant * g_settings_schema_key_get_per_desktop_default (GSettingsSchemaKey *key);
gint g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value);
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 4e12243d8..42722892b 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -27,6 +27,7 @@
#include <glibintl.h>
#include <locale.h>
#include <string.h>
+#include <stdlib.h>
/**
* SECTION:gsettingsschema
@@ -1283,6 +1284,11 @@ g_settings_schema_key_init (GSettingsSchemaKey *key,
endian_fixup (&key->maximum);
break;
+ case 'd':
+ g_variant_get (data, "@a{sv}", &key->desktop_overrides);
+ endian_fixup (&key->desktop_overrides);
+ break;
+
default:
g_warning ("unknown schema extension '%c'", code);
break;
@@ -1303,6 +1309,9 @@ g_settings_schema_key_clear (GSettingsSchemaKey *key)
if (key->maximum)
g_variant_unref (key->maximum);
+ if (key->desktop_overrides)
+ g_variant_unref (key->desktop_overrides);
+
g_variant_unref (key->default_value);
g_settings_schema_unref (key->schema);
@@ -1410,6 +1419,35 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
return value;
}
+GVariant *
+g_settings_schema_key_get_per_desktop_default (GSettingsSchemaKey *key)
+{
+ static const gchar * const *current_desktops;
+ GVariant *value = NULL;
+ gint i;
+
+ if (!key->desktop_overrides)
+ return NULL;
+
+ if (g_once_init_enter (&current_desktops))
+ {
+ const gchar *xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP");
+ gchar **tmp;
+
+ if (xdg_current_desktop != NULL && xdg_current_desktop[0] != '\0')
+ tmp = g_strsplit (xdg_current_desktop, ":", -1);
+ else
+ tmp = g_new0 (gchar *, 0 + 1);
+
+ g_once_init_leave (&current_desktops, (const gchar **) tmp);
+ }
+
+ for (i = 0; value == NULL && current_desktops[i] != NULL; i++)
+ value = g_variant_lookup_value (key->desktop_overrides, current_desktops[i], NULL);
+
+ return value;
+}
+
gint
g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value)
@@ -1699,6 +1737,9 @@ g_settings_schema_key_get_default_value (GSettingsSchemaKey *key)
value = g_settings_schema_key_get_translated_default (key);
if (!value)
+ value = g_settings_schema_key_get_per_desktop_default (key);
+
+ if (!value)
value = g_variant_ref (key->default_value);
return value;

191
glib2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 8 01:28:15 UTC 2017 - xwang@suse.com
- Add glib2-gsettings-overrides-per-session.patch: gsettings
default value can be overridden depending on session
(bgo#746592 bsc#1070090).
-------------------------------------------------------------------
Wed Dec 6 08:03:38 UTC 2017 - dimstar@opensuse.org
@ -614,7 +621,7 @@ Sat Dec 19 03:42:41 UTC 2015 - damjanovic.ivo@gmail.com
bgo#728099, bgo#757372, bgo#756475, bgo#749092, bgo#759408,
bgo#759134, bgo#757374, bgo#758641.
+ Updated translations.
-------------------------------------------------------------------
Fri Nov 27 12:41:09 UTC 2015 - zaitor@opensuse.org
@ -1793,7 +1800,7 @@ Wed Dec 26 18:01:49 UTC 2012 - zaitor@opensuse.org
to include the relevant OS-dependent networking headers. This
does not really abstract away unix-vs-windows however; error
codes, in particular, are incompatible.
+ Bugs fixed: bgo#686895, bgo#688704, bgo#602715, bgo#688377,
+ Bugs fixed: bgo#686895, bgo#688704, bgo#602715, bgo#688377,
bgo#688180, bgo#688497, bgo#688319, bgo#688886,bgo#681685,
bgo#689037, bgo#688931, bgo#688681, bgo#652650, bgo#664627,
bgo#688419, bgo#684145, bgo#675516, bgo#689538, bgo#679683,
@ -1827,7 +1834,7 @@ Tue Nov 27 09:49:31 UTC 2012 - dimstar@opensuse.org
+ The ->constructed vfunc is now called after all properties are
set
+ g_type_init() is no longer necessary and has been deprecated
+ GTask (the new GAsyncResult implementation) has landed
+ GTask (the new GAsyncResult implementation) has landed
+ GLib version macros updated
+ Update to Unicode 6.2
+ Thread safety fixes for GFileMonitor in non-default main
@ -3522,7 +3529,7 @@ Fri Jul 30 10:44:08 CEST 2010 - dimstar@opensuse.org
- bgo#624484 GDBusSubtreeDispatchFunc clarification
- bgo#624754 gdbusaddress.c missing sys/wait.h
- bgo#624968 div by zero in g_malloc_n family
- bgo#624991 GSettings mapping for G_TYPE_STRV
- bgo#624991 GSettings mapping for G_TYPE_STRV
- bgo#625383 Add missing GI annotations
+ Updated translations.
@ -3951,10 +3958,10 @@ Mon Sep 7 14:25:06 CEST 2009 - lmedinas@opensuse.org
- Update to version 2.21.6:
+ Minor API additions:
- g_mkstemp_full is a variant of g_mkstemp that allows to
- g_mkstemp_full is a variant of g_mkstemp that allows to
specify flags and permissions
+ Bugs fixed:
- bgo#593232 g_rand_new: read no more than requested from
- bgo#593232 g_rand_new: read no more than requested from
/dev/urandom
- bgo#591995 use saved errno
- bgo#589491 g_time_val_from_iso8601 doesn't handle some cases
@ -4229,7 +4236,7 @@ Tue Feb 3 11:17:27 EST 2009 - mboman@suse.de
- Update to version 2.19.6:
+ New format macro to print goffset data: G_OFFSET_FORMAT
+ GIO:
+ GIO:
* Add a GFilter{Input,Output}Stream::close-base-stream
properties which determine whether the base stream will be
closed when the filter stream is finalized.
@ -4328,7 +4335,7 @@ Wed Dec 10 12:34:56 CET 2008 - olh@suse.de
-------------------------------------------------------------------
Tue Dec 9 06:30:50 EST 2008 - mboman@suse.de
- Update to version 2.19.2:
+ GIO:
+ GIO:
- GIcon serialization support
- new file attribute for preview images
- new function to get the full commandline
@ -4373,7 +4380,7 @@ Mon Nov 24 12:34:56 CET 2008 - olh@suse.de
-------------------------------------------------------------------
Tue Nov 11 16:54:09 CET 2008 - ro@suse.de
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-------------------------------------------------------------------
Thu Nov 6 13:42:27 CST 2008 - federico@novell.com
@ -4403,7 +4410,7 @@ Mon Oct 6 16:36:52 CEST 2008 - sbrabec@suse.cz
-------------------------------------------------------------------
Mon Sep 29 00:25:40 CEST 2008 - ro@suse.de
- add gcc-c++ to buildreqires to work around libtool problem
- add gcc-c++ to buildreqires to work around libtool problem
-------------------------------------------------------------------
Fri Sep 19 10:09:52 CDT 2008 - maw@suse.de
@ -4490,12 +4497,12 @@ Thu Jul 31 17:19:22 CDT 2008 - maw@suse.de
* New API to handle content types: g_mount_guess_content_type,
g_content_type_guess_for_tree
* Export the eject-button signal on the volume monitor class
* New API to enable out-of-process volume monitors:
* New API to enable out-of-process volume monitors:
g_volume_get_activation_root
+ GObject:
* New API to handle signals without slots in the class
structure: g_signal_new_class_handler and
g_signal_override_class_handler
g_signal_override_class_handler
+ Internationalization:
+ Add an NC_ macro that is a no-op equivalent of C_
+ GMarkup:
@ -4525,7 +4532,7 @@ Fri Jul 25 14:04:56 CEST 2008 - sbrabec@suse.cz
-------------------------------------------------------------------
Sun Jul 20 02:45:18 CEST 2008 - crrodriguez@suse.de
- fix build
- fix build
- incidentally, this also fixes a problem on PPC caused by an
endianness bug; the GTK2 build failed causing a chain of errors
resulting in misleading libglitz.la related build failures.
@ -4555,7 +4562,7 @@ Wed Jun 18 22:13:18 CEST 2008 - maw@suse.de
+ New functions: g_dgettext() and g_dngettext(), wrappers
for corresponding gettext functions with added functionaliy
+ Support the latest version of the shared-mime spec, including
icons for mime types
icons for mime types
+ New function: g_themed_icon_prepend_name()
+ Bugs fixed: bgo#35418, bgo#28715, bgo#28714, bgo#37260,
bgo#30527, bgo#30526, bgo#28719, bgo#28172, bgo#28717,
@ -4580,7 +4587,7 @@ Fri Jun 6 19:45:59 CEST 2008 - maw@suse.de
+ Fix library version of GIO; GLib 2.16 shipped with
libgio-2.0.so.0.0.0
+ Use the GIO_EXTRA_MODULES environment variable to find
additional GIO modules
additional GIO modules
+ G_GNUC_ALLOC_SIZE: New macro that wraps the gcc alloc_size
function attribute
+ g_checksum_reset: New function to reset the state of a
@ -4598,7 +4605,7 @@ Fri Jun 6 19:45:59 CEST 2008 - maw@suse.de
bgo#501651, bgo#519026, bgo#534319, bgo#534137, bgo#517419,
bgo#526796, bgo#530196, bgo#532965, bgo#525553, bgo#526572,
bgo#528648, bgo#535021, bgo#521513, bgo#528433, bgo#533369,
bgo#521045, bgo#521672, bgo#521946, bgo#522335, bgo#523015,
bgo#521045, bgo#521672, bgo#521946, bgo#522335, bgo#523015,
bgo#523019, bgo#523338, bgo#524350, bgo#524579, bgo#524742,
bgo#524950, bgo#525866, bgo#526320, bgo#527132, bgo#532852,
bgo#534759, bgo#534764, bgo#521851, bgo#524344, bgo#525060,
@ -4653,7 +4660,7 @@ Thu May 1 12:52:01 CEST 2008 - vuntz@suse.de
-------------------------------------------------------------------
Tue Apr 29 17:32:20 CEST 2008 - cthiel@suse.de
- obsolete glib2-<arch> via baselibs.conf
- obsolete glib2-<arch> via baselibs.conf
-------------------------------------------------------------------
Tue Apr 22 03:55:09 CEST 2008 - hpj@suse.de
@ -4710,7 +4717,7 @@ Fri Apr 4 16:18:40 CEST 2008 - maw@suse.de
- Merge the BETA and STABLE branches
- Remove, pending further discussion, libgio-2_0-0's
recommendation of gvfs.
recommendation of gvfs.
-------------------------------------------------------------------
Tue Apr 1 19:16:57 CEST 2008 - maw@suse.de
@ -4770,7 +4777,7 @@ Thu Mar 13 13:01:50 CET 2008 - rodrigo@suse.de
- Update to version 2.16.1:
* Fix a crash in g_themed_icon_new
* Update the included PCRE to 7.6
- Tag patches
- Tag patches
-------------------------------------------------------------------
Fri Feb 29 02:48:06 CET 2008 - jpr@suse.de
@ -4785,8 +4792,8 @@ Fri Feb 29 02:48:06 CET 2008 - jpr@suse.de
* Only show mounts in /media and ~
* g_file_contains_file has been renamed to g_file_has_prefix
+ Win32:
* g_win32_get_package_installation_directory_of_module: new
function which supersedes
* g_win32_get_package_installation_directory_of_module: new
function which supersedes
g_win32_get_package_installation_directory
* Use alertable wait functions so that I/O completion routines or
user-mode Asynchronous Procedure Calls can be run
@ -4846,7 +4853,7 @@ Thu Jan 24 07:51:55 CST 2008 - maw@suse.de
- Update to version 2.15.3:
+ GChecksum:
* g_checksum_update can accept nul-terminated strings
* The MD5 implementation works correctly on buffers
* The MD5 implementation works correctly on buffers
that are longer than 64 bytes
+ GIO:
* Don't include a copy of the inotify headers, rely on
@ -4993,8 +5000,8 @@ Thu Jul 19 17:34:48 CEST 2007 - maw@suse.de
in this scenario.
* New functions g_once_init_enter() and g_once_init_leave() make
it easier to write threadsafe one-time initialization functions
it easier to write threadsafe one-time initialization functions
* Bugs fixed: [against bugzilla.gnome.org]
454473 Simple XML Subset Parser terminates on invalid XML
445813 g_module_open error, add file name
@ -5026,14 +5033,14 @@ Thu Jul 5 18:51:39 CEST 2007 - maw@suse.de
* Add GRegex, an implementation of Perl regular expressions,
based on PCRE.
* Use Posix monotonic clocks instead of gettimeofday()
for GTimer when available.
* Support static initialization of GQeues with G_QUEUE_INIT,
g_queue_init() and g_queue_clear().
* Add g_string_chunk_clear() for clearing a
* Add g_string_chunk_clear() for clearing a
GStringChunk.
* Add g_unichar_get_script() to obtain Unicode
@ -5042,7 +5049,7 @@ Thu Jul 5 18:51:39 CEST 2007 - maw@suse.de
* Add g_unichar_iszerowidth() to obtain information
about zero-width characters.
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
type attribute.
* G_GNUC_INTERNAL has a working definition for the
@ -5081,7 +5088,7 @@ Wed Mar 21 12:38:24 CST 2007 - maw@suse.de
-------------------------------------------------------------------
Mon Mar 5 18:06:21 CET 2007 - jhargadon@suse.de
- removed obsolete patch glib2-unexpanded-variables.patch (#249204)
- removed obsolete patch glib2-unexpanded-variables.patch (#249204)
-------------------------------------------------------------------
Thu Feb 22 15:31:17 CET 2007 - sbrabec@suse.cz
@ -5122,13 +5129,13 @@ Fri Feb 16 10:15:33 CST 2007 - maw@suse.de
316434 glib-2.6.6 fails to compile on AIX 5.1 due to assembler errors
172406 gconvert.c, function open_converter
327800 Hang during self-test of threads
343825 Double expansion in m4macros/glib-gettext.m4 will fail with
343825 Double expansion in m4macros/glib-gettext.m4 will fail with
newer autoconf
380801 build on Solaris does not work out of the box
386252 HEAD broken with last commit
138153 g_utf8_next_char problem with gcc -Wcast-qual
161288 glib doesn't configure well on Mac OS < 10.3
321977 GIOChannel ref_count private variable should be gint instead
321977 GIOChannel ref_count private variable should be gint instead
of guint
343191 GKeyFile silently loses values
346373 test failures in glib-2.10.3 on NetBSD
@ -5145,7 +5152,7 @@ Fri Feb 16 10:15:33 CST 2007 - maw@suse.de
362543 Compilation fail when configured with --disable-visibility
362918 monotonic clock test uses AC_TRY_RUN
369908 g_key_file_get_string not stripping final space
373864 sanity_check is a bash script
373864 sanity_check is a bash script
(These bugs are viewable on bugzilla.gnome.org)
- Make GKeyFile accept keys that are commonly used
- GKeyFile:
@ -5176,7 +5183,7 @@ Thu Dec 7 17:13:36 CET 2006 - sbrabec@suse.cz
Thu Nov 2 23:02:26 CET 2006 - jhargadon@suse.de
- added a patch to m4macros/glib-gettext.m4 so that the build
variables expand properly.
variables expand properly.
-------------------------------------------------------------------
Mon Oct 2 19:30:09 CEST 2006 - jhargadon@suse.de
@ -5189,7 +5196,7 @@ Mon Oct 2 19:30:09 CEST 2006 - jhargadon@suse.de
353580 va_copy detection breaks if user sets
CFLAGS=-Werror-implicit-function-declaration
354522 Small problem with PLT hiding 6 symbols
358421 typos in gmain.c
358421 typos in gmain.c
- New and updated translations
-------------------------------------------------------------------
@ -5204,7 +5211,7 @@ Tue Sep 12 20:11:02 CEST 2006 - jhargadon@suse.de
- 336114 desktop locks immediately after changing the system clock
- 351853 GKeyFile creates non-UTF-8 error messages
- Translation updates (fr,hu,ja,ku,lt,lv,ml,or,
pt,ru,sv,vi,zh_CN)
pt,ru,sv,vi,zh_CN)
-------------------------------------------------------------------
Wed Aug 30 01:42:05 CEST 2006 - jhargadon@suse.de
@ -5212,7 +5219,7 @@ Wed Aug 30 01:42:05 CEST 2006 - jhargadon@suse.de
- update to version 2.12.2
- Normalization is following Unicode TR #29
- 348491 g_utf8_strup() and g_utf8_strdown() returns
string with NUL bytes
string with NUL bytes
- 349825 GKeyFile always inserts a newline before a group
- 347842 g_unichar_isxdigit() is too general about what
it considers a digit
@ -5246,7 +5253,7 @@ Tue Jul 18 23:39:54 CEST 2006 - rml@suse.de
- Update to glib 2.12:
- Lots of bug fixes
- GSlice!
- Drop upstream patches
- Drop upstream patches
-------------------------------------------------------------------
Tue Jun 6 20:36:15 CEST 2006 - sbrabec@suse.cz
@ -5276,7 +5283,7 @@ Wed Jan 18 04:25:00 CET 2006 - gekker@suse.de
Tue Jan 17 04:49:13 CET 2006 - zsu@suse.de
- Fixed implicit cast issue introduced by bugfix #316221
http://bugzilla.gnome.org/show_bug.cgi?id=327022
http://bugzilla.gnome.org/show_bug.cgi?id=327022
-------------------------------------------------------------------
Fri Jan 13 12:54:23 CET 2006 - sbrabec@suse.cz
@ -5318,7 +5325,7 @@ Wed Sep 28 17:26:36 CEST 2005 - gekker@suse.de
-------------------------------------------------------------------
Tue Aug 23 18:56:26 CEST 2005 - gekker@suse.de
- Update to version 2.8.1
- Update to version 2.8.1
-------------------------------------------------------------------
Mon Aug 15 13:11:08 CEST 2005 - rodrigo@suse.de
@ -5328,17 +5335,17 @@ Mon Aug 15 13:11:08 CEST 2005 - rodrigo@suse.de
-------------------------------------------------------------------
Wed Aug 10 23:20:12 CEST 2005 - gekker@suse.de
- Update to version 2.7.7
- Update to version 2.7.7
-------------------------------------------------------------------
Mon Aug 1 19:07:15 CEST 2005 - gekker@suse.de
- Update to version 2.7.4
- Update to version 2.7.4
-------------------------------------------------------------------
Thu Jul 21 17:56:56 CEST 2005 - gekker@suse.de
- Update to version 2.7.2
- Update to version 2.7.2
-------------------------------------------------------------------
Thu Jun 23 17:44:20 CEST 2005 - sbrabec@suse.cz
@ -5349,12 +5356,12 @@ Thu Jun 23 17:44:20 CEST 2005 - sbrabec@suse.cz
Fri Jun 17 00:05:40 CEST 2005 - gekker@suse.de
- Update to version 2.7.0.
- Fix SENTINEL patch to work with upstream version.
- Fix SENTINEL patch to work with upstream version.
-------------------------------------------------------------------
Tue Jun 7 19:20:24 CEST 2005 - gekker@suse.de
- Update to version 2.6.4.
- Update to version 2.6.4.
-------------------------------------------------------------------
Tue May 31 17:13:52 CEST 2005 - schwab@suse.de
@ -5401,18 +5408,18 @@ Sun Jan 16 07:00:07 CET 2005 - clahey@suse.de
-------------------------------------------------------------------
Mon Jan 3 20:46:08 CET 2005 - gekker@suse.de
- Update to version 2.6.0
- Update to version 2.6.0
-------------------------------------------------------------------
Wed Dec 22 17:00:30 CET 2004 - ro@suse.de
- remove no translation (obsolete with nb present)
- remove no translation (obsolete with nb present)
-------------------------------------------------------------------
Wed Dec 15 00:31:10 CET 2004 - gekker@suse.de
- Update version to 2.5.7.
- Remove the no-no patch, as it is upstreamed.
- Remove the no-no patch, as it is upstreamed.
-------------------------------------------------------------------
Tue Nov 16 15:15:34 CET 2004 - clahey@suse.de
@ -5448,7 +5455,7 @@ Wed Aug 25 11:46:29 CEST 2004 - kukuk@suse.de
-------------------------------------------------------------------
Tue Jul 6 13:42:20 CEST 2004 - coolo@suse.de
- glib2-devel requires the very same version of glib2
- glib2-devel requires the very same version of glib2
-------------------------------------------------------------------
Tue Jun 22 14:46:29 CEST 2004 - sbrabec@suse.cz
@ -5526,12 +5533,12 @@ Wed Sep 24 12:33:24 CEST 2003 - sbrabec@suse.cz
-------------------------------------------------------------------
Mon Sep 15 15:10:21 CEST 2003 - sf@suse.de
- remove debug flags, add -O2 again
- remove debug flags, add -O2 again
-------------------------------------------------------------------
Thu Sep 11 11:07:14 CEST 2003 - sf@suse.de
- fix segfault in eog on AMD64 [bug 30483]
- fix segfault in eog on AMD64 [bug 30483]
-------------------------------------------------------------------
Thu Aug 28 15:40:17 CEST 2003 - sbrabec@suse.cz
@ -5560,12 +5567,12 @@ Tue Mar 11 13:10:40 CET 2003 - olh@suse.de
Mon Feb 3 08:51:24 CET 2003 - hhetter@suse.de
- updated to version 2.2.1, from changes:
* Win32
* Win32
- Improve handling of stderr/stdout
- Install .def files
- Fix quoting for GSpawn
- Fix quoting for GSpawn
- Miscellaneous bug fixes
* configure fixes
* configure fixes
* New and updated translations
-------------------------------------------------------------------
@ -5583,54 +5590,54 @@ Thu Jan 09 15:29:54 CET 2003 - sbrabec@suse.cz
Tue Nov 5 10:20:12 CET 2002 - hhetter@suse.de
- updated to version 2.0.7, bugfix release:
* Fix C++ warnings in gtype.h
* Fix g_type_fundamental_next()
* Fix various missing includes of config.h
* Handle main loop initialization before g_thread_init
* Fix C++ warnings in gtype.h
* Fix g_type_fundamental_next()
* Fix various missing includes of config.h
* Handle main loop initialization before g_thread_init
* Various 64-bit fixes
* Fix GPoll on Win32
* Fix bug with buffering on UTF-8 IOChannels
* Misc bug and build fixes
* Fix GPoll on Win32
* Fix bug with buffering on UTF-8 IOChannels
* Misc bug and build fixes
* Updated and new translations (be,cs,de,fa,it,lv,pt_BR,tr)
-------------------------------------------------------------------
Tue Aug 13 13:34:18 CEST 2002 - hhetter@suse.de
- gtk-doc usage conditional
- gtk-doc usage conditional
-------------------------------------------------------------------
Tue Aug 13 08:53:02 CEST 2002 - hhetter@suse.de
- correct URL and Source tag in specfile (#17638)
- correct URL and Source tag in specfile (#17638)
-------------------------------------------------------------------
Thu Aug 8 09:15:07 CEST 2002 - hhetter@suse.de
- devel package requires glib2
- devel package requires glib2
-------------------------------------------------------------------
Mon Aug 5 09:45:53 CEST 2002 - hhetter@suse.de
- updated to version 2.0.6, fron changes:
* Fix problem with interface prerequisites
* Clean up debug spew from GObject
* Compiler warning fixes
* Fix some problems with g_build_path()
* Fixes for --disable-debug
* Threading fixes
* Documentation fixes
* Misc bug fixes
* Fix problem with interface prerequisites
* Clean up debug spew from GObject
* Compiler warning fixes
* Fix some problems with g_build_path()
* Fixes for --disable-debug
* Threading fixes
* Documentation fixes
* Misc bug fixes
* Updated translations (bg,ko,vi)
-------------------------------------------------------------------
Mon Jun 17 18:32:00 CEST 2002 - jordi@suse.de
- Updated to version 2.0.4
* Fix some 64-bit problems
* Add note about Tru64 iconv to INSTALL
* Fix problem with timouts > MAXINT
* Updated translations
* Fix some 64-bit problems
* Add note about Tru64 iconv to INSTALL
* Fix problem with timouts > MAXINT
* Updated translations
-------------------------------------------------------------------
Fri Jun 14 12:23:44 CEST 2002 - ro@suse.de
@ -5641,7 +5648,7 @@ Fri Jun 14 12:23:44 CEST 2002 - ro@suse.de
-------------------------------------------------------------------
Tue Jun 4 08:56:39 CEST 2002 - hhetter@suse.de
- updated to version 2.0.3
- updated to version 2.0.3
-------------------------------------------------------------------
Thu Apr 25 16:50:03 CEST 2002 - meissner@suse.de
@ -5656,53 +5663,53 @@ Tue Apr 9 09:57:41 CEST 2002 - schwab@suse.de
-------------------------------------------------------------------
Mon Apr 8 10:18:54 CEST 2002 - hhetter@suse.de
- updated to version 2.0.1
- updated to version 2.0.1
-------------------------------------------------------------------
Thu Jan 31 13:41:13 CET 2002 - hhetter@suse.de
- updated to version 1.3.13 [GNOME desktop alpha2]
- updated to version 1.3.13 [GNOME desktop alpha2]
-------------------------------------------------------------------
Fri Jan 11 10:43:56 CET 2002 - hhetter@suse.de
- updated to version 1.3.12
- updated to version 1.3.12
-------------------------------------------------------------------
Tue Dec 11 14:11:28 CET 2001 - ro@suse.de
- export LIBRARY_PATH for broken libtool
- export LIBRARY_PATH for broken libtool
-------------------------------------------------------------------
Tue Nov 27 11:42:06 CET 2001 - hhetter@suse.de
- updated to version 1.3.11, changes include:
* Win32 fixes
* Documentation improvements
* Portable directory handling API
* Threading fixes
* Fix excess relocations in Unicode tables
* Fix gpattern for UTF-8
* Support overriding class closures
* Win32 fixes
* Documentation improvements
* Portable directory handling API
* Threading fixes
* Fix excess relocations in Unicode tables
* Fix gpattern for UTF-8
* Support overriding class closures
* Support for derivation from G_TYPE_POINTER
* Hide pointers to type information inside GType to reduce locking
* Adds check for direct inclusion of gobject/*.h
* GObject API cleanups
* Adds check for direct inclusion of gobject/*.h
* GObject API cleanups
-------------------------------------------------------------------
Tue Nov 20 16:06:51 CET 2001 - ro@suse.de
- really build libgmodule, libgobject and libgthread
- really build libgmodule, libgobject and libgthread
-------------------------------------------------------------------
Thu Nov 15 09:50:31 CET 2001 - hhetter@suse.de
- fixed build to provide libgmodule and libgobject
- fixed build to provide libgmodule and libgobject
-------------------------------------------------------------------
Tue Nov 13 11:09:57 CET 2001 - hhetter@suse.de
- updated to version 1.3.10
- updated to version 1.3.10
-------------------------------------------------------------------
Mon Oct 1 14:25:44 CEST 2001 - hhetter@suse.de

3
glib2.spec
View File

@ -53,6 +53,8 @@ Patch14: glib2-dbus-socket-path.patch
Patch16: glib2-gdbus-codegen-version.patch
# PATCH-FIX-UPSTREAM glib2-gtester-report-py3.patch bgo#791298 boo#1071378 dimstar@opensuse.org -- gtester-reporter fails to run with python3
Patch17: glib2-gtester-report-py3.patch
# PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 xwang@suse.com -- gsettings default value can be overridden depending on session
Patch18: glib2-gsettings-overrides-per-session.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -268,6 +270,7 @@ translation-update-upstream
%patch14 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
cp -a %{SOURCE4} gnome_defaults.conf
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then