Hi, FYI I have reopened this bug in a separate control message.
On Mon, Jan 18, 2021 at 05:09:16PM -0300, Antonio Terceiro wrote: > On Mon, Jan 18, 2021 at 07:20:12PM +0100, Martin wrote: > > On 2021-01-18 14:28, Antonio Terceiro wrote: > > > In special, I need to stop including the standalone plugin files, > > > because it's already included in the main file. This wasn't the case in > > > the previous version, and I get that this is how upstream designed it to > > > be. > > > > Pretty "hacky" idea: How about leaving the main file as intended > > by upstream, i.e. with all plugins included, and replace the the > > plugin files with dummies? Or am I misunderstanding the issue? > > That's actually great idea. The attached patch implements this. I tested with the debci master branch, without those changes I mentioned earlier in this thread, and it works flawlessly. Thanks for the idea.
From 4ce45b96e2296d135417b9506b0d22e7eed0497f Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terce...@debian.org>
Date: Mon, 18 Jan 2021 21:44:59 -0300
Subject: [PATCH] Provide dummy plugin files for backwards compatibility
libjs-jquery-flot 0.8 provided the main file, jquery.flot.js, and one
had to include the plugin files explicitly. In version 4.2,
jquery.flot.js already includes the plugins, and existing code that
includes them again cause the charts to break in subtle ways.
Providing empty files in the place of the plugins allow existing usage
to continue working.
Thanks to W. Martin Borgert for the idea.
Closes: #980294
---
debian/libjs-jquery-flot.install | 6 +-----
debian/rules | 13 ++++++++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/debian/libjs-jquery-flot.install b/debian/libjs-jquery-flot.install
index 102d532..3eaf78d 100644
--- a/debian/libjs-jquery-flot.install
+++ b/debian/libjs-jquery-flot.install
@@ -1,7 +1,3 @@
-source/jquery.canvaswrapper*.js usr/share/javascript/jquery-flot/
-source/jquery.colorhelpers*.js usr/share/javascript/jquery-flot/
-source/jquery.flot.*.js usr/share/javascript/jquery-flot/
-source/*.map usr/share/javascript/jquery-flot/
dist/es5/*.js usr/share/javascript/jquery-flot/
-dist/es5/*.js.map usr/share/javascript/jquery-flot/
dist/es5/*.map usr/share/javascript/jquery-flot/
+plugins/*.js usr/share/javascript/jquery-flot/
diff --git a/debian/rules b/debian/rules
index 4bc2f33..18e244e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,22 @@
override_dh_auto_build:
gulp build
- cd source && for f in *.js; do \
- echo "Minify source/$$f"; \
- uglifyjs --source-map -o $${f%%.js}.min.js $$f; \
+ # Provide empty files for plugins for backwards compatibility since
+ # they are now included with the main jquery.flot.js file
+ mkdir plugins
+ cd source && for f in jquery.flot.*.js; do \
+ echo "Provide dummy file for $$f" ; \
+ touch ../plugins/$${f%%.js}.min.js ../plugins/$$f; \
done
cd dist/es5 && for f in *.js; do \
echo "Minify dist/es5/$$f"; \
uglifyjs --source-map -o $${f%%.js}.min.js $$f; \
done
+override_dh_auto_clean:
+ dh_auto_clean
+ $(RM) -r plugins
+
get-orig-source:
OUTDIR=$$PWD ; \
MAKEFILE=`echo $(MAKEFILE_LIST) | awk '{ print $$1 }'` ; \
--
2.30.0
signature.asc
Description: PGP signature
-- Pkg-javascript-devel mailing list Pkg-javascript-devel@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-javascript-devel
