gtk-doc: 1.35.1 -> 1.36.1 (#526593)
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gtk-doc";
|
||||
version = "1.35.1";
|
||||
version = "1.36.1";
|
||||
|
||||
outputDevdoc = "out";
|
||||
|
||||
@@ -26,14 +26,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gtk-doc";
|
||||
rev = version;
|
||||
hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10=";
|
||||
tag = version;
|
||||
hash = "sha256-8hB43BCAtT1B7/ak2i0FAlYD3Kb4rNCWfsJ+wqGu3FA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
passthru.respect_xml_catalog_files_var_patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "pkg-config" "$PKG_CONFIG"
|
||||
@@ -83,8 +79,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
|
||||
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gtk-doc";
|
||||
versionPolicy = "none";
|
||||
@@ -92,6 +86,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/${src.tag}/NEWS";
|
||||
description = "Tools to extract documentation embedded in GTK and GNOME source code";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gtk-doc";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
--- 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
|
||||
Reference in New Issue
Block a user