From f84a28a871778605d17cf1e212685be3fdf9c33c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Aug 2019 13:00:57 +0200 Subject: [PATCH] Add a patch to add also CFLAGS into gtkdoc-scangobj call --- ...ta-server-3.33.90-cflags-to-gtkdoc-scangobj.patch | 12 ++++++++++++ evolution-data-server.spec | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 evolution-data-server-3.33.90-cflags-to-gtkdoc-scangobj.patch diff --git a/evolution-data-server-3.33.90-cflags-to-gtkdoc-scangobj.patch b/evolution-data-server-3.33.90-cflags-to-gtkdoc-scangobj.patch new file mode 100644 index 0000000..7faea0d --- /dev/null +++ b/evolution-data-server-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-data-server.spec b/evolution-data-server.spec index 403fc6f..b194c12 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -39,7 +39,7 @@ License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz -### Patches ### +Patch01: evolution-data-server-3.33.90-cflags-to-gtkdoc-scangobj.patch Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -167,6 +167,7 @@ the functionality of the installed %{name} package. %prep %setup -q +%patch01 -p1 -b .cflags-to-gtkdoc-scangobj %build