diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-08-19 10:50:23 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-08-19 16:01:27 +0200 |
| commit | 100520bab333525faf60fc5149b3b3f31cace304 (patch) | |
| tree | 8ec7ba5721f739f8f3eefb0a585d9045d8d4682c /gnu/packages/patches | |
| parent | b8991c5e1c1b95c981c3a43cc3a22ba5c5f3209f (diff) | |
gnu: gtk-doc: Update to 1.33.2.
* gnu/packages/patches/gtk-doc-respect-xml-catalog.patch: New file.
* gnu/local.mk (DIST_PATCH_DATA): Add it.
* gnu/packages/gtk.scm (gtk-doc): Update to 1.33.2.
[source]: Add gtk-doc-respect-xml-catalog.patch patch.
[build-system]: Switch to meson.
[arguments]: Remove fix-docbook phase.
Remove configure flags that are no longer needed.
[outputs]: Remove the help output since the help-dir option no longer exists.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/gtk-doc-respect-xml-catalog.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch b/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch new file mode 100644 index 0000000000..710f208285 --- /dev/null +++ b/gnu/packages/patches/gtk-doc-respect-xml-catalog.patch @@ -0,0 +1,16 @@ +Taken from here: +https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch. + +--- a/m4/gtkdoc_jh_check_xml_catalog.m4 ++++ b/m4/gtkdoc_jh_check_xml_catalog.m4 +@@ -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 + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3]) + else |