diff --git a/evolution-data-server-3.44.3.tar.xz b/evolution-data-server-3.46.2.tar.xz similarity index 39% rename from evolution-data-server-3.44.3.tar.xz rename to evolution-data-server-3.46.2.tar.xz index 318dabc3930df94fa3781b1fe4fad5473d13c0bf..8222691a79f1635d3b281bc1a215a95845dd3d92 100644 Binary files a/evolution-data-server-3.44.3.tar.xz and b/evolution-data-server-3.46.2.tar.xz differ diff --git a/evolution-data-server.spec b/evolution-data-server.spec index e365477e90ec80935d867be49c5826d4f39f7d0a..29122c886c3cf7563a495f381ca692621e5a197a 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,16 +1,17 @@ -%define glib2_version 2.46 -%define gtk3_version 3.16 -%define gcr_version 3.4 +%define glib2_version 2.68 +%define gtk3_version 3.20 +%define gtk4_version 4.4 %define gtk_doc_version 1.9 %define goa_version 3.8 %define libsecret_version 0.5 %define libgdata_version 0.15.1 %define libgweather_version 4.0.0 %define libical_version 3.0.7 -%define libsoup_version 3.0.6 +%define libsoup_version 3.1.1 %define nss_version 3.14 %define sqlite_version 3.7.17 -%define webkit2gtk_version 2.28.0 +%define webkit2gtk_version 2.34.0 +%define webkit2gtk4_version 2.36.0 %define json_glib_version 1.0.4 %define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules @@ -35,29 +36,59 @@ %{!?with_docs: %global with_docs 1} Name: evolution-data-server -Version: 3.44.3 -Release: 4 +Version: 3.46.2 +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.44/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz + +#Patch0: webkitgtk-6.0.patch Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 compat-evolution-data-server310-libcamel < 3.12 -Recommends: pinentry-gtk -Requires: dconf +Recommends: pinentry-gui Requires: %{name}-langpacks = %{version}-%{release} -BuildRequires: make cmake gcc gcc-c++ gettext gperf libicu-devel sendmail systemd vala vala-devel nspr-devel -BuildRequires: libcanberra-devel libicu-devel openldap-devel >= 2.0.11 krb5-devel >= 1.11 -BuildRequires: gtk-doc >= %{gtk_doc_version} intltool >= 0.35.5 -BuildRequires: libdb-devel perl-generators gcr-devel >= %{gcr_version} glib2-devel >= %{glib2_version} -BuildRequires: libgweather-devel >= %{libgweather_version} gtk3-devel >= %{gtk3_version} -BuildRequires: libgdata-devel >= %{libgdata_version} libical-devel >= %{libical_version} libsecret-devel >= %{libsecret_version} -BuildRequires: libsoup3-devel >= %{libsoup_version} nss-devel >= %{nss_version} -BuildRequires: libxml2-devel sqlite-devel >= %{sqlite_version} json-glib-devel >= %{json_glib_version} -BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} pkgconfig(goa-1.0) >= %{goa_version} + +BuildRequires: cmake make +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: gperf +BuildRequires: gtk-doc >= %{gtk_doc_version} +BuildRequires: ninja-build +BuildRequires: vala +BuildRequires: systemd +BuildRequires: sendmail + +BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} +BuildRequires: pkgconfig(gweather4) >= %{libgweather_version} +BuildRequires: pkgconfig(libical-glib) >= %{libical_version} +BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version} +BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version} +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(nss) >= %{nss_version} +BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} +BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version} +BuildRequires: pkgconfig(webkit2gtk-5.0) >= %{webkit2gtk4_version} +BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} +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 @@ -67,12 +98,17 @@ common, desktop-wide information, such as a user's address book or calendar even %package devel Summary: Tests case and libraries for evolution-data-server development -Requires: %{name} = %{version}-%{release} - -Requires: libgdata-devel >= %{libgdata_version} libgweather-devel >= %{libgweather_version} -Requires: libical-devel >= %{libical_version} libsecret-devel >= %{libsecret_version} libsoup3-devel >= %{libsoup_version} -Requires: sqlite-devel >= %{sqlite_version} json-glib-devel >= %{json_glib_version} -Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} pkgconfig(goa-1.0) >= %{goa_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +Requires: pkgconfig(goa-1.0) >= %{goa_version} +Requires: pkgconfig(gweather4) >= %{libgweather_version} +Requires: pkgconfig(libical-glib) >= %{libical_version} +Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} +Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version} +Requires: pkgconfig(sqlite3) >= %{sqlite_version} +Requires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version} +Requires: pkgconfig(webkit2gtk-5.0) >= %{webkit2gtk4_version} +Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version} Provides: evolution-data-server-tests Obsoletes: evolution-data-server-tests < %{version}-%{release} @@ -88,13 +124,6 @@ Requires: %{name} = %{version}-%{release} %description langpacks This package contains translations for evolution-data-server. -%package doc -Summary: Documentation files for evolution-data-server -BuildArch: noarch - -%description doc -This package contains developer documentation for evolution-data-server.. - %package perl Summary: Supplemental utilities that require Perl Requires: %{name} = %{version}-%{release} @@ -103,6 +132,8 @@ Requires: perl-interpreter %description perl This package contains supplemental utilities for evolution-data-server that require Perl. +%package_help + %prep %autosetup -p1 @@ -115,23 +146,30 @@ fi export CPPFLAGS="-I%{_includedir}/et" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations" -%cmake -G "Unix Makefiles" -DENABLE_MAINTAINER_MODE=OFF -DWITH_LIBDB=OFF \ +mkdir -p build +pushd build +%cmake -G Ninja -DENABLE_MAINTAINER_MODE=OFF -DWITH_LIBDB=OFF \ -DENABLE_FILE_LOCKING=fcntl -DENABLE_DOT_LOCKING=OFF -DENABLE_INTROSPECTION=ON \ -DWITH_SYSTEMDUSERUNITDIR=%{_userunitdir} \ %if "%{?_eds_dbus_services_prefix}" != "" -DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \ %endif - -DENABLE_VALA_BINDINGS=ON -DENABLE_INSTALLED_TESTS=OFF -DWITH_OPENLDAP=ON -DWITH_KRB5=ON \ - -DENABLE_SMIME=ON -DENABLE_LARGEFILE=ON -DENABLE_SMIME=ON -DENABLE_GTK_DOC=ON -DWITH_GWEATHER4=ON + -DENABLE_VALA_BINDINGS=ON -DENABLE_INSTALLED_TESTS=ON -DWITH_OPENLDAP=ON -DWITH_KRB5=ON \ + -DENABLE_SMIME=ON -DENABLE_LARGEFILE=ON -DENABLE_SMIME=ON -DENABLE_GTK_DOC=ON -DWITH_PHONENUMBER=OFF \ + .. - -sed -i "300 d" docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in -make -j 1 +sed -i "302 d" docs/reference/evolution-data-server/evolution-data-server-docs.sgml +ninja -j1 +popd %install -%make_install +pushd build +DESTDIR=$RPM_BUILD_ROOT ninja install +popd + -mkdir %{buildroot}%{_libdir}/evolution-data-server/ui-modules || : +mkdir $RPM_BUILD_ROOT/%{uimodules_dir} || : +mkdir $RPM_BUILD_ROOT/%{credential_modules_dir} || : find %{buildroot} -name '*.so.*' -exec chmod +x {} \; @@ -176,24 +214,26 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files %license COPYING %doc README ChangeLog NEWS -%{_libdir}/libcamel-1.2.so.63 -%{_libdir}/libcamel-1.2.so.63.0.0 -%{_libdir}/libebackend-1.2.so.10 -%{_libdir}/libebackend-1.2.so.10.0.0 -%{_libdir}/libebook-1.2.so.20 -%{_libdir}/libebook-1.2.so.20.1.3 -%{_libdir}/libebook-contacts-1.2.so.3 -%{_libdir}/libebook-contacts-1.2.so.3.0.0 -%{_libdir}/libecal-2.0.so.1 -%{_libdir}/libecal-2.0.so.1.0.0 -%{_libdir}/libedata-book-1.2.so.26 -%{_libdir}/libedata-book-1.2.so.26.0.0 -%{_libdir}/libedata-cal-2.0.so.1 -%{_libdir}/libedata-cal-2.0.so.1.0.0 -%{_libdir}/libedataserver-1.2.so.26 -%{_libdir}/libedataserver-1.2.so.26.0.0 -%{_libdir}/libedataserverui-1.2.so.3 -%{_libdir}/libedataserverui-1.2.so.3.0.0 +%{_libdir}/libcamel-1.2.so.64 +%{_libdir}/libcamel-1.2.so.64.0.0 +%{_libdir}/libebackend-1.2.so.11 +%{_libdir}/libebackend-1.2.so.11.0.0 +%{_libdir}/libebook-1.2.so.21 +%{_libdir}/libebook-1.2.so.21.1.3 +%{_libdir}/libebook-contacts-1.2.so.4 +%{_libdir}/libebook-contacts-1.2.so.4.0.0 +%{_libdir}/libecal-2.0.so.2 +%{_libdir}/libecal-2.0.so.2.0.0 +%{_libdir}/libedata-book-1.2.so.27 +%{_libdir}/libedata-book-1.2.so.27.0.0 +%{_libdir}/libedata-cal-2.0.so.2 +%{_libdir}/libedata-cal-2.0.so.2.0.0 +%{_libdir}/libedataserver-1.2.so.27 +%{_libdir}/libedataserver-1.2.so.27.0.0 +%{_libdir}/libedataserverui-1.2.so.4 +%{_libdir}/libedataserverui-1.2.so.4.0.0 +%{_libdir}/libedataserverui4-1.0.so.0 +%{_libdir}/libedataserverui4-1.0.so.0.0.0 %{_libdir}/girepository-1.0/Camel-1.2.typelib %{_libdir}/girepository-1.0/EBackend-1.2.typelib @@ -204,6 +244,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/girepository-1.0/EDataCal-2.0.typelib %{_libdir}/girepository-1.0/EDataServer-1.2.typelib %{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib +%{_libdir}/girepository-1.0/EDataServerUI4-1.0.typelib %{_libexecdir}/camel-gpg-photo-saver %{_libexecdir}/camel-index-control-1.2 @@ -309,6 +350,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libedata-cal-2.0.so %{_libdir}/libedataserver-1.2.so %{_libdir}/libedataserverui-1.2.so +%{_libdir}/libedataserverui4-1.0.so %{_libdir}/pkgconfig/camel-1.2.pc %{_libdir}/pkgconfig/evolution-data-server-1.2.pc %{_libdir}/pkgconfig/libebackend-1.2.pc @@ -319,6 +361,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/pkgconfig/libedata-cal-2.0.pc %{_libdir}/pkgconfig/libedataserver-1.2.pc %{_libdir}/pkgconfig/libedataserverui-1.2.pc +%{_libdir}/pkgconfig/libedataserverui4-1.0.pc %{_datadir}/gir-1.0/Camel-1.2.gir %{_datadir}/gir-1.0/EBackend-1.2.gir %{_datadir}/gir-1.0/EBook-1.2.gir @@ -328,6 +371,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gir-1.0/EDataCal-2.0.gir %{_datadir}/gir-1.0/EDataServer-1.2.gir %{_datadir}/gir-1.0/EDataServerUI-1.2.gir +%{_datadir}/gir-1.0/EDataServerUI4-1.0.gir %{_datadir}/vala/vapi/camel-1.2.deps %{_datadir}/vala/vapi/camel-1.2.vapi %{_datadir}/vala/vapi/libebackend-1.2.deps @@ -346,11 +390,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/vala/vapi/libedataserver-1.2.vapi %{_datadir}/vala/vapi/libedataserverui-1.2.deps %{_datadir}/vala/vapi/libedataserverui-1.2.vapi +%{_datadir}/vala/vapi/libedataserverui4-1.0.deps +%{_datadir}/vala/vapi/libedataserverui4-1.0.vapi +%{_libdir}/libetestserverutils.so +%{_libdir}/libetestserverutils.so.0 +%{_libdir}/libetestserverutils.so.0.0.0 +%{_libexecdir}/%{name}/installed-tests +%{_datadir}/installed-tests %files langpacks -f %{name}.lang %if %{with_docs} -%files doc +%files help %{_datadir}/gtk-doc/html/* %endif @@ -358,6 +409,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libexecdir}/evolution-data-server/csv2vcard %changelog +* Mon Jan 2 2023 lin zhang - 3.46.2-1 +- Update to 3.46.2 + * Wed Aug 24 2022 caodongxia -3.44.3-4 - Remove rpath diff --git a/webkitgtk-6.0.patch b/webkitgtk-6.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..37f7df50c105f90bd1625e3fe279a153b9506cea --- /dev/null +++ b/webkitgtk-6.0.patch @@ -0,0 +1,72 @@ +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 +