Nativefier 49, Electron 19

4 files changed, 15 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b97f64e559e5..8f1119c83b85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = google-calendar-nativefier
 	pkgdesc = Google Calendar in shared Electron runtime
-	pkgver = 2022.03.18
+	pkgver = 2022.07.30
 	pkgrel = 1
 	url = https://calendar.google.com
-	install = google-calendar-nativefier.install
 	arch = x86_64
 	license = MIT
+	makedepends = curl
 	makedepends = gendesk
-	makedepends = nodejs-nativefier
-	depends = electron17
-	source = google-calendar-nativefier.png
-	sha256sums = b6ade1c13d0f7cbab5bcba9071463293ea5a8251dd693dde80148dc6b6980b42
+	makedepends = yarn
+	depends = electron
 
 pkgname = google-calendar-nativefier
diff --git a/PKGBUILD b/PKGBUILD
index a53f56183c50..8573c9408f63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,20 @@
 # Contributor: akaessens
 
 pkgname=google-calendar-nativefier
-pkgver=2022.03.18
+pkgver=2022.07.30
 pkgrel=1
 pkgdesc='Google Calendar in shared Electron runtime'
 arch=('x86_64')
 url='https://calendar.google.com'
 license=('MIT')
-_electronv=17 # See todoist-nativefier for rationale
+_nativefier=49
+_electron=19
 depends=("electron${_electronv}")
 makedepends=(
+  'curl'
   'gendesk'
-  'nodejs-nativefier'
+  'yarn'
 )
-install=google-calendar-nativefier.install
-source=("${pkgname}.png")
-sha256sums=('b6ade1c13d0f7cbab5bcba9071463293ea5a8251dd693dde80148dc6b6980b42')
 
 _name='Google Calendar'
 
@@ -29,15 +28,18 @@ EOF
     --pkgname "${pkgname}" \
     --pkgdesc "${pkgdesc}" \
     --name "${_name}" \
-    --categories "Network;Office;Calendar;" \
+    --categories "Network;Office;Calendar" \
     -n \
     -f
+  curl \
+    https://upload.wikimedia.org/wikipedia/commons/thumb/a/a5/Google_Calendar_icon_%282020%29.svg/512px-Google_Calendar_icon_%282020%29.svg.png \
+    > "${pkgname}.png"
 }
 
 build() {
   cd "${srcdir}"
-  # https://github.com/nativefier/nativefier/issues/831
-  nativefier \
+  yarn add "nativefier@${_nativefier}"
+  yarn nativefier \
     --name "${_name}" \
     --icon "${pkgname}.png" \
     --maximize \
diff --git a/google-calendar-nativefier.install b/google-calendar-nativefier.install
deleted file mode 100644
index 897af51e6c5d..000000000000
--- a/google-calendar-nativefier.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_upgrade() {
-  # Executed only when upgrading from 0.x.x to xxxx.xx.xx
-  if [[ "${2:0:1}" == "0" ]]; then
-    cat <<EOF
-
-Next time you launch Google Calendar you'll need to log in again. If you'd like to avoid that, run "mv ~/.config/google-calendar-nativefier-e22938 ~/.config/googlecalendar-nativefier-e22938" (note the missing hyphen).
-
-EOF
-  fi
-}
diff --git a/google-calendar-nativefier.png b/google-calendar-nativefier.png
deleted file mode 100644
index 2db487faf490..000000000000
--- a/google-calendar-nativefier.png
+++ /dev/null