diff --git a/c95a70bfeae25b.patch b/c95a70bfeae25b.patch deleted file mode 100644 index 226a034..0000000 --- a/c95a70bfeae25b.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Wed, 14 Apr 2021 16:58:08 +0200 -Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison - -CMake 3.20.1 errors out with: - -CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): - variable name cannot be empty - Call Stack (most recent call first): - CMakeLists.txt:152 (add_printable_variable) - -Change how the parameter value is compared, to fix it. ---- - cmake/modules/PrintableOptions.cmake | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake -index ba1c9d0b7..339f1da4b 100644 ---- a/cmake/modules/PrintableOptions.cmake -+++ b/cmake/modules/PrintableOptions.cmake -@@ -19,40 +19,40 @@ - # prints all the build options previously added with the above functions - - macro(add_printable_variable_bare _name) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - list(APPEND _printable_options ${_name}) - endmacro() - - macro(add_printable_option _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "option name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - option(${_name} ${_description} ${_default_value}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE STRING ${_description}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable_path _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "path variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE PATH ${_description}) - add_printable_variable_bare(${_name}) - endmacro() - - macro(add_printable_variable_filepath _name _description _default_value) -- if(_name STREQUAL "") -+ if("${_name}" STREQUAL "") - message(FATAL_ERROR "filepath variable name cannot be empty") -- endif(_name STREQUAL "") -+ endif("${_name}" STREQUAL "") - set(${_name} ${_default_value} CACHE FILEPATH ${_description}) - add_printable_variable_bare(${_name}) - endmacro() --- -GitLab - diff --git a/evolution-data-server-3.40.0.tar.xz b/evolution-data-server-3.40.0.tar.xz deleted file mode 100644 index e7b697a..0000000 --- a/evolution-data-server-3.40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445 -size 4623568 diff --git a/evolution-data-server-3.40.1.tar.xz b/evolution-data-server-3.40.1.tar.xz new file mode 100644 index 0000000..0078986 --- /dev/null +++ b/evolution-data-server-3.40.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22 +size 4625316 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 484de71..be83b78 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Apr 30 12:53:59 UTC 2021 - Dominique Leuenberger + +- Update to version 3.40.1: + + EWebDAVCollectionBackend: Preset also auth method on the new + child. + + Camel: Fails to filter unread junk messages in a virtual Junk + folder. + + ESourceWebDAV: Fallback to SHA1 on SSL trust verification if + needed. + + Ensure non-const pointers passed to I_CAL_IS_... functions. + + ECalBackendSync: Ensure no Recurrence-ID set when removing all + components. + + PrintableOptions.cmake: Correct variable name comparison. + + libecal: Fix a warning caught by a gcc static analyzer. + + Updated translations. +- Drop c95a70bfeae25b.patch: fixed upstream. + +------------------------------------------------------------------- +Fri Apr 30 08:14:25 UTC 2021 - Andrés B.S. + +- Enable libphonenumber support: to be used in Chatty and Calls, as + they need to parse phone numbers: + + Add libphonenumber-devel, libboost-thread-devel and + pkgconfig(protobuf) BuildRequires: dependencies to + libphonenumber support. + + Pass -DWITH_PHONENUMBER=ON to meson. + ------------------------------------------------------------------- Fri Apr 30 07:41:51 UTC 2021 - Dominique Leuenberger diff --git a/evolution-data-server.spec b/evolution-data-server.spec index fc53cfb..e60bec5 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -32,7 +32,7 @@ %bcond_without introspection Name: evolution-data-server -Version: 3.40.0 +Version: 3.40.1 Release: 0 Summary: Evolution Data Server License: LGPL-2.0-only @@ -40,8 +40,6 @@ Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Apps/Evolution Source0: https://download.gnome.org/sources/evolution-data-server/3.40/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM c95a70bfeae25b.patch dimstar@opensuse.org -- Fix build with cmake 3.20.1 -Patch0: https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/c95a70bfeae25b.patch BuildRequires: cmake BuildRequires: db-devel @@ -64,6 +62,8 @@ BuildRequires: pkgconfig(libical) >= 3.0.5 BuildRequires: pkgconfig(libical-glib) >= 3.0.7 # For adressbook data generating BuildRequires: python3-base +BuildRequires: libboost_thread-devel +BuildRequires: libphonenumber-devel BuildRequires: sqlite3-devel >= 3.7.17 BuildRequires: translation-update-upstream BuildRequires: vala >= 0.22.0 @@ -76,6 +76,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.25 BuildRequires: pkgconfig(libnotify) >= 0.7 BuildRequires: pkgconfig(libsecret-unstable) >= 0.5 BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(protobuf) >= 2.4 BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.11.91 Requires: mozilla-nss # typelib-1_0-ECalendar-1_2 was dropped with e-d-s 3.7.3 due to libical not being introspecatble. @@ -329,6 +330,7 @@ translation-update-upstream %{?with_introspection:\ -DENABLE_VALA_BINDINGS=ON \ -DENABLE_INTROSPECTION=ON} \ + -DWITH_PHONENUMBER=ON \ -DENABLE_DBUS_SESSION_TOOL=OFF \ %gtkdoc_flags \ %{nil}