Accepting request 890763 from GNOME:Factory
- Drop baselibs.conf: eds-32bit seems no longer to be needed. Let's try to reduce the 32bit footprint a bit further. OBS-URL: https://build.opensuse.org/request/show/890763 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=223
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
0cf9b83e56
@ -1,10 +0,0 @@
|
||||
evolution-data-server
|
||||
libcamel-1_2-62
|
||||
libebackend-1_2-10
|
||||
libebook-1_2-20
|
||||
libebook-contacts-1_2-3
|
||||
libecal-2_0-1
|
||||
libedata-book-1_2-26
|
||||
libedata-cal-2_0-1
|
||||
libedataserver-1_2-26
|
||||
libedataserverui-1_2-3
|
||||
@ -1,75 +0,0 @@
|
||||
From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
|
||||
size 4623568
|
||||
3
evolution-data-server-3.40.1.tar.xz
Normal file
3
evolution-data-server-3.40.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22
|
||||
size 4625316
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 5 15:16:02 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop baselibs.conf: eds-32bit seems no longer to be needed. Let's
|
||||
try to reduce the 32bit footprint a bit further.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 30 12:53:59 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- 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. <andresbs@opensuse.org>
|
||||
|
||||
- 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 <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
%global with_docs 0
|
||||
|
||||
# Shared Library soNUMs, to make it easier for updates
|
||||
# When updating the sonums, do not forget to also update baselibs.conf
|
||||
%define so_camel 62
|
||||
%define so_ebackend 10
|
||||
%define so_edataserver 26
|
||||
@ -32,16 +31,13 @@
|
||||
%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
|
||||
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 +60,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 +74,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 +328,7 @@ translation-update-upstream
|
||||
%{?with_introspection:\
|
||||
-DENABLE_VALA_BINDINGS=ON \
|
||||
-DENABLE_INTROSPECTION=ON} \
|
||||
-DWITH_PHONENUMBER=ON \
|
||||
-DENABLE_DBUS_SESSION_TOOL=OFF \
|
||||
%gtkdoc_flags \
|
||||
%{nil}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user