From 79a45d57deb792717f13bdec5375b849679c4d22 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 14 Dec 2020 00:21:42 +0530 Subject: [PATCH] Use packaged font-awesome node module --- debian/control | 1 + debian/patches/0740-use-packaged-modules.patch | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a671d48f08..9d27673903 100644 --- a/debian/control +++ b/debian/control @@ -380,6 +380,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-exports-loader (>= 0.7~), node-imports-loader (>= 0.8~), node-file-loader (>= 5.0~), + node-font-awesome, node-fuzzaldrin-plus (>= 0.5~), node-glob (>= 7.1.6~), node-jed, diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 0c3acc97cd..3a6cdefefb 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -130,13 +130,13 @@ Use debian packaged node modules when available "diff": "^3.4.0", "document-register-element": "1.14.3", "dompurify": "^2.0.11", -@@ -85,81 +62,47 @@ +@@ -85,81 +62,46 @@ "editorconfig": "^0.15.3", "emoji-regex": "^7.0.3", "emoji-unicode-version": "^0.2.1", - "exports-loader": "^0.7.0", - "file-loader": "^5.1.0", - "font-awesome": "4.7.0", +- "font-awesome": "4.7.0", "fuzzaldrin-plus": "^0.6.0", - "glob": "^7.1.6", "graphql": "^14.7.0", @@ -240,3 +240,14 @@ Use debian packaged node modules when available import page from './page/index.vue'; +--- a/config/application.rb ++++ b/config/application.rb +@@ -203,7 +203,7 @@ + config.assets.precompile << "illustrations/*.svg" + + # Import Fontawesome fonts +- config.assets.paths << "#{config.root}/node_modules/font-awesome/fonts" ++ config.assets.paths << "/usr/share/nodejs/font-awesome/fonts" + config.assets.precompile << "fontawesome-webfont.woff2" + config.assets.precompile << "fontawesome-webfont.woff" +