rework for functional v2.0.16

1 files changed, 32 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3178e8696294..45c0675280db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,6 @@
 # Maintainer: Jaime Martínez Rincón <jaime@jamezrin.name>
-# Maintainer: Patrick Schratz <patrick.schratz@gmail.com>
-# Maintainer: Jared Allard <jaredallard@outlook.com>
-# code adapted from https://github.com/jaredallard/notion-app
-
 pkgname=notion-app
-pkgver=2.0.11
+pkgver=2.0.16
 pkgrel=1
 epoch=2
 pkgdesc="The all-in-one workspace for your notes and tasks"
@@ -12,39 +8,49 @@ arch=('i686' 'x86_64')
 url="https://www.notion.so/desktop"
 license=('MIT')
 depends=('electron11' 're2' 'gtk3' 'xdg-utils')
-makedepends=('imagemagick' 'p7zip' 'asar')
+makedepends=('imagemagick' 'p7zip' 'npm')
 optdepends=('notion-enhancer: enhancements and fixes')
-source=(
-        "Notion-"${pkgver}".exe::https://desktop-release.notion-static.com/Notion%20Setup%20${pkgver}.exe" 
-        'notion-app'
+source=("Notion-"${pkgver}".exe::https://desktop-release.notion-static.com/Notion%20Setup%20${pkgver}.exe" 
         'notion-app.desktop')
-md5sums=('b3fb76f3cdc664e71e7438348c472a16'
-         '89f5d6220dd0b8fb459ed59cff7dee3c'
-         'dc75abd9b8f3f455a0b8fc0d8d8932b5')
+md5sums=('9f72284086cda3977f7f569dff3974d5'
+         '257f3106e5d9364ef2df557a656cd8e7')
 build() {
   msg "Extracting app from Windows build..."
-  7z x -y "${srcdir}/Notion-"${pkgver}".exe" -o"${srcdir}/build-1" >/dev/null
-  7z x -y "${srcdir}/build-1/\$PLUGINSDIR/app-64.7z" -o"${srcdir}/build-2" >/dev/null
-  asar extract "${srcdir}/build-2/resources/app.asar" "${srcdir}/build-3" >/dev/null
+  7z x -y "${srcdir}/Notion-"${pkgver}".exe" -o"${srcdir}/extracted-exe" >/dev/null
+  7z x -y "${srcdir}/extracted-exe/\$PLUGINSDIR/app-64.7z" -o"${srcdir}/extracted-app" >/dev/null
   
+  rm -rf "${srcdir}/package-rebuild"
+  mkdir -p "${srcdir}/package-rebuild"
+
+  msg "Copying original app resources..."
+  cp -r "${srcdir}/extracted-app/resources/app/"* "${srcdir}/package-rebuild"
+
+  cd "${srcdir}/package-rebuild"
+
+  msg "Recreating package node_modules..."
+  rm -r node_modules
+  npm install
+  node_modules/.bin/patch-package
+
   msg "Converting app icon..."
-  mkdir -p "${srcdir}/build-4"
-  convert "${srcdir}/build-3/icon.ico[0]" "${srcdir}/build-4/icon.png" >/dev/null
+  convert "icon.ico[0]" "icon.png" >/dev/null
 
-  msg "Copying files to final build stage..."
-  cp -r "${srcdir}/build-2/locales" "${srcdir}/build-4/"
-  cp "${srcdir}/build-2/resources/app.asar" "${srcdir}/build-4/app.asar"
-  cp "${srcdir}/notion-app" "${srcdir}/build-4"
+  msg "Building electron package..."
+  npm install electron@11 electron-builder --save-dev
+  node_modules/.bin/electron-builder --linux dir
+
+  cd "${srcdir}"
 }
 
 package() {
   install -d "${pkgdir}/usr/bin"
   install -d "${pkgdir}/opt/${pkgname}"
-  install -d "${pkgdir}/usr/share/applications"
   install -d "${pkgdir}/usr/share/pixmaps"
+  install -d "${pkgdir}/usr/share/applications"
 
-  cp -r "${srcdir}/build-4/"* "${pkgdir}/opt/${pkgname}"
-  install -Dm644 "${srcdir}/build-4/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  cp -r "${srcdir}/package-rebuild/dist/linux-unpacked/"* "${pkgdir}/opt/${pkgname}"
+  cp "${srcdir}/package-rebuild/icon.png" "${pkgdir}/opt/${pkgname}/icon.png"
+  install -Dm644 "${srcdir}/package-rebuild/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
   install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications"
-}
+  ln -s "/opt/${pkgname}/httptoolkit" "${pkgdir}/usr/bin/${pkgname}"
+}
\ No newline at end of file