From 0a161d2235f6941a72009883a84c1c1d8736437e2beb5a5f186e64b2fdfed8f3 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Sep 2011 22:11:26 +0000 Subject: [PATCH] Accepting request 80756 from home:vuntz:branches:GNOME:Factory Update to 3.1.90 OBS-URL: https://build.opensuse.org/request/show/80756 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=103 --- baselibs.conf | 12 +++---- e-d-s-deprecated.patch | 39 ++++++++++++++++----- evolution-data-server-3.1.5.tar.bz2 | 3 -- evolution-data-server-3.1.90.tar.bz2 | 3 ++ evolution-data-server.changes | 51 +++++++++++++++++----------- evolution-data-server.spec | 4 +-- 6 files changed, 74 insertions(+), 38 deletions(-) delete mode 100644 evolution-data-server-3.1.5.tar.bz2 create mode 100644 evolution-data-server-3.1.90.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 65a49b6..d65d06d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libcamel-1_2-28 +libcamel-1_2-29 libebackend-1_2-1 -libebook-1_2-11 -libecal-1_2-9 -libedata-book-1_2-10 -libedata-cal-1_2-12 -libedataserver-1_2-14 +libebook-1_2-12 +libecal-1_2-10 +libedata-book-1_2-11 +libedata-cal-1_2-13 +libedataserver-1_2-15 libedataserverui-3_0-1 diff --git a/e-d-s-deprecated.patch b/e-d-s-deprecated.patch index 59a46a4..ff16779 100644 --- a/e-d-s-deprecated.patch +++ b/e-d-s-deprecated.patch @@ -1,14 +1,37 @@ -diff -ur evolution-data-server-3.1.4/libedataserver/e-data-server-util.c evolution-data-server-3.1.4.patched/libedataserver/e-data-server-util.c ---- evolution-data-server-3.1.4/libedataserver/e-data-server-util.c 2011-07-15 13:50:55.000000000 +0200 -+++ evolution-data-server-3.1.4.patched/libedataserver/e-data-server-util.c 2011-08-02 21:30:55.675892114 +0200 -@@ -260,7 +260,7 @@ +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 ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) { -+ if (g_unichar_fully_decompose (ch, FALSE, decomp, dlen)) { ++#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; -Only in evolution-data-server-3.1.4.patched/libedataserver: e-data-server-util.c.orig -Only in evolution-data-server-3.1.4.patched/libedataserver: e-data-server-util.c.rej + } ++#endif + break; + } + diff --git a/evolution-data-server-3.1.5.tar.bz2 b/evolution-data-server-3.1.5.tar.bz2 deleted file mode 100644 index 00257b1..0000000 --- a/evolution-data-server-3.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:603513bc8d554dea40023fb7491768dce665eecf8766c02ead16cc74dfc6e7f6 -size 4493088 diff --git a/evolution-data-server-3.1.90.tar.bz2 b/evolution-data-server-3.1.90.tar.bz2 new file mode 100644 index 0000000..c23db5f --- /dev/null +++ b/evolution-data-server-3.1.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d5f9e8133dbd167a0a6187cd9781b76ce747ad68d68f6ddddfe1e7db70c5b80 +size 4536731 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index e3a07c8..26271db 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,28 +1,41 @@ +------------------------------------------------------------------- +Thu Sep 1 14:49:19 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.90: + + Various fixes regarding Google integration, including data loss + bugs. + + Add Google Talk field to the list of IM information + + Camel API changes (see NEWS). + + Pretend successful read when skipping 3+ part of + multipart/signed + + Various other code changes. + + Bugs fixed: + - bgo#562912: Unread vfolder marks unread messages as read + - bgo#576398: vfolder not showing new messages from nntp group + - bgo#651469: Folders don't update after moving mails in + maildir + - bgo#652914: IMAP: moving mail puts a copy into real Trash too + - bgo#656051: Preserve mbox file attributes after rewrite + - bgo#651693, bgo#651849, bgo#652437, bgo#655121, bgo#655272, + bgo#655833, bgo#655997, bgo#657181. + + Updated translations. +- Bump so_camel define to 29 to follow library soversion change. + This results in libcamel-1_2-28 being renamed to libcamel-1_2-29. +- Rewrite e-d-s-deprecated.patch to correctly use + g_unichar_fully_decompose(). + ------------------------------------------------------------------- Mon Aug 15 09:26:11 CEST 2011 - dimstar@opensuse.org - Update to version 3.1.5: + + Various code changes. + Bugs fixed: - - bgo#656490: imapx: Memory leak of stream tokenbuf - - bgo#656487: Mem leak in imapx fetch_folders_for_namespaces() - - bgo#656480: Memory leak in camel_folder_search_search() - - bgo#656267: Checking for auth types doesn't work properly - - bgo#656058: Improve EBookBackendSqliteDB searching API - - bgo#652172: Fix a regression from the previous commit - - bgo#655748: rdate parsing failure - - bgo#655190: Sluggish performance interacting with - calendar/tasks + - Several memory leaks fixed (bgo#656490, bgo#656487, + bgo#656480) - bgo#619135: Add photo support to Google Contacts backend - - bgo#655499: Don't crash when getting contacts before backend - is opened - - bgo#654893: Fix 1 missed rename of 'msg_security' to 'dirty' - - bgo#655414: Need translation comments - - bgo#655409: Extra flags in CamelStoreInfo break folder type - check - - bgo#654472: Crash on async error return over GDBus - - bgo#655331: pgp/gpg signature is not shown - - bgo#654480: [imapx] Mark as Junk is not reliable - + Misc fixes + - bgo#656267, bgo#656058, bgo#652172, bgo#655748, bgo#655190, + bgo#655499, bgo#654893, bgo#655414, bgo#655409, bgo#654472, + bgo#655331, bgo#654480. + Updated translations. - Update library sonum defines, following the code changes. diff --git a/evolution-data-server.spec b/evolution-data-server.spec index e7479bb..71c5d6b 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -20,7 +20,7 @@ # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 28 +%define so_camel 29 %define so_ebackend 1 %define so_ebook 12 %define so_ecal 10 @@ -33,7 +33,7 @@ Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.5 +Version: 3.1.90 Release: 1 # FIXME: parallel build is broken in 3.1.3, check in later versions if this works Summary: Evolution Data Server