This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx.
commit 7af6c1c013271a76daf2393fd7e9bca878255a07 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 6 01:25:08 2015 +0200 Removed the non-free JavaScript minifier from the upstream tarball --- debian/changelog | 1 + debian/jsmin-noop.py | 29 +++++++++++++++++++++++++++++ debian/orig-tar.sh | 3 ++- debian/rules | 4 ++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4654da6..de13bcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ openjfx (8u60-b27-1) UNRELEASED; urgency=medium - Build with qt5-qmake instead of qt4-qmake - New build dependency on ruby - Added a patch to link dynamically against ICU + - Removed the non-free JavaScript minifier from the upstream tarball * Fixed a build failure with Gradle 2.5 (Closes: #795851) * Depend on GStreamer 1.0 (Closes: #799280) diff --git a/debian/jsmin-noop.py b/debian/jsmin-noop.py new file mode 100644 index 0000000..eb704fc --- /dev/null +++ b/debian/jsmin-noop.py @@ -0,0 +1,29 @@ +#!/usr/bin/python + +# This is a reimplementation of the JavaScript minifier included in OpenJFX +# which was derived from the non-free jsmin code by Douglas Crockford. This +# version simply copies the input file unchanged. +# +# -- Emmanuel Bourg <[email protected]> + +try: + from StringIO import StringIO +except ImportError: + from io import StringIO + +def jsmin(js): + ins = StringIO(js) + outs = StringIO() + JavascriptMinify().minify(ins, outs) + return outs.getvalue() + +class JavascriptMinify(object): + + def minify(self, instream, outstream): + outstream.write(instream.read()) + instream.close() + +if __name__ == '__main__': + import sys + jsm = JavascriptMinify() + jsm.minify(sys.stdin, sys.stdout) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 450f286..5399289 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -6,7 +6,7 @@ DIR=rt-$VERSION rm $3 -wget http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/$VERSION.tar.gz +wget http://hg.openjdk.java.net/openjfx/8u60/rt/archive/$VERSION.tar.gz tar -xf $VERSION.tar.gz rm $VERSION.tar.gz @@ -19,6 +19,7 @@ XZ_OPT=--best tar -c -v -J -f $TAR \ --exclude 'apps/samples' \ --exclude 'modules/graphics/src/main/native-iio/libjpeg*' \ --exclude 'modules/media/src/main/native/gstreamer/3rd_party/glib/*' \ + --exclude 'modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/jsmin.py' \ --exclude 'modules/web/src/main/native/Tools/TestResultServer/static-dashboards/dygraph-combined.js' \ $DIR diff --git a/debian/rules b/debian/rules index 7fb8697..3076b01 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ override_dh_auto_build: dh_auto_build cp debian/gradle.properties . + # replace the non-free JavaScript minifier with a noop equivalent + cp debian/jsmin-noop.py modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/jsmin.py + # work around a compilation issue with Gradle 2.x mkdir -p modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/ mkdir -p modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/ @@ -65,6 +68,7 @@ override_dh_auto_clean: rm -Rf modules/jmx/build/ rm -Rf tests/system/build/ rm -f modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.pyc + rm -f modules/web/src/main/native/Source/JavaScriptCore/inspector/scripts/jsmin.py get-orig-source: uscan --download-current-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
