forked from pool/itstool
Bjørn Lie
93269f2311
All of PPC built now :-) Seems we can finally move forward with this one. Fedora is already shipping this version. - Update to version 2.0.5: + Allow preserveSpace on XML attributes. + Fixed issue with writing files under macOS. + Fixed various differences between Python 2 and 3. + Fixed issues with libxml2 memory management. - Add itstool-Apply-ITS-files.patch: Apply ITS files passed with -i in --join mode. - Drop patch itstool-2.0.4-serialize_to_str.patch and itstool-2.0.4-memory-management.patch: fixed upstream. - Switch directly to py3 istool, as it seems it does not break there should be no real requirement to use the python2 variant (even on old products it should be ok to use py3 one) - Add patch itstool-2.0.4-serialize_to_str.patch to fix upstream big #19 (fix str/bytes issue) - Be consistent in using python%{_python_ver} - Modernize spec-file by calling spec-cleaner - Introduce _python_ver variable, currently set to '2': allow for an easy way to toggle between python3 and python2 based itstool. Currently using python2, as python3-based itstool still has issues. - Switch to python3 version: + Add python3-base BuildRequires: unlike python2, py3 is not implicit in the buildroot yet. + Export PYTHON=python3 before configure. + Replace libxml2-python (Build)?Requires with python3-libxml2-python. - Replace itstool-2.0.4-no-freedoc.patch with itstool-2.0.4-memory-management.patch: use upstream provided solution for the crshes. - Update to version 2.0.4: + Fixed a massive performance issue. - Add itstool-2.0.4-no-freedoc.patch: Do not free xmlDocs, avoid crashes (gh#itstool/itstool#17). - Update to version 2.0.3: + Added: - Python 3 support. Keeping Python 2 support for now. - --path option for extra paths for ITS files. + Fixed: - --keep-entities mode after some libxml2 changes. - UTF-8 handling for translated attributes. + Don't error out (except under -s) for mismatched placeholders. OBS-URL: https://build.opensuse.org/request/show/659962 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=26
26 lines
889 B
Diff
26 lines
889 B
Diff
From bc5724ed98eb591d4b82dff1b4b47ed77ec47eda Mon Sep 17 00:00:00 2001
|
|
From: Shaun McCance <shaunm@redhat.com>
|
|
Date: Thu, 8 Nov 2018 19:01:43 -0500
|
|
Subject: [PATCH] Apply ITS files passed with -i in --join mode
|
|
|
|
Fixes https://github.com/itstool/itstool/issues/34
|
|
---
|
|
itstool.in | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/itstool.in b/itstool.in
|
|
index b3c0033..e64cd34 100755
|
|
--- a/itstool.in
|
|
+++ b/itstool.in
|
|
@@ -1635,6 +1635,9 @@ if __name__ == '__main__':
|
|
messages = MessageList()
|
|
doc = Document(opts.join, messages)
|
|
doc.apply_its_rules(not(opts.nobuiltins), params=params)
|
|
+ if opts.itsfile is not None:
|
|
+ for itsfile in opts.itsfile:
|
|
+ doc.apply_its_file(itsfile, params=params)
|
|
doc.join_translations(translations, strict=opts.strict)
|
|
serialized = doc._doc.serialize('utf-8')
|
|
if PY3:
|
|
|