summaryrefslogtreecommitdiffstats
path: root/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch')
-rw-r--r--source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch
new file mode 100644
index 000000000..d6d45df0b
--- /dev/null
+++ b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch
@@ -0,0 +1,38 @@
+From adb0929f0db4da533a9d5b317e6f49a91feb3b3e Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 3 Dec 2013 18:03:13 +0100
+Subject: [PATCH] [a2x] Write manifests in UTF-8 by default
+
+This is a workaround for rhbz#968308 where a2x tries to write non-ASCII content
+epub manifest. Since the write_file is mostly used to write xml content which
+defaults to UTF-8 this seems fairly safe
+---
+ a2x.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/a2x.py b/a2x.py
+index 1b192a2..ad163e3 100755
+--- a/a2x.py
++++ b/a2x.py
+@@ -21,6 +21,7 @@ import urlparse
+ import zipfile
+ import xml.dom.minidom
+ import mimetypes
++import codecs
+
+ PROG = os.path.basename(os.path.splitext(__file__)[0])
+ VERSION = '8.6.8'
+@@ -144,8 +145,8 @@ def find_executable(file_name):
+ result = _find_executable(file_name)
+ return result
+
+-def write_file(filename, data, mode='w'):
+- f = open(filename, mode)
++def write_file(filename, data, mode='w', encoding='utf-8'):
++ f = codecs.open(filename, mode, encoding)
+ try:
+ f.write(data)
+ finally:
+--
+1.8.4.2
+