Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2019-01-03 13:16:13 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2019-01-07 19:56:36 (GMT) |
| commit | 6874d64ed2684d83cb3e340f58f6c8c5089aa857 (patch) | |
| tree | 24fa6af35302b2d7429f464a37fed9c378ee6f99 | |
| parent | 1632f62222bb10516b2f85249083c0fb30c7d1b3 (diff) | |
| download | swift-6874d64ed2684d83cb3e340f58f6c8c5089aa857.zip swift-6874d64ed2684d83cb3e340f58f6c8c5089aa857.tar.bz2 | |
Update for Debianswift-4.0.3
Fix UTF-8 handling issues in
BuildTools/SCons/Tools/textfile.py .
Test-Information:
Tested that ./scons test=unit Swift works on Debain
Unstable (sid) and macOS 10.14.2. Tested that
build_for_debian.sh runs successfully on latest Debian
Unstable (sid).
Change-Id: I29d8c97ce3b4eb3e4fd680bdc814fb0c911262ff
| -rw-r--r-- | BuildTools/SCons/Tools/textfile.py | 4 | ||||
| -rw-r--r-- | Swift/ChangeLog.md | 4 | ||||
| -rw-r--r-- | Swift/Packaging/Debian/changelog.debian-unstable | 4 | ||||
| -rw-r--r-- | Swift/Packaging/Debian/debian/copyright | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py index 89f8963..cc58666 100644 --- a/BuildTools/SCons/Tools/textfile.py +++ b/BuildTools/SCons/Tools/textfile.py @@ -57,19 +57,19 @@ from SCons.Util import is_String, is_Sequence, is_Dict def _do_subst(node, subs): """ Fetch the node contents and replace all instances of the keys with their values. For example, if subs is {'%VERSION%': '1.2345', '%BASE%': 'MyProg', '%prefix%': '/bin'}, then all instances of %VERSION% in the file will be replaced with 1.2345 and so forth. """ - contents = node.get_text_contents() + contents = node.get_contents().decode('utf-8') if not subs: return contents for (k,v) in subs: contents = re.sub(k, v, contents) return contents def _action(target, source, env): # prepare the line separator linesep = env['LINESEPARATOR'] if linesep is None: @@ -107,19 +107,19 @@ def _action(target, source, env): # write the file try: fd = open(target[0].get_path(), "wb") except (OSError,IOError), e: raise SCons.Errors.UserError("Can't write target file %s" % target[0]) # separate lines by 'linesep' only if linesep is not empty lsep = None for s in source: if lsep: fd.write(lsep) - fd.write(_do_subst(s, subs)) + fd.write(_do_subst(s, subs).encode("utf-8")) lsep = linesep fd.close() def _strfunc(target, source, env): return "Creating '%s'" % target[0] def _convert_list_R(newlist, sources): for elem in sources: if is_Sequence(elem): diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md index d43a6db..9152b50 100644 --- a/Swift/ChangeLog.md +++ b/Swift/ChangeLog.md @@ -1,9 +1,13 @@ +4.0.3 (2019-01-03) +------------------ +- Fix handling of empty bookmark responses + 4.0.2 (2018-04-05) ------------------ - Fix versioning issue in Windows Installer process 4.0.1 (2018-03-28) ------------------ - Allow setting vCard on servers that do not return an empty vCard on fresh accounts 4.0 (2018-03-20) diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable index a6b7606..f2bf2c5 100644 --- a/Swift/Packaging/Debian/changelog.debian-unstable +++ b/Swift/Packaging/Debian/changelog.debian-unstable @@ -1,26 +1,26 @@ -swift-im (4.0.2-1) UNRELEASED; urgency=medium +swift-im (4.0.3-1) UNRELEASED; urgency=medium * New chat theme including a new font * Support for message carbons (XEP-0280) * Enabled trellis mode as a default feature, allowing several tiled chats windows to be shown at once * Redesigned keyword highlighting * Improve date formatting * Fix Last Message Correction in multi client scenarios * Fix UI layout issue for translations that require right-to-left (RTL) layout * Fix UX issues in trellis mode * Improvements to font size handling in the chat theme * Add AppImage for Linux 64-bit as a supported platform * Improved spell checker support on Linux * Allow setting vCard on servers that do not return an empty vCard on fresh accounts * And assorted smaller features and usability enhancements. Closes: 840151, 889062 - -- Kevin Smith <kevin@kismith.co.uk> Tue, 10 Apr 2018 10:46:13 +0200 + -- Kevin Smith <kevin@kismith.co.uk> Thu, 03 Jan 2019 13:59:07 +0100 swift-im (3.0.4-1) unstable; urgency=low * New upstream release * Allow compiling with newer boosts. Closes: 810839, 822131 * Switch to Qt5 instead of Qt4. Closes: 784532, 745807 * Fix some platform detection in build system. Closes: 757554 * Rewrite rules file with dh sequencer. * Drop -dbg package. diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright index a0c2c79..9219930 100644 --- a/Swift/Packaging/Debian/debian/copyright +++ b/Swift/Packaging/Debian/debian/copyright @@ -1,15 +1,15 @@ This package was debianized by the Swift project <packages@swift.im>, with help from Olly Betts <olly@survex.com>. The upstream sources were obtained from http://swift.im. -Copyright (C) 2010-2016 Isode Limited. +Copyright (C) 2010-2019 Isode Limited. Licensed under the GNU General Public License. See /usr/share/common-licenses/GPL-3 for the full license. This software is subject to the OpenSSL license exception. Additional permission under GNU GPL version 3 section 7 If you modify this Program, or any covered work, by linking or combining |