From fc401acb15f15d487c942437b6fb429289dd3c67 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Fri, 31 May 2019 13:22:25 +0200
Subject: [PATCH] Add installation directory as a default directory.

In Guix, this library is installed in a separate directory in the store,
and it's typically not installed system-wide in a fixed directory. Add
the store path to the set of default directories so dependents can find
default langs and source highlighting scheme.
---
 gtksourceview/gtksourceview-utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gtksourceview/gtksourceview-utils.c b/gtksourceview/gtksourceview-utils.c
index 6f06bab..c3467d5 100644
--- a/gtksourceview/gtksourceview-utils.c
+++ b/gtksourceview/gtksourceview-utils.c
@@ -66,6 +66,12 @@ _gtk_source_view_get_default_dirs (const char *basename,
 							 basename,
 							 NULL));
 
+    /* installed dir */
+    g_ptr_array_add (dirs, g_build_filename (DATADIR,
+						 SOURCEVIEW_DIR,
+						 basename,
+						 NULL));
+
 	g_ptr_array_add (dirs, NULL);
 
 	return (gchar**) g_ptr_array_free (dirs, FALSE);
-- 
2.21.0

active' href='/guix/log/tests/cve.scm'>log</a><a href='/guix/tree/tests/cve.scm?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>tree</a><a href='/guix/commit/tests/cve.scm?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>commit</a><a href='/guix/diff/tests/cve.scm?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/cve.scm'>
<input type='hidden' name='id' value='7693ee2dd09d3df4ccc8a62f14fed11b78d69980'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>root</a>/<a href='/guix/log/tests?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>tests</a>/<a href='/guix/log/tests/cve.scm?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980'>cve.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/cve.scm?id=7693ee2dd09d3df4ccc8a62f14fed11b78d69980&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-23 16:40:17 +0200'>2019-10-23</span></td><td><a href='/guix/commit/tests/cve.scm?id=74afaa37d5dec1a9d1b83951529ba69d8947fb07'>cve: Rewrite to read the JSON feed instead of the XML feed.</a><span class='msg-avail'>...<span class='msg-tooltip'>The XML feed was discontinued on Oct. 16th, 2019:

  &lt;https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement-Phase-3&gt;

* guix/cve.scm (string-&gt;date*): New procedure.
(&lt;cve-item&gt;, &lt;cve&gt;, &lt;cve-reference&gt;): New record types.
(cpe-match-&gt;cve-configuration, configuration-data-&gt;cve-configurations)
(json-&gt;cve-items, version-matches?): New procedures.
(yearly-feed-uri): Change URL to refer to JSON feed.
(cpe-&gt;product-alist, %parse-vulnerability-feed)
(xml-&gt;vulnerabilities): Remove.
(cve-configuration-&gt;package-list, merge-package-lists)
(cve-item-&gt;vulnerability, json-&gt;vulnerabilities): New procedures.
(write-cache): Use 'json-&gt;vulnerabilities' instead of
'xml-&gt;vulnerabilities', and remove 'parameterize'.
(vulnerabilities-&gt;lookup-proc): Use 'version-matches?' when VERSION is
true.
* tests/cve.scm (%sample): Use 'tests/cve-sample.json'.
(%expected-vulnerabilities): Rewrite accordingly.
("json-&gt;cve-items", "cve-item-published-date")
("json-&gt;vulnerabilities"): New tests.
("xml-&gt;vulnerabilities"): Remove.
("vulnerabilities-&gt;lookup-proc"): Adjust to new vulnerabilities.
* tests/cve-sample.json: New file.
* tests/cve-sample.xml: Remove.
* Makefile.am (EXTRA_DIST): Adjust accordingly.
* doc/guix.texi (Invoking guix lint): Update nist.gov URLs.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-20 23:26:50 +0200'>2019-10-20</span></td><td><a href='/guix/commit/tests/cve.scm?id=79c03e55e26d88c8d327daced02367abe7f17f91'>tests: Avoid now-deprecated 'make-struct'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of
'make-struct', which is deprecated.
* tests/lint.scm ("cve: one vulnerability")
("cve: one patched vulnerability")
("cve: known safe from vulnerability")
("cve: vulnerability fixed in replacement version")
("cve: patched vulnerability in replacement"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>