Fix building with Python 3.9: https://github.com/qtwebkit/qtwebkit/issues/993 Patch copied from upstream source repository: https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 3 Jun 2020 15:01:42 +0300 Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to json.load() In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument is not supported. Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9 --- Source/JavaScriptCore/generate-bytecode-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files index c5dab429c7b0f..af3431275ecf9 100644 --- a/Source/JavaScriptCore/generate-bytecode-files +++ b/Source/JavaScriptCore/generate-bytecode-files @@ -163,7 +163,7 @@ if __name__ == "__main__": initBytecodesFile = openOrExit(initASMFileName, "w") try: - bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") + bytecodeSections = json.load(bytecodeFile) except: print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) /Makevars?id=4a1f79da3648383ffaa2114857b4205cd3de1922'>commitdiff
path: root/po/packages/Makevars
AgeCommit message (Expand)Author
2021-05-03nls: Do not update po files on first make invocation....We need to update the minimal gettext version to take advantage of new features. Before this patch, the first make invocation would modify po/guix and po/packages po files, and we advised to run `git checkout po` to clean the changes. * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1. * po/guix/Makevars: Set PO_DEPENDS_ON_POT to no. * po/packages/Makevars: Set PO_DEPENDS_ON_POT to no. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Julien Lepiller
2020-09-29nls: Fix copyright and bug address in pot files....* po/guix/Makevars: Fix COPYRIGHT_HOLDER and MSGID_BUGS_ADDRESS. * po/packages/Makevars: idem. Julien Lepiller