Stephen Kitt pushed to branch master at Debian Java Maintainers / openjfx
Commits: bc544f25 by Stephen Kitt at 2020-09-21T11:38:59+02:00 Mark GST_API symbols as external Closes: #969260 - - - - - 1dd38239 by Stephen Kitt at 2020-09-21T13:29:53+02:00 Fix jsmin stream handling with Python 3 - - - - - 52c5c6c7 by Stephen Kitt at 2020-09-21T15:19:51+02:00 Merge for unstable - - - - - 4 changed files: - debian/changelog - + debian/patches/34-duplicate-symbols.patch - + debian/patches/35-python-streams.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +openjfx (11.0.7+0-5) unstable; urgency=medium + + * Team upload. + * Mark GST_API symbols as external. Closes: #969260. + * Fix jsmin stream handling with Python 3. + + -- Stephen Kitt <[email protected]> Mon, 21 Sep 2020 15:06:24 +0200 + openjfx (11.0.7+0-4) unstable; urgency=medium * Team upload. ===================================== debian/patches/34-duplicate-symbols.patch ===================================== @@ -0,0 +1,26 @@ +Description: Indicate that GST_API symbols are exported in all cases +Author: Stephen Kitt <[email protected]> + +With GCC 10, the lite build results in duplicated GST_API symbols. It +seems the simplest fix is to use the non-lite case, which marks these +symbols as external. + +--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstconfig.h ++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstconfig.h +@@ -159,16 +159,9 @@ + # endif + #endif + +-#ifdef GSTREAMER_LITE +- // We using def file to limit export, so not need to export all APIs +- #ifndef GST_API +- #define GST_API +- #endif +-#else // GSTREAMER_LITE + #ifndef GST_API + #define GST_API GST_EXPORT + #endif +-#endif // GSTREAMER_LITE + + /* These macros are used to mark deprecated functions in GStreamer headers, + * and thus have to be exposed in installed headers. But please ===================================== 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 ===================================== @@ -18,3 +18,5 @@ disable-jit-for-non-x86.patch 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/-/compare/f340d48390b9152f817f5a6472c9668997e9d81c...52c5c6c74099866cd265643fae78c67859810e9e -- View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/f340d48390b9152f817f5a6472c9668997e9d81c...52c5c6c74099866cd265643fae78c67859810e9e 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
