summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Sateler <fsateler@debian.org>2020-04-05 11:06:16 -0400
committerFelipe Sateler <fsateler@debian.org>2020-04-05 11:06:16 -0400
commitdd45cf290fef716ba93511c92101b33800638937 (patch)
treea1648d2597a6563d12ef9bf01e71240bca0fe7f3
parent77e88900e06b1fc6d7db04e7a5db9edb0145d5c2 (diff)
Drop patch Fix-FTBFS-due-to-newer-python-pygments.patch
Alternative solution applied upstream
-rw-r--r--debian/patches/Fix-FTBFS-due-to-newer-python-pygments.patch25
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 26 deletions
diff --git a/debian/patches/Fix-FTBFS-due-to-newer-python-pygments.patch b/debian/patches/Fix-FTBFS-due-to-newer-python-pygments.patch
deleted file mode 100644
index 568ff1d..0000000
--- a/debian/patches/Fix-FTBFS-due-to-newer-python-pygments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Felipe Sateler <fsateler@debian.org>
-Date: Fri, 11 Jan 2019 20:08:06 -0300
-Subject: Fix FTBFS due to newer python-pygments
-
-Score statements are now a 2-tuple instead of a 3-tuple
-
-Closes: #918560
----
- csd2docbook.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/csd2docbook.py b/csd2docbook.py
-index 47b70d5..bc1c643 100644
---- a/csd2docbook.py
-+++ b/csd2docbook.py
-@@ -370,8 +370,7 @@ for opcodeName in opcodeNames:
- # as closely as possible, change the token type of score statements from Keyword
- # to Name.Builtin so that they look like opcodes.
- stateTuple = CsoundScoreLexer.tokens['root'][3]
--CsoundScoreLexer.tokens['root'][3] = (stateTuple[0], Token.Name.Builtin, stateTuple[2])
--
-+CsoundScoreLexer.tokens['root'][3] = (stateTuple[0], Token.Name.Builtin)
-
- # See http://pygments.org/docs/formatterdevelopment/.
- class DocBookFormatter(Formatter):
diff --git a/debian/patches/series b/debian/patches/series
index 8192786..2cab741 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
Don-t-build-the-opcodes-we-deleted.patch
-#Fix-FTBFS-due-to-newer-python-pygments.patch
Build_with_python3.patch