r2793 - in /unstable/evolution-data-server/debian: changelog patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch patches/0001-source_registry_server_process_file_monitor_event-Co.patch patches/series
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Thu Oct 1 12:03:39 UTC 2015
Author: laney
Date: Thu Oct 1 12:03:37 2015
New Revision: 2793
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2793
Log:
* Cherry-pick some patches which were applied upstream
- d/p/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch: Fix
account settings with new glib (≥ 2.45.8) (Closes: #800474)
- d/p/0001-source_registry_server_process_file_monitor_event-Co.patch: Fix
an invalid unref which can lead to a crash at worst and runtime warnings
at best.
Added:
unstable/evolution-data-server/debian/patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch
unstable/evolution-data-server/debian/patches/0001-source_registry_server_process_file_monitor_event-Co.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/patches/series
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2793&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Thu Oct 1 12:03:37 2015
@@ -1,3 +1,14 @@
+evolution-data-server (3.16.5-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick some patches which were applied upstream
+ - d/p/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch: Fix
+ account settings with new glib (≥ 2.45.8) (Closes: #800474)
+ - d/p/0001-source_registry_server_process_file_monitor_event-Co.patch: Fix
+ an invalid unref which can lead to a crash at worst and runtime warnings
+ at best.
+
+ -- Iain Lane <laney at debian.org> Thu, 01 Oct 2015 09:36:08 +0100
+
evolution-data-server (3.16.5-1) unstable; urgency=medium
* New upstream release 3.16.5 and 3.16.4
Added: unstable/evolution-data-server/debian/patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch?rev=2793&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch (added)
+++ unstable/evolution-data-server/debian/patches/0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch Thu Oct 1 12:03:37 2015
@@ -0,0 +1,235 @@
+From 5ee2b0781a26e28d7457c5562f61d5b7c049dbe4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Thu, 17 Sep 2015 15:24:12 +0200
+Subject: [PATCH] Bug 755075 - Recent glib 2.45.8 change breaks account
+ settings
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800474
+
+---
+ libedataserver/e-source-camel.c | 201 ++++++++++++++++++++++++++++++----------
+ 1 file changed, 150 insertions(+), 51 deletions(-)
+
+diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c
+index b46f133..000e6b7 100644
+--- a/libedataserver/e-source-camel.c
++++ b/libedataserver/e-source-camel.c
+@@ -126,12 +126,7 @@ G_DEFINE_ABSTRACT_TYPE (
+ e_source_camel,
+ E_TYPE_SOURCE_EXTENSION)
+
+-/* XXX A function like this belongs in GObject. I may yet propose it,
+- * GParamSpecClass still has some reserved slots. This fiddles with
+- * GParamSpec fields that are supposed to be private to GObject, but
+- * I have no other choice.
+- *
+- * XXX Historical note, originally I tried (ab)using override properties
++/* XXX Historical note, originally I tried (ab)using override properties
+ * in ESourceCamel, which redirected to the equivalent CamelSettings
+ * property. Seemed to work at first, and I was proud of my clever
+ * hack, but it turns out g_object_class_list_properties() excludes
+@@ -141,53 +136,157 @@ static GParamSpec *
+ param_spec_clone (GParamSpec *pspec)
+ {
+ GParamSpec *clone;
+- GTypeQuery query;
+-
+- /* Query the instance size. */
+- g_type_query (G_PARAM_SPEC_TYPE (pspec), &query);
+-
+- /* Start with a memcpy()'d buffer. */
+- clone = g_slice_alloc0 (query.instance_size);
+- memcpy (clone, pspec, query.instance_size);
+-
+- /* This sort of mimics g_param_spec_init(). */
+-
+-#define PARAM_FLOATING_FLAG 0x2 /* from gparam.c */
+- g_datalist_set_flags (&clone->qdata, PARAM_FLOATING_FLAG);
+- clone->ref_count = 1;
+-
+- /* Clear the owner_type. */
+- clone->owner_type = G_TYPE_INVALID;
+-
+- /* Clear the param_id. */
+- clone->param_id = 0;
+-
+- /* This sort of mimics g_param_spec_internal(). */
+-
+- /* Param name should already be canonicalized and interned. */
+-
+- /* Always copy the nickname. */
+- clone->flags &= ~G_PARAM_STATIC_NICK;
+- clone->_nick = g_strdup (g_param_spec_get_nick (pspec));
+-
+- /* Always copy the blurb. */
+- clone->flags &= ~G_PARAM_STATIC_BLURB;
+- clone->_blurb = g_strdup (g_param_spec_get_blurb (pspec));
+-
+- /* Handle special cases. */
+-
+- if (G_IS_PARAM_SPEC_STRING (clone)) {
+- GParamSpecString *clone_s;
+-
+- clone_s = (GParamSpecString *) clone;
+- clone_s->default_value = g_strdup (clone_s->default_value);
++ GParamFlags flags;
++ const gchar *name, *nick, *blurb;
++
++ name = g_param_spec_get_name (pspec);
++ nick = g_param_spec_get_nick (pspec);
++ blurb = g_param_spec_get_blurb (pspec);
++ flags = (pspec->flags & ~(G_PARAM_STATIC_STRINGS));
++
++ if (G_IS_PARAM_SPEC_BOOLEAN (pspec)) {
++ GParamSpecBoolean *pspec_boolean = G_PARAM_SPEC_BOOLEAN (pspec);
++
++ clone = g_param_spec_boolean (name, nick, blurb,
++ pspec_boolean->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_CHAR (pspec)) {
++ GParamSpecChar *pspec_char = G_PARAM_SPEC_CHAR (pspec);
++
++ clone = g_param_spec_char (name, nick, blurb,
++ pspec_char->minimum,
++ pspec_char->maximum,
++ pspec_char->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_UCHAR (pspec)) {
++ GParamSpecUChar *pspec_uchar = G_PARAM_SPEC_UCHAR (pspec);
++
++ clone = g_param_spec_uchar (name, nick, blurb,
++ pspec_uchar->minimum,
++ pspec_uchar->maximum,
++ pspec_uchar->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_INT (pspec)) {
++ GParamSpecInt *pspec_int = G_PARAM_SPEC_INT (pspec);
++
++ clone = g_param_spec_int (name, nick, blurb,
++ pspec_int->minimum,
++ pspec_int->maximum,
++ pspec_int->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_UINT (pspec)) {
++ GParamSpecUInt *pspec_uint = G_PARAM_SPEC_UINT (pspec);
++
++ clone = g_param_spec_uint (name, nick, blurb,
++ pspec_uint->minimum,
++ pspec_uint->maximum,
++ pspec_uint->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_LONG (pspec)) {
++ GParamSpecLong *pspec_long = G_PARAM_SPEC_LONG (pspec);
++
++ clone = g_param_spec_long (name, nick, blurb,
++ pspec_long->minimum,
++ pspec_long->maximum,
++ pspec_long->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_ULONG (pspec)) {
++ GParamSpecULong *pspec_ulong = G_PARAM_SPEC_ULONG (pspec);
++
++ clone = g_param_spec_ulong (name, nick, blurb,
++ pspec_ulong->minimum,
++ pspec_ulong->maximum,
++ pspec_ulong->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_INT64 (pspec)) {
++ GParamSpecInt64 *pspec_int64 = G_PARAM_SPEC_INT64 (pspec);
++
++ clone = g_param_spec_int64 (name, nick, blurb,
++ pspec_int64->minimum,
++ pspec_int64->maximum,
++ pspec_int64->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_UINT64 (pspec)) {
++ GParamSpecUInt64 *pspec_uint64 = G_PARAM_SPEC_UINT64 (pspec);
++
++ clone = g_param_spec_uint64 (name, nick, blurb,
++ pspec_uint64->minimum,
++ pspec_uint64->maximum,
++ pspec_uint64->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_FLOAT (pspec)) {
++ GParamSpecFloat *pspec_float = G_PARAM_SPEC_FLOAT (pspec);
++
++ clone = g_param_spec_float (name, nick, blurb,
++ pspec_float->minimum,
++ pspec_float->maximum,
++ pspec_float->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_DOUBLE (pspec)) {
++ GParamSpecDouble *pspec_double = G_PARAM_SPEC_DOUBLE (pspec);
++
++ clone = g_param_spec_double (name, nick, blurb,
++ pspec_double->minimum,
++ pspec_double->maximum,
++ pspec_double->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_ENUM (pspec)) {
++ GParamSpecEnum *pspec_enum = G_PARAM_SPEC_ENUM (pspec);
++
++ clone = g_param_spec_enum (name, nick, blurb,
++ pspec->value_type,
++ pspec_enum->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_FLAGS (pspec)) {
++ GParamSpecFlags *pspec_flags = G_PARAM_SPEC_FLAGS (pspec);
++
++ clone = g_param_spec_flags (name, nick, blurb,
++ pspec->value_type,
++ pspec_flags->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_STRING (pspec)) {
++ GParamSpecString *pspec_string = G_PARAM_SPEC_STRING (pspec);
++
++ clone = g_param_spec_string (name, nick, blurb,
++ pspec_string->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_PARAM (pspec)) {
++ clone = g_param_spec_param (name, nick, blurb,
++ pspec->value_type,
++ flags);
++ } else if (G_IS_PARAM_SPEC_BOXED (pspec)) {
++ clone = g_param_spec_boxed (name, nick, blurb,
++ pspec->value_type,
++ flags);
++ } else if (G_IS_PARAM_SPEC_POINTER (pspec)) {
++ clone = g_param_spec_pointer (name, nick, blurb, flags);
++ } else if (G_IS_PARAM_SPEC_OBJECT (pspec)) {
++ clone = g_param_spec_object (name, nick, blurb,
++ pspec->value_type,
++ flags);
++ } else if (G_IS_PARAM_SPEC_UNICHAR (pspec)) {
++ GParamSpecUnichar *pspec_unichar = G_PARAM_SPEC_UNICHAR (pspec);
++
++ clone = g_param_spec_unichar (name, nick, blurb,
++ pspec_unichar->default_value,
++ flags);
++ } else if (G_IS_PARAM_SPEC_GTYPE (pspec)) {
++ GParamSpecGType *pspec_gtype = G_PARAM_SPEC_GTYPE (pspec);
++
++ clone = g_param_spec_gtype (name, nick, blurb,
++ pspec_gtype->is_a_type,
++ flags);
++ } else if (G_IS_PARAM_SPEC_VARIANT (pspec)) {
++ GParamSpecVariant *pspec_variant = G_PARAM_SPEC_VARIANT (pspec);
++
++ clone = g_param_spec_variant (name, nick, blurb,
++ pspec_variant->type,
++ pspec_variant->default_value,
++ flags);
++ } else {
++ g_warn_if_reached ();
+ }
+
+- /* Some types we don't handle but shouldn't need to. */
+- g_warn_if_fail (!G_IS_PARAM_SPEC_VALUE_ARRAY (clone));
+- g_warn_if_fail (!G_IS_PARAM_SPEC_OVERRIDE (clone));
+- g_warn_if_fail (!G_IS_PARAM_SPEC_VARIANT (clone));
+-
+ return clone;
+ }
+
+--
+2.5.0
+
Added: unstable/evolution-data-server/debian/patches/0001-source_registry_server_process_file_monitor_event-Co.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/0001-source_registry_server_process_file_monitor_event-Co.patch?rev=2793&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/0001-source_registry_server_process_file_monitor_event-Co.patch (added)
+++ unstable/evolution-data-server/debian/patches/0001-source_registry_server_process_file_monitor_event-Co.patch Thu Oct 1 12:03:37 2015
@@ -0,0 +1,29 @@
+From a44a678d823aba8e2911c0ce367b56e94b814d47 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 23 Sep 2015 16:07:10 +0200
+Subject: [PATCH] source_registry_server_process_file_monitor_event - Correct
+ possible runtime warning
+
+When the source file is not loaded yet, then the corresponding ESource
+object is NULL, but the call calls g_object_unref() on it, which leads
+to a runtime warning, even harmless.
+---
+ libebackend/e-source-registry-server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
+index 7d34c66..4552c95 100644
+--- a/libebackend/e-source-registry-server.c
++++ b/libebackend/e-source-registry-server.c
+@@ -500,7 +500,7 @@ source_registry_server_process_file_monitor_event (gpointer key,
+ return;
+ }
+
+- g_object_unref (source);
++ g_clear_object (&source);
+ }
+
+ if (event_type == G_FILE_MONITOR_EVENT_CREATED) {
+--
+2.5.0
+
Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2793&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Thu Oct 1 12:03:37 2015
@@ -1 +1,3 @@
+0001-Bug-755075-Recent-glib-2.45.8-change-breaks-account-.patch
+0001-source_registry_server_process_file_monitor_event-Co.patch
01-noinst-libedbus-private.patch
More information about the pkg-evolution-commits
mailing list