Add a patch to add also CFLAGS into gtkdoc-scangobj call

This commit is contained in:
Milan Crha 2019-08-05 13:05:07 +02:00
parent 45e514ef04
commit 260259b146
2 changed files with 15 additions and 1 deletions

View File

@ -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)

View File

@ -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