rpms
/
evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)

This commit is contained in:
Milan Crha 2023-10-10 15:21:16 +02:00
parent 198d9e4365
commit 5730f3c90d
2 changed files with 114 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
evolution-data-server-3.40.4-no-libedataserverui-in-alarm-notify.patch Normal file
View File

@ -0,0 +1,71 @@
diff --git a/src/services/evolution-alarm-notify/CMakeLists.txt b/src/services/evolution-alarm-notify/CMakeLists.txt
index a4c0a41..a713797 100644
--- a/src/services/evolution-alarm-notify/CMakeLists.txt
+++ b/src/services/evolution-alarm-notify/CMakeLists.txt
@@ -1,9 +1,14 @@
set(DEPENDENCIES
ecal
- edataserverui
)
set(SOURCES
+ ../../libedataserverui/libedataserverui-private.h
+ ../../libedataserverui/libedataserverui-private.c
+ ../../libedataserverui/e-buffer-tagger.h
+ ../../libedataserverui/e-buffer-tagger.c
+ ../../libedataserverui/e-reminders-widget.h
+ ../../libedataserverui/e-reminders-widget.c
evolution-alarm-notify.c
e-alarm-notify.h
e-alarm-notify.c
@@ -17,9 +22,15 @@ add_dependencies(evolution-alarm-notify
${DEPENDENCIES}
)
+# the -DLIBEDATASERVERUI_COMPILATION is a hackish way to borrow sources from
+# the libedataserverui without depending on it (because it can be uninstalled)
target_compile_definitions(evolution-alarm-notify PRIVATE
-DG_LOG_DOMAIN=\"evolution-alarm-notify\"
-DLOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
+ -DLIBEDATASERVERUI_COMPILATION
+ -DE_DATA_SERVER_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
+ -DE_DATA_SERVER_UIMODULEDIR=\"${uimoduledir}\"
+ -DE_DATA_SERVER_ICONDIR=\"${icondir}\"
)
target_compile_options(evolution-alarm-notify PUBLIC
@@ -33,6 +44,7 @@ target_include_directories(evolution-alarm-notify PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
+ ${CMAKE_SOURCE_DIR}/src/libedataserverui
${CANBERRA_INCLUDE_DIRS}
${DATA_SERVER_INCLUDE_DIRS}
${GNOME_PLATFORM_INCLUDE_DIRS}
diff --git a/src/services/evolution-alarm-notify/e-alarm-notify.c b/src/services/evolution-alarm-notify/e-alarm-notify.c
index 5c9b479..bf53a86 100644
--- a/src/services/evolution-alarm-notify/e-alarm-notify.c
+++ b/src/services/evolution-alarm-notify/e-alarm-notify.c
@@ -30,7 +30,9 @@
#endif
#include "libecal/libecal.h"
-#include "libedataserverui/libedataserverui.h"
+
+#include "libedataserverui/e-buffer-tagger.h"
+#include "libedataserverui/e-reminders-widget.h"
#include "e-alarm-notify.h"
diff --git a/src/services/evolution-alarm-notify/evolution-alarm-notify.c b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
index 5467a8d..14a13aa 100644
--- a/src/services/evolution-alarm-notify/evolution-alarm-notify.c
+++ b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
@@ -22,7 +22,6 @@
#include <glib/gi18n.h>
#include <libedataserver/libedataserver.h>
-#include <libedataserverui/libedataserverui.h>
#include "e-alarm-notify.h"

54
evolution-data-server.spec
View File

@ -54,7 +54,7 @@
Name: evolution-data-server
Version: 3.40.4
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Backend data server for Evolution
License: LGPLv2+
URL: https://wiki.gnome.org/Apps/Evolution
@ -65,6 +65,7 @@ Patch02: evolution-data-server-3.40.4-secret-monitor-warnings.patch
Patch03: evolution-data-server-3.40.4-google-contacts-to-carddav.patch
Patch04: evolution-data-server-3.40.4-google-oauth2.patch
Patch05: evolution-data-server-3.40.4-caldav-crash.patch
Patch06: evolution-data-server-3.40.4-no-libedataserverui-in-alarm-notify.patch
Provides: evolution-webcal = %{version}
Obsoletes: evolution-webcal < 2.24.0
@ -72,6 +73,8 @@ Obsoletes: evolution-webcal < 2.24.0
# RH-bug #1362477
Recommends: pinentry-gui
Recommends: %{name}-ui
%if 0%{?fedora}
# From rhughes-f20-gnome-3-12 copr
Obsoletes: compat-evolution-data-server310-libcamel < 3.12
@ -152,12 +155,26 @@ Requires: pkgconfig(libical-glib) >= %{libical_version}
Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version}
Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
Requires: pkgconfig(sqlite3) >= %{sqlite_version}
Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
%description devel
Development files needed for building things which link against %{name}.
%package ui
Summary: libedataserverui library from %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description ui
libedataserverui library files from %{name}.
%package ui-devel
Summary: Development files for building against libedataserverui from %{name}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
%description ui-devel
Development files needed for building things which link against libedataserverui from %{name}.
%package langpacks
Summary: Translations for %{name}
BuildArch: noarch
@ -307,8 +324,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_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}/girepository-1.0/Camel-1.2.typelib
%{_libdir}/girepository-1.0/EBackend-1.2.typelib
@ -318,7 +333,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/girepository-1.0/EDataBook-1.2.typelib
%{_libdir}/girepository-1.0/EDataCal-2.0.typelib
%{_libdir}/girepository-1.0/EDataServer-1.2.typelib
%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
%{_libexecdir}/camel-gpg-photo-saver
%{_libexecdir}/camel-index-control-1.2
@ -366,7 +380,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%dir %{ebook_backends_dir}
%dir %{ecal_backends_dir}
%dir %{modules_dir}
%dir %{uimodules_dir}
%{_libdir}/evolution-data-server/libedbus-private.so
@ -407,12 +420,18 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{modules_dir}/module-oauth2-services.so
%{modules_dir}/module-outlook-backend.so
%{modules_dir}/module-secret-monitor.so
%{modules_dir}/module-trust-prompt.so
%{modules_dir}/module-webdav-backend.so
%{modules_dir}/module-yahoo-backend.so
%files devel
%{_includedir}/evolution-data-server
%{_includedir}/evolution-data-server/camel
%{_includedir}/evolution-data-server/libebackend
%{_includedir}/evolution-data-server/libebook
%{_includedir}/evolution-data-server/libebook-contacts
%{_includedir}/evolution-data-server/libecal
%{_includedir}/evolution-data-server/libedata-book
%{_includedir}/evolution-data-server/libedata-cal
%{_includedir}/evolution-data-server/libedataserver
%{_libdir}/libcamel-1.2.so
%{_libdir}/libebackend-1.2.so
%{_libdir}/libebook-1.2.so
@ -421,7 +440,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/libedata-book-1.2.so
%{_libdir}/libedata-cal-2.0.so
%{_libdir}/libedataserver-1.2.so
%{_libdir}/libedataserverui-1.2.so
%{_libdir}/pkgconfig/camel-1.2.pc
%{_libdir}/pkgconfig/evolution-data-server-1.2.pc
%{_libdir}/pkgconfig/libebackend-1.2.pc
@ -431,7 +449,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_libdir}/pkgconfig/libedata-book-1.2.pc
%{_libdir}/pkgconfig/libedata-cal-2.0.pc
%{_libdir}/pkgconfig/libedataserver-1.2.pc
%{_libdir}/pkgconfig/libedataserverui-1.2.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
@ -440,7 +457,6 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/gir-1.0/EDataBook-1.2.gir
%{_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}/vala/vapi/camel-1.2.deps
%{_datadir}/vala/vapi/camel-1.2.vapi
%{_datadir}/vala/vapi/libebackend-1.2.deps
@ -457,6 +473,19 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/vala/vapi/libedata-cal-2.0.vapi
%{_datadir}/vala/vapi/libedataserver-1.2.deps
%{_datadir}/vala/vapi/libedataserver-1.2.vapi
%files ui
%dir %{uimodules_dir}
%{_libdir}/libedataserverui-1.2.so.3
%{_libdir}/libedataserverui-1.2.so.3.0.0
%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
%{modules_dir}/module-trust-prompt.so
%files ui-devel
%{_includedir}/evolution-data-server/libedataserverui
%{_libdir}/libedataserverui-1.2.so
%{_libdir}/pkgconfig/libedataserverui-1.2.pc
%{_datadir}/gir-1.0/EDataServerUI-1.2.gir
%{_datadir}/vala/vapi/libedataserverui-1.2.deps
%{_datadir}/vala/vapi/libedataserverui-1.2.vapi
@ -480,6 +509,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
%{_datadir}/installed-tests
%changelog
* Tue Oct 10 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-7
- Resolves: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
* Tue May 24 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-6
- Resolves: #2089902 (CalDAV: Crash on calendar update)