gtk-doc: 1.30 -> 1.32

Drop patch for "Wrong permissions for style CSS file".
It was fixed in 1.31

https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/NEWS
This commit is contained in:
worldofpeace 2019-10-12 17:25:59 -04:00
parent 6f1deb7d45
commit f03b26c134
2 changed files with 13 additions and 30 deletions

View File

@ -1,24 +0,0 @@
From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 May 2019 14:44:08 -0400
Subject: [PATCH] highlight: fix permission on file style
---
gtkdoc/highlight.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
index 8f6e470..d11c432 100644
--- a/gtkdoc/highlight.py
+++ b/gtkdoc/highlight.py
@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
def append_style_defs(css_file_name):
- os.chmod(css_file_name, stat.S_IWRITE)
+ os.chmod(css_file_name, 0o664)
with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
css.write(HTML_FORMATTER.get_style_defs())
--
2.21.0

View File

@ -13,22 +13,29 @@
, withDblatex ? false, dblatex
}:
let
# Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
python = python3.withPackages (p: with p; [
pygments
]);
in
stdenv.mkDerivation rec {
pname = "gtk-doc";
version = "1.30";
version = "1.32";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk";
};
patches = [
passthru.respect_xml_catalog_files_var_patch
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
./0001-highlight-fix-permission-on-file-style.patch
];
outputDevdoc = "out";
@ -44,7 +51,7 @@ stdenv.mkDerivation rec {
docbook_xsl
libxslt
pkgconfig
python3
python
libxml2Python
]
++ stdenv.lib.optional withDblatex dblatex
@ -77,6 +84,6 @@ stdenv.mkDerivation rec {
description = "Tools to extract documentation embedded in GTK and GNOME source code";
homepage = "https://www.gtk.org/gtk-doc";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub worldofpeace ];
};
}