From 861d6fa92c465920e65db47ee4fac531156500ec Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 17 Feb 2023 14:30:01 -0500 Subject: gnu: Remove QtWebKit. This fixes . * gnu/packages/qt.scm (qtwebkit): Remove variable. * gnu/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch, gnu/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch, gnu/packages/patches/qtwebkit-fix-building-with-icu-68.patch, gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch, gnu/packages/patches/qtwebkit-pbutils-include.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/education.scm (openboard): Adjust code comment. --- .../qtwebkit-fix-building-with-python-3.9.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch (limited to 'gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch') diff --git a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch b/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch deleted file mode 100644 index 9f9674de33..0000000000 --- a/gnu/packages/patches/qtwebkit-fix-building-with-python-3.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -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())) - -- cgit v1.2.3