pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/salt-docs salt-docs: added patches



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a1956ff7d3a
branches:  trunk
changeset: 314341:9a1956ff7d3a
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Oct 25 09:09:35 2018 +0000

description:
salt-docs: added patches

diffstat:

 sysutils/salt-docs/Makefile                              |   4 ++--
 sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 2df261852276 -r 9a1956ff7d3a sysutils/salt-docs/Makefile
--- a/sysutils/salt-docs/Makefile       Thu Oct 25 09:08:37 2018 +0000
+++ b/sysutils/salt-docs/Makefile       Thu Oct 25 09:09:35 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/10/25 09:08:37 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/10/25 09:09:35 adam Exp $
 
 DISTNAME=      salt-2018.3.3
 PKGNAME=       ${DISTNAME:S/-/-docs-/}
@@ -28,7 +28,7 @@
 PYTHON_VERSIONS_ACCEPTED=      27
 
 do-install:
-       cd ${WRKSRC}/doc/_build/html && pax -rw -pe . ${DESTDIR}${PREFIX}/${HTMLDIR}
+       cd ${WRKSRC}/doc/_build/html && pax -rw -pp . ${DESTDIR}${PREFIX}/${HTMLDIR}
        cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 
 .include "../../lang/python/pyversion.mk"
diff -r 2df261852276 -r 9a1956ff7d3a sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py  Thu Oct 25 09:09:35 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc___ext_saltdomain.py,v 1.1 2018/10/25 09:09:35 adam Exp $
+
+Do not import Directive twice.
+
+--- doc/_ext/saltdomain.py.orig        2018-10-25 07:52:41.000000000 +0000
++++ doc/_ext/saltdomain.py
+@@ -7,7 +7,7 @@ from docutils.parsers.rst import Directi
+ 
+ from docutils.statemachine import ViewList
+ from sphinx import addnodes
+-from sphinx.directives import ObjectDescription, Directive
++from sphinx.directives import ObjectDescription
+ from sphinx.domains import Domain, ObjType
+ from sphinx.domains.python import PyObject
+ from sphinx.locale import l_, _



Home | Main Index | Thread Index | Old Index