diff --git a/0001-disable-gtk4-support.patch b/0001-disable-gtk4-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..88f78e2ba49f96cf7e3f8aa0682eb5c59b1deae3 --- /dev/null +++ b/0001-disable-gtk4-support.patch @@ -0,0 +1,25 @@ +From 0240f4062bd6196af67c6cfe293560e3a808cfca Mon Sep 17 00:00:00 2001 +From: konglidong +Date: Thu, 7 Mar 2024 14:27:40 +0800 +Subject: [PATCH] disable gtk4 support + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c575acd..eecf1ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,7 +398,7 @@ if(ENABLE_GTK) + set(HAVE_GTK 1) + endif(ENABLE_GTK) + +-add_printable_option(ENABLE_GTK4 "Enable gtk4 support" ON) ++add_printable_option(ENABLE_GTK4 "Enable gtk4 support" OFF) + if(ENABLE_GTK4) + pkg_check_modules_for_option(ENABLE_GTK4 "gtk4 support" GTK4 gtk4>=${gdk4_minimum_version}) + +-- +2.20.1 + diff --git a/evolution-data-server-3.46.2.tar.xz b/evolution-data-server-3.47.1.tar.xz similarity index 40% rename from evolution-data-server-3.46.2.tar.xz rename to evolution-data-server-3.47.1.tar.xz index 8222691a79f1635d3b281bc1a215a95845dd3d92..098eca9d080c2c5dd7562858d4b3251326a441f3 100644 Binary files a/evolution-data-server-3.46.2.tar.xz and b/evolution-data-server-3.47.1.tar.xz differ diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 6146a43beb09b2ef8aa454e64b3872f6d0abd0d6..52ca13a1f5243ebf74af1ab8d5cc6c999c20792e 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -36,14 +36,14 @@ %{!?with_docs: %global with_docs 1} Name: evolution-data-server -Version: 3.46.2 -Release: 2 +Version: 3.47.1 +Release: 1 Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.47/%{name}-%{version}.tar.xz -#Patch0: webkitgtk-6.0.patch +Patch0: 0001-disable-gtk4-support.patch Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 compat-evolution-data-server310-libcamel < 3.12 @@ -84,11 +84,6 @@ BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: openldap-devel >= 2.0.11 BuildRequires: krb5-devel >= 1.11 -#BuildRequires: libphonenumber-devel -#BuildRequires: protobuf-devel -#BuildRequires: boost-devel -#BuildRequires: abseil-cpp-devel - BuildRequires: chrpath %description @@ -410,6 +405,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libexecdir}/evolution-data-server/csv2vcard %changelog +* Thu Mar 07 2024 konglidong - 3.47.1-1 +- update version to 3.47.1 + * Sat Mar 04 2023 wangkai - 3.46.2-2 - Remove rpath in installed-tests diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch deleted file mode 100644 index 37f7df50c105f90bd1625e3fe279a153b9506cea..0000000000000000000000000000000000000000 --- a/webkitgtk-6.0.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cdb16f26f63f5093479a43cab32012845bcf33ed Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 15 Nov 2022 08:58:38 +0000 -Subject: [PATCH] M!107 - Use webkitgtk-6.0 API version - -In WebKitGTK 2.39.1, the GTK 4 API version has been renamed from webkit2gtk-5.0 to webkitgtk-6.0. - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/107 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3ce7c1dd..c575acd3e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -426,7 +426,7 @@ if(ENABLE_GTK4) - - if(ENABLE_OAUTH2_WEBKITGTK4) - pkg_check_modules_for_option(ENABLE_OAUTH2_WEBKITGTK4 "WebKitGTK gtk4 for built-in OAuth2 authentications" OAUTH2_WEBKITGTK4 -- webkit2gtk-5.0>=${webkit2gtk4_minimum_version} -+ webkitgtk-6.0>=${webkit2gtk4_minimum_version} - ) - endif(ENABLE_OAUTH2_WEBKITGTK4) - endif(ENABLE_GTK4) --- -GitLab - -From 8d29b0bded2e4e3700ce08e9db2eaeac4400528a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 21 Nov 2022 17:49:29 +0000 -Subject: [PATCH] M!108 - Try harder to support webkitgtk-6.0 - -The cdb16f26f63f5093479a43cab32012845bcf33ed attempted to handle WebKitGTK -API changes, but I forgot the header file name changed as well. - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/108 ---- - src/libedataserverui/e-credentials-prompter-impl-oauth2.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -index 2415947c3..b99ac4e60 100644 ---- a/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -+++ b/src/libedataserverui/e-credentials-prompter-impl-oauth2.c -@@ -32,21 +32,19 @@ - #if GTK_CHECK_VERSION(4, 0, 0) - #ifdef ENABLE_OAUTH2_WEBKITGTK4 - #define WITH_WEBKITGTK 1 -+#include - #else - #undef WITH_WEBKITGTK - #endif - #else - #ifdef ENABLE_OAUTH2_WEBKITGTK - #define WITH_WEBKITGTK 1 -+#include - #else - #undef WITH_WEBKITGTK - #endif - #endif - --#ifdef WITH_WEBKITGTK --#include --#endif /* WITH_WEBKITGTK */ -- - struct _ECredentialsPrompterImplOAuth2Private { - GMutex property_lock; - --- -GitLab -