v2.12.15-1

ruslin-note · Sep 3, 2023 · 2e18149 · 2e18149
1 parent f7ede16
commit 2e18149
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = joplin-electron
 	pkgdesc = Joplin Desktop for Linux, using the system Electron package
-	pkgver = 2.11.11
+	pkgver = 2.12.15
 	pkgrel = 1
 	url = https://github.com/laurent22/joplin
 	arch = any
@@ -16,7 +16,7 @@ pkgbase = joplin-electron
 	makedepends = libgsf
 	makedepends = node-gyp>=8.4.1
 	makedepends = libvips
-	depends = electron22
+	depends = electron25
 	depends = gtk3
 	depends = libexif
 	depends = libgsf
@@ -30,13 +30,13 @@ pkgbase = joplin-electron
 	depends = libvips
 	optdepends = libappindicator-gtk3: for tray icon
 	conflicts = joplin-desktop
-	source = joplin-2.11.11.tar.gz::https://github.com/laurent22/joplin/archive/v2.11.11.tar.gz
+	source = joplin-2.12.15.tar.gz::https://github.com/laurent22/joplin/archive/v2.12.15.tar.gz
 	source = joplin.desktop
 	source = joplin.sh
 	source = 0001-support-enable-wayland-ime.patch
-	sha256sums = 2ad3137a3500d04cc6d9f544472c521842f0c49b1012129cbb8fa634f46ae50c
+	sha256sums = 1ab8cac6ded11abc5a6437b58342b519466cbf869bf3e7cc0a651413ff8faa0a
 	sha256sums = 9e26cd5f41d08c3c2804cf4f34cb867090371423ccbe250a890fac006d405deb
 	sha256sums = bd8324d35faaf6815217d1cf31a0b5e4df80692b0312ad17aea20d51f95efd56
-	sha256sums = 88aebf8692468e8b2757bd32b888f620ef5de9f907bbe93a4851530faeb45c1e
+	sha256sums = f95bda681102c99d08db8bf65fac026a0decfc3f07acb3eecb83cface6465c7c
 
 pkgname = joplin-electron
diff --git a/0001-support-enable-wayland-ime.patch b/0001-support-enable-wayland-ime.patch
@@ -1,16 +1,8 @@
 diff --git a/packages/lib/BaseApplication.ts b/packages/lib/BaseApplication.ts
-index 4490ca012..edf69c9e9 100644
+index 40d95a7..c35408d 100644
 --- a/packages/lib/BaseApplication.ts
 +++ b/packages/lib/BaseApplication.ts
-@@ -270,13 +270,20 @@ export default class BaseApplication {
- 				continue;
- 			}
-
--			if (arg.indexOf('--ozone-platform=') === 0) {
-+			if (arg.indexOf('--ozone-platform') === 0) {
- 				// Electron-specific flag - ignore it
- 				// Allows users to run the app on native wayland
- 				argv.splice(0, 1);
+@@ -288,6 +288,13 @@ export default class BaseApplication {
  				continue;
  			}
 

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,8 +1,8 @@
 _pkgname=joplin
 pkgname=$_pkgname-electron
-pkgver=2.11.11
+pkgver=2.12.15
 pkgrel=1
-_electronversion=22
+_electronversion=25
 pkgdesc="Joplin Desktop for Linux, using the system Electron package"
 arch=('any')
 url="https://github.com/laurent22/joplin"
@@ -19,10 +19,10 @@ source=(
     "0001-support-enable-wayland-ime.patch"
 )
 sha256sums=(
-    '2ad3137a3500d04cc6d9f544472c521842f0c49b1012129cbb8fa634f46ae50c'
+    '1ab8cac6ded11abc5a6437b58342b519466cbf869bf3e7cc0a651413ff8faa0a'
     '9e26cd5f41d08c3c2804cf4f34cb867090371423ccbe250a890fac006d405deb'
     'bd8324d35faaf6815217d1cf31a0b5e4df80692b0312ad17aea20d51f95efd56'
-    '88aebf8692468e8b2757bd32b888f620ef5de9f907bbe93a4851530faeb45c1e'
+    'f95bda681102c99d08db8bf65fac026a0decfc3f07acb3eecb83cface6465c7c'
 )
 
 prepare() {