WIP port to yomitanwip/yomitan

6 files changed, 27 insertions, 37 deletions

diff --git a/yomichan/action-popup.css.diff b/yomichan/action-popup.css.diff
index 2190f22..bcc291e 100644
--- a/yomichan/action-popup.css.diff
+++ b/yomichan/action-popup.css.diff
@@ -1,5 +1,3 @@
---- yomichan/css/action-popup.css.bak	2023-10-07 15:36:34.944932431 +0200
-+++ yomichan/css/action-popup.css	2023-10-07 15:36:40.121568264 +0200
 @@ -48,9 +48,7 @@
  }
  
diff --git a/yomichan/info.html.diff.m4 b/yomichan/info.html.diff.m4
index 8166f82..766c69f 100644
--- a/yomichan/info.html.diff.m4
+++ b/yomichan/info.html.diff.m4
@@ -1,6 +1,4 @@
 include(`common.m4')
---- yomichan-original/info.html	2022-10-30 12:39:42.000000000 +0100
-+++ yomichan/info.html	2023-01-29 18:26:05.496933182 +0100
 @@ -30,6 +30,7 @@
          <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
              <ul>
diff --git a/yomichan/makefile b/yomichan/makefile
index f8bc4a5..488ff61 100644
--- a/yomichan/makefile
+++ b/yomichan/makefile
@@ -4,6 +4,8 @@ download: yomichan
 backup: download
 patch: backup
 
+YOMITAN_VERSION = 24.4.16.0
+
 # template rules in this file do not have explicit dependencies, this is to
 # allow dependencies regardless of subdirectory. the dependencies are commented
 # out instead for readability
@@ -11,7 +13,7 @@ patch: backup
 include ../common.mk
 
 yomichan-chrome.zip:
-	curl https://github.com/FooSoft/yomichan/releases/latest/download/$@ -Lso- > $@
+	curl https://github.com/themoeway/yomitan/releases/download/$(YOMITAN_VERSION)/yomitan-chrome.zip -Lso- > $@
 
 yomichan/images/%.svg: # %.svg
 	cp $< $@
@@ -36,7 +38,7 @@ yomichan: yomichan-chrome.zip
 
 info.html.diff: info.html.diff.m4
 
-# .diff patches
+# patches
 backup: yomichan/search.html.bak
 yomichan/search.html.patched: search.html.diff
 backup: yomichan/settings.html.bak
@@ -45,19 +47,14 @@ backup: yomichan/info.html.bak
 yomichan/info.html.patched: info.html.diff
 backup: yomichan/css/action-popup.css.bak
 yomichan/css/action-popup.css.patched: action-popup.css.diff
-
-# updated extension manifest (allow userscript loading)
 backup: yomichan/manifest.json.bak
-yomichan/manifest.json.patched: yomichan/manifest.json.bak
-	jq '.content_scripts[0].js[.content_scripts[0].js | length] |= .+ "js/userscript-loader.js"' $< |\
-	jq '.content_security_policy |= .+ "'"; script-src 'self' 'unsafe-eval'"'"' |\
-	jq '.content_security_policy |= sub("img-src";"img-src data:")' > $@
+yomichan/manifest.json.patched: manifest.json.diff
+
 # userscript loader files
 yomichan/js/userscript-loader.js: userscript-loader.js
 yomichan/images/script.svg: script.svg
 yomichan/css/userscript-settings.css: userscript-settings.css
 
-
 # install userscript loader
 patch: yomichan/js/userscript-loader.js
 patch: yomichan/images/script.svg
diff --git a/yomichan/manifest.json.diff b/yomichan/manifest.json.diff
new file mode 100644
index 0000000..0497ccb
--- /dev/null
+++ b/yomichan/manifest.json.diff
@@ -0,0 +1,10 @@
+@@ -43,7 +43,8 @@
+             "match_about_blank": true,
+             "all_frames": true,
+             "js": [
+-                "js/app/content-script-wrapper.js"
++                "js/app/content-script-wrapper.js",
++                "js/userscript-loader.js"
+             ]
+         }
+     ],
diff --git a/yomichan/search.html.diff b/yomichan/search.html.diff
index 75f815c..edd96f1 100644
--- a/yomichan/search.html.diff
+++ b/yomichan/search.html.diff
@@ -1,17 +1,8 @@
---- yomichan-original/search.html	2022-10-30 12:39:42.000000000 +0100
-+++ yomichan/search.html	2023-01-29 15:40:23.336897401 +0100
-@@ -16,6 +16,7 @@
-     <link rel="stylesheet" type="text/css" href="/css/display-pronunciation.css">
+@@ -17,6 +17,7 @@
      <link rel="stylesheet" type="text/css" href="/css/structured-content.css">
      <link rel="stylesheet" type="text/css" href="/css/search.css">
-+		<script defer src="/js/userscript-loader.js"></script>
+     <script src="/js/display/search-main.js" type="module"></script>
++    <script defer src="/js/userscript-loader.js"></script>
  </head>
  <body>
  
-@@ -128,6 +129,5 @@
- <script src="/js/templates/template-renderer-proxy.js"></script>
- 
- <script src="/js/display/search-main.js"></script>
--
- </body>
- </html>
diff --git a/yomichan/settings.html.diff b/yomichan/settings.html.diff
index 1b6064f..43d8c6f 100644
--- a/yomichan/settings.html.diff
+++ b/yomichan/settings.html.diff
@@ -1,15 +1,13 @@
---- yomichan-original/settings.html	2022-10-30 12:39:42.000000000 +0100
-+++ yomichan/settings.html	2023-01-29 18:28:49.783600435 +0100
 @@ -14,6 +14,8 @@
      <link rel="stylesheet" type="text/css" href="/css/material.css">
      <link rel="stylesheet" type="text/css" href="/css/settings.css">
      <link rel="stylesheet" type="text/css" href="/css/display-pronunciation.css">
 +    <link rel="stylesheet" type="text/css" href="/css/icons.css">
 +    <link rel="stylesheet" type="text/css" href="/css/userscript-settings.css">
+     <script src="/js/pages/settings/settings-main.js" type="module"></script>
  </head>
  <body>
- 
-@@ -39,6 +41,7 @@
+@@ -40,6 +42,7 @@
              <a href="#!backup"           class="button outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="backup"></span></span><span class="outline-item-label">Backup</span></a>
              <a href="#!accessibility"    class="button outline-item"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="accessibility"></span></span><span class="outline-item-label">Accessibility</span></a>
              <a href="#!security"         class="button outline-item advanced-only"><span class="outline-item-left"><span class="outline-item-icon icon" data-icon="lock"></span></span><span class="outline-item-label">Security</span></a>
@@ -17,7 +15,7 @@
          </div>
          <div class="sidebar-bottom">
              <label class="button outline-item"><span class="outline-item-left">
-@@ -2152,6 +2155,19 @@
+@@ -2131,6 +2134,19 @@
          </div>
      </div>
  
@@ -37,9 +35,9 @@
      <div class="footer-padding"></div>
  
  </div>
-@@ -3802,6 +3818,29 @@
- </div></template>
- 
+@@ -3407,5 +3423,27 @@
+     </div>
+ </div></div>
  
 +<div id="user-script-modal" class="modal modal-left" tabindex="-1" role="dialog" hidden><div class="modal-content-container1">
 +    <div class="modal-content-container2 modal-content-dimmer"><div class="modal-content">
@@ -63,7 +61,5 @@
 +    <div class="modal-content-container1-fade"></div>
 +</div></div>
 +
-+
- <!-- Scripts -->
- <script src="/lib/wanakana.min.js"></script>
- 
+ </body>
+ </html>