From 1bbee3b42baa17ac9bb47a89dc09a31c7e9783e9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Feb 09 2024 08:09:46 +0000 Subject: Update to 3.51.2 --- diff --git a/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch b/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch deleted file mode 100644 index 47cd3d1..0000000 --- a/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 43c88a074beb308fe5aba4457e6d7854e1bc3f91 Mon Sep 17 00:00:00 2001 -Date: Mon, 8 Jan 2024 09:48:50 +0100 -Subject: [PATCH] build: Don't set CFLAGS returned by pkg-config as - CMAKE_REQUIRED_FLAGS - -The CMAKE_REQUIRED_FLAGS expects a string but the pkg-config value -is a list. - -This had been addressed within https://bugzilla.gnome.org/show_bug.cgi?id=773659 , -but returned back afterwards. ---- - CMakeLists.txt | 8 ++++---- - data/CMakeLists.txt | 5 ++--- - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b43cc9eb0..8fa487826 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,11 +532,11 @@ if(WITH_LIBDB) - endif(("${WITH_LIBDB_CFLAGS}" STREQUAL "") AND ("${WITH_LIBDB_LIBS}" STREQUAL "")) - endif(NOT (WITH_LIBDB OR ("${WITH_LIBDB}" STREQUAL "YES"))) - -- set(CMAKE_REQUIRED_FLAGS ${LIBDB_CFLAGS}) -+ set(CMAKE_REQUIRED_DEFINITIONS ${LIBDB_CFLAGS}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBDB_LIBS}) - CHECK_C_SOURCE_COMPILES("#include - int main(void) { db_create(NULL, NULL, 0); return 0; }" HAVE_LIBDB) -- unset(CMAKE_REQUIRED_FLAGS) -+ unset(CMAKE_REQUIRED_DEFINITIONS) - unset(CMAKE_REQUIRED_LIBRARIES) - - if(NOT HAVE_LIBDB) -@@ -910,13 +910,13 @@ endif(ENABLE_LARGEFILE) - # Miscellaneous checks - # ****************************** - --set(CMAKE_REQUIRED_FLAGS ${GNOME_PLATFORM_CFLAGS}) -+set(CMAKE_REQUIRED_DEFINITIONS ${GNOME_PLATFORM_CFLAGS}) - set(CMAKE_REQUIRED_INCLUDES ${GNOME_PLATFORM_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${GNOME_PLATFORM_LDFLAGS}) - CHECK_C_SOURCE_COMPILES("#include - int main(void) { GPowerProfileMonitor *monitor = g_power_profile_monitor_dup_default (); g_clear_object (&monitor); return 0; }" HAVE_GPOWERPROFILEMONITOR) - CHECK_SYMBOL_EXISTS(soup_message_set_force_http1 libsoup/soup.h HAVE_SOUP_MESSAGE_SET_FORCE_HTTP1) --unset(CMAKE_REQUIRED_FLAGS) -+unset(CMAKE_REQUIRED_DEFINITIONS) - unset(CMAKE_REQUIRED_INCLUDES) - unset(CMAKE_REQUIRED_LIBRARIES) - -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index b8ecd6535..fdcb2dac8 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -27,10 +27,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.deskt - - set(OAUTH2_SCHEMES "x-scheme-handler/eds-oauth2;") - if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "") -- set(CMAKE_REQUIRED_DEFINITIONS -DG_LOG_DOMAIN=\"oauth2-value-helper\" -DBUILDING_VALUE_HELPER=1) -- set(CMAKE_REQUIRED_FLAGS ${DATA_SERVER_CFLAGS}) -+ set(CMAKE_REQUIRED_DEFINITIONS ${DATA_SERVER_CFLAGS}) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_BINARY_DIR} ${DATA_SERVER_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${DATA_SERVER_LDFLAGS}) -+ list(APPEND CMAKE_REQUIRED_DEFINITIONS -DG_LOG_DOMAIN=\"oauth2-value-helper\" -DBUILDING_VALUE_HELPER=1) - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/oauth2-google-client-id" _binary_dir_to_file) - CHECK_C_SOURCE_RUNS("#define DECODE_KEY \"${WITH_GOOGLE_CLIENT_ID}\" - #define DECODE_TO_FILE \"${_binary_dir_to_file}\" -@@ -41,7 +41,6 @@ if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "") - unset(_decoded) - unset(CMAKE_REQUIRED_LIBRARIES) - unset(CMAKE_REQUIRED_INCLUDES) -- unset(CMAKE_REQUIRED_FLAGS) - unset(CMAKE_REQUIRED_DEFINITIONS) - - if(NOT _google_oauth2_scheme STREQUAL "") --- -2.41.0 - diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 564f923..ac532bc 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -59,15 +59,13 @@ ### Abstract ### Name: evolution-data-server -Version: 3.51.1 -Release: 4%{?dist} +Version: 3.51.2 +Release: 1%{?dist} Summary: Backend data server for Evolution License: LGPL-2.0-or-later URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz -Patch01: 0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch - Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -505,6 +503,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/installed-tests %changelog +* Fri Feb 09 2024 Milan Crha - 3.51.2-1 +- Update to 3.51.2 + * Wed Jan 31 2024 Pete Walter - 3.51.1-4 - Rebuild for ICU 74 diff --git a/sources b/sources index 0910107..c835764 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-data-server-3.51.1.tar.xz) = 14311118f51454256bf9ebc43ee83f5e4786ca114248b194a2402341dc0b443a90b76971a2b1383fdd893c61f650103697843176caa8b100b24ad92f344bb3e9 +SHA512 (evolution-data-server-3.51.2.tar.xz) = 272ac52e450fbf90ac6817594029ed9f6f06a4870d6c1ce2fbb31e1cdbf3bde3c7e35b1698f5e83a0ea5b31118ff6adff4148d1b6e61f17c4db1a19bf6959742