Accepting request 84329 from home:vuntz:branches:GNOME:Factory

Update to 3.1.92

OBS-URL: https://build.opensuse.org/request/show/84329
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=107
This commit is contained in:
Vincent Untz 2011-09-22 12:02:09 +00:00 committed by Git OBS Bridge
parent 62add6fad1
commit 136717526c
5 changed files with 18 additions and 46 deletions

View File

@ -1,37 +0,0 @@
Index: evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
===================================================================
--- evolution-data-server-3.1.90.orig/libedataserver/e-data-server-util.c
+++ evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *hay
static gunichar
stripped_char (gunichar ch)
{
- gunichar *decomp, retval;
+#if GLIB_CHECK_VERSION(2,29,12)
+ gunichar decomp[4];
+#else
+ gunichar *decomp;
+#endif
+ gunichar retval;
GUnicodeType utype;
gsize dlen;
@@ -268,11 +273,18 @@ stripped_char (gunichar ch)
/* Convert to lowercase, fall through */
ch = g_unichar_tolower (ch);
case G_UNICODE_LOWERCASE_LETTER:
+#if GLIB_CHECK_VERSION(2,29,12)
+ if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
+ retval = decomp[0];
+ return retval;
+ }
+#else
if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
retval = decomp[0];
g_free (decomp);
return retval;
}
+#endif
break;
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d133d7de1cb2d5ca87b5de67048f01a47465a8f36e9a3a44f00f4eb8147ce8a
size 4593908

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:079adb52f34cec6f30f0bee9851f164746ed293e61ffc464e37a636cb86cbc8a
size 4614184

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 21 18:01:38 UTC 2011 - vuntz@opensuse.org
- Update to version 3.1.92:
+ Handle changes in the goa accounts list at runtime
+ imapx: Fix read of uninitialized memory from g_str_has_prefix
+ Various other code changes.
+ Bugs fixed: bgo#659282, bgo#659184, bgo#659079, bgo#659165,
bgo#655253, bgo#632153, bgo#658911, bgo#655728, bgo#655837,
bgo#654818,
+ Updated translations.
- Drop e-d-s-deprecated.patch: fixed upstream.
-------------------------------------------------------------------
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de

View File

@ -33,15 +33,12 @@ Name: evolution-data-server
%define _evo_version 3.2
License: LGPLv2+
Group: Development/Libraries/GNOME
Version: 3.1.91
Version: 3.1.92
Release: 1
# FIXME: parallel build is broken in 3.1.3, check in later versions if this works
Summary: Evolution Data Server
Url: http://www.gnome.org
Source0: http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM e-d-s-deprecated.patch bgo#655837 dimstar@opensuse.org -- g_unicode_canonical_decomposition is deprecated.
Patch0: e-d-s-deprecated.patch
BuildRequires: bison
BuildRequires: db-devel
%if %USE_EVOLDAP
@ -211,7 +208,6 @@ This package contains developer documentation.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
@ -229,7 +225,7 @@ translation-update-upstream
--enable-nntp=yes \
--enable-vala-bindings \
--disable-static
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
%install
%{makeinstall}