Stephen Kitt pushed to branch experimental at Debian Java Maintainers / openjfx
Commits: 1dd38239 by Stephen Kitt at 2020-09-21T13:29:53+02:00 Fix jsmin stream handling with Python 3 - - - - - 3 changed files: - debian/changelog - + debian/patches/35-python-streams.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +openjfx (11.0.7+0-5~exp2) experimental; urgency=medium + + * Team upload. + * Fix jsmin stream handling with Python 3. + + -- Stephen Kitt <[email protected]> Mon, 21 Sep 2020 13:29:23 +0200 + openjfx (11.0.7+0-5~exp1) experimental; urgency=medium * Team upload. ===================================== debian/patches/35-python-streams.patch ===================================== @@ -0,0 +1,18 @@ +Description: Use text streams for jsmin +Author: Stephen Kitt <[email protected]> + +jsmin expects text streams, so make-js-file-arrays needs to use open() +rather than io.FileIO(). (This is simpler than fixing jsmin-noop which +is used in a variety of ways, with different streams.) + +--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/Scripts/make-js-file-arrays.py ++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/Scripts/make-js-file-arrays.py +@@ -74,7 +74,7 @@ + jsm = JavascriptMinify() + + for inputFileName in inputPaths: +- inputStream = io.FileIO(inputFileName) ++ inputStream = open(inputFileName, 'r') + outputStream = StringIO() + + if not options.no_minify: ===================================== debian/patches/series ===================================== @@ -19,3 +19,4 @@ no-error_deprecated-declarations.patch 32-gradle-compatibility.patch 33-compile-threads.patch 34-duplicate-symbols.patch +35-python-streams.patch View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/1dd38239641e2a823de32fdf0f0b758bb5caa78c -- View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/1dd38239641e2a823de32fdf0f0b758bb5caa78c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
