From 4df146f399fbb1ff4132735e27e01da0b8921dd4823ecd30420c2b278434de1d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 13 Apr 2018 06:45:38 +0000 Subject: [PATCH 1/2] Accepting request 594987 from home:iznogood New stable rel OBS-URL: https://build.opensuse.org/request/show/594987 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=321 --- evolution-data-server-3.28.0.tar.xz | 3 --- evolution-data-server-3.28.1.tar.xz | 3 +++ evolution-data-server.changes | 11 +++++++++++ evolution-data-server.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 evolution-data-server-3.28.0.tar.xz create mode 100644 evolution-data-server-3.28.1.tar.xz diff --git a/evolution-data-server-3.28.0.tar.xz b/evolution-data-server-3.28.0.tar.xz deleted file mode 100644 index 5b06ce1..0000000 --- a/evolution-data-server-3.28.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb9546d5fedbb00de6c6cec3850f2cdfea234af221e645d15721686a8df77ef9 -size 4443780 diff --git a/evolution-data-server-3.28.1.tar.xz b/evolution-data-server-3.28.1.tar.xz new file mode 100644 index 0000000..6611376 --- /dev/null +++ b/evolution-data-server-3.28.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b04fc1adaba0541546267a77f1bc5aa549fe85eb9933492fdf994c69fa36989 +size 4445420 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 7a4c736..4e88508 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 9 21:28:45 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 3.28.1: + + [ECalMetaBackend]: Doesn't store custom time zones permanently. + + Correct typo in config.h.in. + + Update POTFILES.in. + + Bugs fixed: bgo#767683, bgo#725295, bgo#794434, bgo#794534, + bgo#794628, bgo#793601, bgo#794639, bgo#794879. + + Updated translations. + ------------------------------------------------------------------- Tue Mar 20 17:36:46 UTC 2018 - dimstar@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 7743a74..d1cbb5e 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -30,7 +30,7 @@ %define so_edata_cal 28 %define _evo_version 3.28 Name: evolution-data-server -Version: 3.28.0 +Version: 3.28.1 Release: 0 Summary: Evolution Data Server License: LGPL-2.1-or-later From da0e5844cbc74d318555f29d0c6d767d16e3f89b56fa9c99cc2e7b7a6fc4080e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Apr 2018 15:45:43 +0000 Subject: [PATCH 2/2] Accepting request 597126 from home:dimstar:Factory - Add evolution-data-server-icu61.1.patch: Fix build with icu 61.1 (bgo#795295). OBS-URL: https://build.opensuse.org/request/show/597126 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=322 --- evolution-data-server-icu61.1.patch | 39 +++++++++++++++++++++++++++++ evolution-data-server.changes | 6 +++++ evolution-data-server.spec | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 evolution-data-server-icu61.1.patch diff --git a/evolution-data-server-icu61.1.patch b/evolution-data-server-icu61.1.patch new file mode 100644 index 0000000..3791a9f --- /dev/null +++ b/evolution-data-server-icu61.1.patch @@ -0,0 +1,39 @@ +From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001 +From: Hussam Al-Tayeb +Date: Mon, 16 Apr 2018 13:38:33 +0200 +Subject: Bug 795295 - Fails to compile after icu 61.1 upgrade + (icu::UnicodeString) + +--- + src/libedataserver/e-alphabet-index-private.cpp | 1 + + src/libedataserver/e-transliterator-private.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp +index d3e44f4..a789f44 100644 +--- a/src/libedataserver/e-alphabet-index-private.cpp ++++ b/src/libedataserver/e-alphabet-index-private.cpp +@@ -36,6 +36,7 @@ + + using icu::AlphabeticIndex; + using icu::Locale; ++using icu::UnicodeString; + + struct _EAlphabetIndex { + AlphabeticIndex *priv; +diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp +index bb15593..6f1d89c 100644 +--- a/src/libedataserver/e-transliterator-private.cpp ++++ b/src/libedataserver/e-transliterator-private.cpp +@@ -35,6 +35,7 @@ + #include + + using icu::Transliterator; ++using icu::UnicodeString; + + struct _ETransliterator { + Transliterator *priv; +-- +cgit v0.12 + + diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 4e88508..364bafe 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 16 15:15:47 UTC 2018 - dimstar@opensuse.org + +- Add evolution-data-server-icu61.1.patch: Fix build with icu 61.1 + (bgo#795295). + ------------------------------------------------------------------- Mon Apr 9 21:28:45 UTC 2018 - bjorn.lie@gmail.com diff --git a/evolution-data-server.spec b/evolution-data-server.spec index d1cbb5e..fd332cc 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -38,6 +38,8 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution Source0: http://download.gnome.org/sources/evolution-data-server/%{_evo_version}/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM evolution-data-server-icu61.1.patch bgo#795295 dimstar@opensuse.org -- Fix build with icu 61.1 +Patch0: evolution-data-server-icu61.1.patch BuildRequires: cmake BuildRequires: db-devel BuildRequires: fdupes @@ -267,6 +269,7 @@ This package contains developer documentation. %prep %setup -q +%patch0 -p1 translation-update-upstream %build