commit 296c1e5f64e12cd58a80180fde380804d3bb822d
Author: Marcin Banasiak <[email protected]>
Date: Tue Mar 21 20:39:59 2017 +0100
Get highlight path from environment variable
evolution-highlight.patch | 20 ++++++++++++++++++++
evolution.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/evolution.spec b/evolution.spec
index b8c3fab..82ce92c 100644
--- 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"
diff --git a/evolution-highlight.patch b/evolution-highlight.patch
new file mode 100644
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/evolution.git/commitdiff/296c1e5f64e12cd58a80180fde380804d3bb822d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
