From 260259b146670295e5ad93223328f37fd52300fd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Aug 2019 13:05:07 +0200 Subject: [PATCH] Add a patch to add also CFLAGS into gtkdoc-scangobj call --- evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch | 12 ++++++++++++ evolution.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch diff --git a/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch b/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch new file mode 100644 index 0000000..7faea0d --- /dev/null +++ b/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake +index 0ba1a7a78..2dfc4d691 100644 +--- a/cmake/modules/GtkDoc.cmake ++++ b/cmake/modules/GtkDoc.cmake +@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign + + # Add it as the last, thus in-tree headers have precedence + list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) ++ list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS}) + + if(_scangobj_deps) + list(REMOVE_DUPLICATES _scangobj_deps) diff --git a/evolution.spec b/evolution.spec index 74ec4c4..07691e1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in -### Patches ### +Patch01: evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -228,6 +228,8 @@ the functionality of the installed %{name} package. %prep %setup -q -n %{name}-%{version} +%patch01 -p1 -b .cflags-to-gtkdoc-scangobj + # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do echo -n "" > $inbox