mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch

14 lines
513 B
Diff
Raw Normal View History

gtk_doc: replace catalog lookup hack In the previous commit, we added a setup hook to docbook dtd and xsl packages, that adds derivation’s catalog file to an environment variable. That should, in theory, remove the need for declaring their catalogs manually. Unfortunately, xmlcatalog utility expects exactly one catalog file, completely disregarding the environment variable in non-interactive context. In the same spirit, the design of gtk-doc m4 files only admits a single catalog file, resulting in another ugly hack.
2017-10-06 23:07:40 +01:00
--- a/m4/gtkdoc_jh_check_xml_catalog.m4
+++ b/m4/gtkdoc_jh_check_xml_catalog.m4
gtk-doc: clean up XML_CATALOG_FILES patch libxml2 1.9.7 supports the XML_CATALOG_FILES environment variable natively by using empty catalogfile argument.
2017-11-25 18:58:05 +00:00
@@ -5,8 +5,8 @@
[
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
- if $jh_found_xmlcatalog && \
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
gtk_doc: replace catalog lookup hack In the previous commit, we added a setup hook to docbook dtd and xsl packages, that adds derivation’s catalog file to an environment variable. That should, in theory, remove the need for declaring their catalogs manually. Unfortunately, xmlcatalog utility expects exactly one catalog file, completely disregarding the environment variable in non-interactive context. In the same spirit, the design of gtk-doc m4 files only admits a single catalog file, resulting in another ugly hack.
2017-10-06 23:07:40 +01:00
AC_MSG_RESULT([found])
ifelse([$3],,,[$3])
else
Copy permalink