[packages/cyrus-imapd] fix compatibility with new sphinx versions

atler atler at pld-linux.org
Tue Jun 7 10:26:45 CEST 2022


commit 16c3f53baf3cd1186779ae0b10b34191e32288d6
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jun 7 10:26:06 2022 +0200

    fix compatibility with new sphinx versions
    
    based on:
    https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg599466.html

 cyrus-imapd.spec |  2 ++
 sphinx.patch     | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7dc3edf..c1100ea 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -40,6 +40,7 @@ Patch1:		link.patch
 Patch2:		%{name}-clamav-0.101.patch
 Patch3:		%{name}-sphinx3.patch
 Patch4:		openssl3.patch
+Patch5:		sphinx.patch
 URL:		http://www.cyrusimap.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -207,6 +208,7 @@ Perlowy interfejs do biblioteki cyrus-imapd.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
 
diff --git a/sphinx.patch b/sphinx.patch
new file mode 100644
index 0000000..e8310cc
--- /dev/null
+++ b/sphinx.patch
@@ -0,0 +1,22 @@
+--- cyrus-imapd-3.0.16/docsrc/exts/sphinxlocal/writers/manpage.py.orig	2022-06-07 10:16:14.013713399 +0200
++++ cyrus-imapd-3.0.16/docsrc/exts/sphinxlocal/writers/manpage.py	2022-06-07 10:23:44.408058016 +0200
+@@ -38,7 +38,7 @@
+         self.builder = builder
+ 
+     def translate(self):
+-        visitor = CyrusManualPageTranslator(self.builder, self.document)
++        visitor = CyrusManualPageTranslator(self.document, self.builder)
+         self.visitor = visitor
+         self.document.walkabout(visitor)
+         self.output = visitor.astext()
+@@ -49,8 +49,8 @@
+     Custom translator.
+     """
+ 
+-    def __init__(self, builder, *args, **kwds):
+-        BaseTranslator.__init__(self, builder, *args, **kwds)
++    def __init__(self, document, builder, *args, **kwds):
++        BaseTranslator.__init__(self, document, builder, *args, **kwds)
+         self.builder = builder
+ 
+         self.in_productionlist = 0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cyrus-imapd.git/commitdiff/16c3f53baf3cd1186779ae0b10b34191e32288d6



More information about the pld-cvs-commit mailing list