Update patches

ruslin-note · Apr 27, 2024 · 224f7ee · 224f7ee
1 parent 429bc90
commit 224f7ee
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/patches/0002-remove-7zip.patch b/patches/0002-remove-7zip.patch
@@ -1,5 +1,5 @@
 diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
-index af4136447..0656a82d1 100644
+index 58e0b5833..200f20f1b 100644
 --- a/packages/app-desktop/package.json
 +++ b/packages/app-desktop/package.json
 @@ -38,8 +38,7 @@

diff --git a/patches/0003-asar-unpack-node.patch b/patches/0003-asar-unpack-node.patch
@@ -1,5 +1,5 @@
 diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
-index 8e4fdbaf4..fe25a6116 100644
+index 200f20f1b..9a9682758 100644
 --- a/packages/app-desktop/package.json
 +++ b/packages/app-desktop/package.json
 @@ -42,7 +42,7 @@

diff --git a/patches/0004-pr-10110-electron-29.patch b/patches/0004-pr-10110-electron-29.patch
@@ -1,15 +1,14 @@
 diff --git a/package.json b/package.json
-index 694d34f0e..23fb48c59 100644
+index 694d34f0e..c19e35fd3 100644
 --- a/package.json
 +++ b/package.json
-@@ -100,6 +100,7 @@
-   },
-   "packageManager": "yarn@3.6.4",
-   "resolutions": {
-+    "chokidar@^2.0.0": "3.5.3",
-     "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
-     "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
-     "eslint": "patch:eslint@8.52.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
+@@ -109,5 +109,6 @@
+     "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
+     "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch",
+     "husky": "patch:husky@npm%3A3.1.0#./.yarn/patches/husky-npm-3.1.0-5cc13e4e34.patch"
++    "chokidar@^2.0.0": "3.5.3"
+   }
+ }
 diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.ts
 index 6289d8419..580df524d 100644
 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.ts
@@ -31,10 +30,10 @@ index 6289d8419..580df524d 100644
 
  			// Don't show the default menu.
 diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
-index c000870f5..b80c9a60d 100644
+index 9a9682758..cc878dcc9 100644
 --- a/packages/app-desktop/package.json
 +++ b/packages/app-desktop/package.json
-@@ -123,7 +123,7 @@
+@@ -121,7 +121,7 @@
      "@electron/rebuild": "3.3.0",
      "@joplin/default-plugins": "~2.14",
      "@joplin/tools": "~2.14",
@@ -43,7 +42,7 @@ index c000870f5..b80c9a60d 100644
      "@testing-library/react-hooks": "8.0.1",
      "@types/jest": "29.5.8",
      "@types/node": "18.19.8",
-@@ -131,8 +131,8 @@
+@@ -129,8 +129,8 @@
      "@types/react-redux": "7.1.33",
      "@types/styled-components": "5.1.32",
      "@types/tesseract.js": "2.0.0",
@@ -54,7 +53,7 @@ index c000870f5..b80c9a60d 100644
      "glob": "10.3.10",
      "gulp": "4.0.2",
      "jest": "29.7.0",
-@@ -145,7 +145,7 @@
+@@ -143,7 +143,7 @@
    },
    "dependencies": {
      "@electron/notarize": "2.1.0",

diff --git a/patches/0004-update-electron.patch b/patches/0004-update-electron.patch