From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- ...generated-files-handle-unicode-characters.patch | 38 ++++++++++++++++++++++ .../files/swift-4.0.2-qt-5.11-compatibility.patch | 35 ++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch create mode 100644 net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch (limited to 'net-im/swift/files') diff --git a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch new file mode 100644 index 000000000000..7fd2e386d9d9 --- /dev/null +++ b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch @@ -0,0 +1,38 @@ +From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001 +From: Thanos Doukoudakis +Date: Fri, 11 May 2018 11:26:39 +0100 +Subject: Make generated files handle Unicode characters + +This patch handles a case where some of the files used to generate COPYING, +were containing unicode strings, which could lead to a failure when building +sid package. The code now will check the type of the string before writing to +the file, and if needed it will transform it to the appropriate format. + +Test-Information: +Generated the sid package with package_all_platforms script with no problems. +Created a debian sid box and tested the installation of the generated +packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds +through the "About" dialog in Swift. + +Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c + +diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py +index 89f8963..9b424f2 100644 +--- a/BuildTools/SCons/Tools/textfile.py ++++ b/BuildTools/SCons/Tools/textfile.py +@@ -113,7 +113,11 @@ def _action(target, source, env): + lsep = None + for s in source: + if lsep: fd.write(lsep) +- fd.write(_do_subst(s, subs)) ++ stringtowrite = _do_subst(s, subs) ++ if isinstance(stringtowrite, str): ++ fd.write(stringtowrite) ++ elif isinstance(stringtowrite, unicode): ++ fd.write(stringtowrite.encode('utf-8')) + lsep = linesep + fd.close() + +-- +cgit v0.10.2-6-g49f6 + diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch new file mode 100644 index 000000000000..db633945b49d --- /dev/null +++ b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch @@ -0,0 +1,35 @@ +From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001 +From: Tobias Markmann +Date: Thu, 21 Jun 2018 13:04:56 +0200 +Subject: Add missing include for QAbstractItemModel + +This fixes building Swift with Qt 5.11. + +Test-Information: + +Builds and tests pass on macOS 10.13.5 with Qt 5.11.0. + +Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777 + +diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h +index 0714ac1..fe536ab 100644 +--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h ++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2010-2016 Isode Limited. ++ * Copyright (c) 2010-2018 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +@@ -8,6 +8,7 @@ + + #include + ++#include + #include + + #include +-- +cgit v0.10.2-6-g49f6 + -- cgit v1.2.3