Get highlight path from environment variable

diff --git a/evolution-highlight.patch b/evolution-highlight.patch
new file mode 100644 (file)
index 0000000..aba0ed6
--- /dev/null
+++ b/evolution-highlight.patch
@@ -0,0 +1,20 @@
+--- evolution-3.24.0/CMakeLists.txt.fixhighlight       2017-03-21 20:36:57.843919570 +0100
++++ evolution-3.24.0/CMakeLists.txt    2017-03-21 20:38:53.841009779 +0100
+@@ -627,11 +627,14 @@ set(plugins_standard
+ add_printable_option(ENABLE_TEXT_HIGHLIGHT "Enable text-highlight plugin" ON)
+ 
+ if(ENABLE_TEXT_HIGHLIGHT)
+-      find_program(HIGHLIGHT_COMMAND highlight)
++      set(HIGHLIGHT_COMMAND "")
++      if(HIGHLIGHT_COMMAND STREQUAL "")
++              set(HIGHLIGHT_COMMAND "$ENV{HIGHLIGHT}")
++      endif(HIGHLIGHT_COMMAND STREQUAL "")
+ 
+-      if(NOT HIGHLIGHT_COMMAND)
++      if(HIGHLIGHT_COMMAND STREQUAL "")
+               message(FATAL_ERROR "The 'highlight' program not found; either give it into PATH or disable higlight plugin with -DENABLE_TEXT_HIGHLIGHT=OFF")
+-      endif(NOT HIGHLIGHT_COMMAND)
++      endif(HIGHLIGHT_COMMAND STREQUAL "")
+ endif(ENABLE_TEXT_HIGHLIGHT)
+ 
+ # weather calendar

diff --git a/evolution.spec b/evolution.spec
index b8c3fab7170fd4e1940263b943c2d7a654127c46..82ce92caf59e2391b343e3d6b6578a6a7dfdf320 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -23,6 +23,7 @@ Source4:      %{name}-calendar.desktop
 Source5:       %{name}-mail.desktop
 Source6:       %{name}-tasks.desktop
 Patch0:                %{name}-gtkdoc.patch
+Patch1:                %{name}-highlight.patch
 URL:           http://wiki.gnome.org/Apps/Evolution/
 BuildRequires: atk-devel
 BuildRequires: bison
@@ -278,6 +279,7 @@ Dokumentacja API Evolution.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export BOGOFILTER="/usr/bin/bogofilter"