From 288df6a7bf8b933e2dc499e38f4915fcf974c14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Mon, 30 Dec 2019 15:55:13 -0500
Subject: backport

- Flush caches on upgrade
- Properly handle FrameModule's unloading
- Use the new module and remove the old implementation
---
 Makefile | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e232c82..df9e481 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@
 # 2) It gives some flexibility in that files can be created or deleted
 #    freely as long as they are not part of any of these lists
 
-VERSION := 3.0.8
+VERSION := 3.0.9
 
 help:
 	@echo 'Makefile for generate eMatrix                                '
@@ -46,7 +46,7 @@ ROOTHTML := about.html asset-viewer.html background.html	\
 	    logger-ui.html main-blocked.html popup.html		\
 	    raw-settings.html settings.html user-rules.html
 
-ROOTOTHER := frameScript.js frameModule.js
+ROOTOTHER := frameScript.js
 
 ROOT := $(ROOTMETA) $(ROOTHTML) $(ROOTOTHER)
 
@@ -97,14 +97,17 @@ IMGOTHER := img/cloud.png img/icon_16.png img/icon_64.png		\
 
 IMG := $(IMGICON) $(IMGOTHER)
 
-LIB := lib/publicsuffixlist.js lib/punycode.js lib/yamd5.js
+LIB := lib/PublicSuffixList.jsm lib/Punycode.jsm lib/FrameModule.jsm	\
+       lib/CallbackWrapper.jsm lib/HttpRequestHeaders.jsm		\
+       lib/PendingRequests.jsm lib/CookieCache.jsm lib/UriTools.jsm	\
+       lib/LiquidDict.jsm
 
 # The locale folder is split into parts because it's a long list
 # and it's somewhat easier to read this way
-LOC1 := locale/en/messages.properties locale/ar/messages.properties	\
-	locale/bg/messages.properties locale/bn/messages.properties	\
-	locale/cs/messages.properties locale/da/messages.properties	\
-	locale/de/messages.properties locale/el/messages.properties
+LOC1 := locale/en/messages.properties locale/bg/messages.properties	\
+	locale/bn/messages.properties locale/cs/messages.properties	\
+	locale/da/messages.properties locale/de/messages.properties	\
+	locale/el/messages.properties
 
 LOC2 := locale/eo/messages.properties locale/es/messages.properties	\
 	locale/et/messages.properties locale/fa/messages.properties	\
@@ -138,15 +141,13 @@ JS1 := js/about.js js/assets.js js/asset-viewer.js js/background.js	\
        js/contentscript-start.js js/cookies.js js/dashboard-common.js	\
        js/dashboard.js js/hosts-files.js
 
-JS2 := js/httpsb.js js/i18n.js js/liquid-dict.js js/logger.js		\
-       js/logger-ui.js js/main-blocked.js js/matrix.js			\
-       js/messaging.js js/pagestats.js js/polyfill.js js/popup.js	\
-       js/profiler.js js/raw-settings.js js/settings.js js/start.js	\
-       js/storage.js
+JS2 := js/httpsb.js js/i18n.js js/logger.js js/logger-ui.js		\
+       js/main-blocked.js js/matrix.js js/messaging.js			\
+       js/pagestats.js js/popup.js js/profiler.js js/raw-settings.js	\
+       js/settings.js js/start.js js/storage.js
 
-JS3 := js/tab.js js/traffic.js js/udom.js js/uritools.js		\
-       js/user-rules.js js/usersettings.js js/utils.js js/xal.js	\
-       CallbackWrapper.jsm HttpRequestHeaders.jsm
+JS3 := js/tab.js js/traffic.js js/udom.js js/user-rules.js	\
+       js/usersettings.js js/utils.js js/xal.js
 
 JS4 := js/vapi-client.js js/vapi-common.js js/vapi-background.js	\
        js/vapi-tabs.js js/vapi-window.js js/vapi-core.js		\
-- 
cgit v1.2.3