diff --git a/.gitignore b/.gitignore index 00938a2..2276090 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ evolution-data-server-2.31.5.tar.bz2 /evolution-data-server-3.17.90.tar.xz /evolution-data-server-3.17.91.tar.xz /evolution-data-server-3.17.92.tar.xz +/evolution-data-server-3.18.0.tar.xz diff --git a/evolution-data-server-param_spec_clone.patch b/evolution-data-server-param_spec_clone.patch deleted file mode 100644 index 3b00347..0000000 --- a/evolution-data-server-param_spec_clone.patch +++ /dev/null @@ -1,221 +0,0 @@ -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; - } - diff --git a/evolution-data-server.spec b/evolution-data-server.spec index f788ecc..37add47 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -32,14 +32,14 @@ ### Abstract ### Name: evolution-data-server -Version: 3.17.92 -Release: 2%{?dist} +Version: 3.18.0 +Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.17/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -53,8 +53,6 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12 # RH bug #243296 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=755075 -Patch02: evolution-data-server-param_spec_clone.patch ### Dependencies ### @@ -152,7 +150,6 @@ the functionality of the installed %{name} package. %setup -q %patch01 -p1 -b .fix-64bit-acinclude -%patch02 -p1 -b .param_spec_clone %build %if %{ldap_support} @@ -414,6 +411,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/installed-tests %changelog +* Mon Sep 21 2015 Milan Crha - 3.18.0-1 +- Update to 3.18.0 +- Remove a patch for compatibility with glib 2.45.8 (fixed upstream) + * Thu Sep 17 2015 Kalev Lember - 3.17.92-2 - Backport a patch for compatibility with glib 2.45.8 diff --git a/sources b/sources index 02e182d..6e85de5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -530de12760ed15c214737ed7aafb707a evolution-data-server-3.17.92.tar.xz +a0f234060313b0399e64ab0b09aca25a evolution-data-server-3.18.0.tar.xz