Browse Source

[testing] -> [extra] 'itstool-1:2.0.6-2' move

master
Dudemanguy 2 years ago
parent
commit
ffc331b054
Signed by: Dudemanguy GPG Key ID: 4003D2EF625D6492
  1. 2
      itstool/repos/extra-any/PKGBUILD
  2. 48
      itstool/repos/testing-any/PKGBUILD
  3. 68
      itstool/repos/testing-any/itstool-2.0.5-fix-crash-wrong-encoding.patch

2
itstool/repos/extra-any/PKGBUILD

@ -3,7 +3,7 @@
pkgname=itstool
pkgver=2.0.6
pkgrel=1
pkgrel=2
epoch=1
pkgdesc="XML to PO and back again"
arch=(any)

48
itstool/repos/testing-any/PKGBUILD

@ -1,48 +0,0 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Michael Pusterhofer <pusterhofer(at)student(dot)tugraz(dot)at>
pkgname=itstool
pkgver=2.0.6
pkgrel=2
epoch=1
pkgdesc="XML to PO and back again"
arch=(any)
url="http://itstool.org/"
license=(GPL3)
depends=(python libxml2 docbook-xml)
makedepends=(git)
_commit=60f3a955ca047b1d62a1d952beec74afaff7cbbf # tags/2.0.6^0
source=("git+https://github.com/itstool/itstool#commit=$_commit"
itstool-2.0.5-fix-crash-wrong-encoding.patch)
sha256sums=('SKIP'
'cb57e3694ab3d7c62b063629b2e9edc6327260c0797d0f33c8dc97fe37c40ebb')
pkgver() {
cd $pkgname
git describe --tags | sed 's/-/+/g'
}
prepare() {
cd $pkgname
# From https://src.fedoraproject.org/rpms/libxml2/tree/master
patch -Np1 -i ../itstool-2.0.5-fix-crash-wrong-encoding.patch
autoreconf -fvi
}
build() {
cd $pkgname
./configure --prefix=/usr
make
}
check() {
cd $pkgname
make check
}
package() {
cd $pkgname
make DESTDIR="$pkgdir" install
}

68
itstool/repos/testing-any/itstool-2.0.5-fix-crash-wrong-encoding.patch

@ -1,68 +0,0 @@
Description: Fix the crash from #912099
ITS Tool 2.0.4 crashes when building some documentation, as reported in
#912099. This comes from translations with invalid XML markup, which ITS Tool
fails to merge (which is not abnormal), and to report these issues, needlessly
encodes the original msgstr from unicode to bytes, causing it to be recoded
using the default ascii codec, which fails when the msgstr contains anything
out of ascii.
.
This patch removes the useless decoding, avoiding the failing subsequent
recoding. It also explicitly encodes the output strings to be able to print
them in all cases, even when the output encoding cannot be detected.
Bug: https://github.com/itstool/itstool/issues/25
Bug-Debian: https://bugs.debian.org/912099
Forwarded: https://github.com/itstool/itstool/issues/25
Author: Tanguy Ortolo <tanguy+debian@ortolo.eu>
Last-Update: 2018-12-071
Index: itstool/itstool.in
===================================================================
--- itstool.orig/itstool.in 2018-12-10 18:31:23.762143539 +0100
+++ itstool/itstool.in 2018-12-10 18:38:03.496777117 +0100
@@ -44,9 +44,22 @@
else:
return str(s)
ustr_type = str
+ def pr_str(s):
+ """Return a string that can be safely print()ed"""
+ # Since print works on both bytes and unicode, just return the argument
+ return s
else:
string_types = basestring,
ustr = ustr_type = unicode
+ def pr_str(s):
+ """Return a string that can be safely print()ed"""
+ if isinstance(s, str):
+ # Since print works on str, just return the argument
+ return s
+ else:
+ # print may not work on unicode if the output encoding cannot be
+ # detected, so just encode with UTF-8
+ return unicode.encode(s, 'utf-8')
NS_ITS = 'http://www.w3.org/2005/11/its'
NS_ITST = 'http://itstool.org/extensions/'
@@ -1060,9 +1073,9 @@
if strict:
raise
else:
- sys.stderr.write('Warning: Could not merge %stranslation for msgid:\n%s\n' % (
+ sys.stderr.write(pr_str('Warning: Could not merge %stranslation for msgid:\n%s\n' % (
(lang + ' ') if lang is not None else '',
- msgstr.encode('utf-8')))
+ msgstr)))
self._xml_err = ''
return node
def scan_node(node):
@@ -1087,9 +1100,9 @@
if strict:
raise
else:
- sys.stderr.write('Warning: Could not merge %stranslation for msgid:\n%s\n' % (
+ sys.stderr.write(pr_str('Warning: Could not merge %stranslation for msgid:\n%s\n' % (
(lang + ' ') if lang is not None else '',
- msgstr.encode('utf-8')))
+ msgstr)))
self._xml_err = ''
ctxt.doc().freeDoc()
return node
Loading…
Cancel
Save