[jhbuild/wip/ptomato/updates: 4/4] 3.26, 3.28: Remove source-highlight dependency on macOS
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/wip/ptomato/updates: 4/4] 3.26, 3.28: Remove source-highlight dependency on macOS
- Date: Sun, 15 Apr 2018 07:01:09 +0000 (UTC)
commit 656d47a3dd05c47a3bcdecd64917c7f30bc69337
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Apr 8 15:29:25 2018 -0700
3.26, 3.28: Remove source-highlight dependency on macOS
gtk-doc can fall back to other highlighters, including vim which ships by
default on macOS. This would otherwise bring in some inconvenient
dependencies such as Boost::Regex.
modulesets/gnome-suites-core-deps-3.26.modules | 4 +++-
modulesets/gnome-suites-core-deps-3.28.modules | 4 +++-
modulesets/gnome-suites-core-deps-latest.modules | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index eb0a839..d327478 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -847,7 +847,9 @@ the module and we will just change it to use a tarball anyway.
<dep package="docbook-xml"/>
<dep package="docbook-xsl"/>
<dep package="cc"/>
- <dep package="source-highlight"/>
+ <if condition-unset="macos"> <!-- fall back to vim on macos -->
+ <dep package="source-highlight"/>
+ </if>
</dependencies>
</autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index a4a774a..d685830 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -941,7 +941,9 @@ the module and we will just change it to use a tarball anyway.
<dep package="docbook-xml"/>
<dep package="docbook-xsl"/>
<dep package="cc"/>
- <dep package="source-highlight"/>
+ <if condition-unset="macos"> <!-- fall back to vim on macos -->
+ <dep package="source-highlight"/>
+ </if>
</dependencies>
</autotools>
diff --git a/modulesets/gnome-suites-core-deps-latest.modules
b/modulesets/gnome-suites-core-deps-latest.modules
index a8aae8e..1dd6bca 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -943,7 +943,9 @@ the module and we will just change it to use a tarball anyway.
<dep package="docbook-xml"/>
<dep package="docbook-xsl"/>
<dep package="cc"/>
- <dep package="source-highlight"/>
+ <if condition-unset="macos"> <!-- fall back to vim on macos -->
+ <dep package="source-highlight"/>
+ </if>
</dependencies>
</autotools>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]