summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD34
-rwxr-xr-xnotion-app2
3 files changed, 25 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86084f0e56a5..29db753e95cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = notion-app
pkgdesc = The all-in-one workspace for your notes and tasks
pkgver = 2.0.11
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://www.notion.so/desktop
arch = i686
arch = x86_64
license = MIT
- makedepends = dmg2img
+ makedepends = imagemagick
makedepends = p7zip
- makedepends = libicns
- depends = electron6-bin
+ makedepends = asar
+ depends = electron
depends = re2
depends = gtk3
depends = xdg-utils
@@ -19,7 +19,7 @@ pkgbase = notion-app
source = notion-app
source = notion-app.desktop
md5sums = b3fb76f3cdc664e71e7438348c472a16
- md5sums = 38431798c3ad8835d0211f7668d5eee4
+ md5sums = 6f4dfafeaaf5ef56c4eb5ef78792e063
md5sums = dc75abd9b8f3f455a0b8fc0d8d8932b5
pkgname = notion-app
diff --git a/PKGBUILD b/PKGBUILD
index ee22dd3ab0e6..d59f6d1fa196 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,42 +5,46 @@
pkgname=notion-app
pkgver=2.0.11
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="The all-in-one workspace for your notes and tasks"
arch=('i686' 'x86_64')
url="https://www.notion.so/desktop"
license=('MIT')
-depends=('electron6-bin' 're2' 'gtk3' 'xdg-utils')
-makedepends=('dmg2img' 'p7zip' 'libicns')
+depends=('electron' 're2' 'gtk3' 'xdg-utils')
+makedepends=('imagemagick' 'p7zip' 'asar')
optdepends=('notion-enhancer: enhancements and fixes')
source=(
"Notion-"${pkgver}".exe::https://desktop-release.notion-static.com/Notion%20Setup%20${pkgver}.exe"
'notion-app'
'notion-app.desktop')
md5sums=('b3fb76f3cdc664e71e7438348c472a16'
- '38431798c3ad8835d0211f7668d5eee4'
+ '6f4dfafeaaf5ef56c4eb5ef78792e063'
'dc75abd9b8f3f455a0b8fc0d8d8932b5')
build() {
- msg "Converting dmg image..."
- mkdir -p "${srcdir}/tmp/build"
- 7z x -y "${srcdir}/Notion-"${pkgver}".exe" >/dev/null
- cp -r "${srcdir}"/Notion**/Notion.app/Contents/Resources/* "${srcdir}/tmp/build"
- cp notion-app "${srcdir}/tmp/build"
- icns2png -x "${srcdir}/tmp/build/Notion.icns"
+ 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
+
+ msg "Converting app icon..."
+ mkdir -p "${srcdir}/build-4"
+ convert "${srcdir}/build-3/icon.ico[0]" "${srcdir}/build-4/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"
}
package() {
- _icon="Notion_512x512x32.png"
-
install -d "${pkgdir}/usr/bin"
install -d "${pkgdir}/opt/${pkgname}"
install -d "${pkgdir}/usr/share/applications"
install -d "${pkgdir}/usr/share/pixmaps"
- cp -r "${srcdir}/tmp/build/"* "${pkgdir}/opt/${pkgname}"
- cp "${srcdir}/${_icon}" "${pkgdir}/opt/${pkgname}/icon.png"
- install -Dm644 "${srcdir}/${_icon}" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ 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}"
install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications"
}
diff --git a/notion-app b/notion-app
index 3d224c788bd7..b86e4865742a 100755
--- a/notion-app
+++ b/notion-app
@@ -8,5 +8,5 @@ if [[ ! -e "/opt/notion-app" ]]; then
fi
pushd "/opt/notion-app/" >/dev/null || exit 1
-electron6 app.asar $@
+electron app.asar $@
popd >/dev/null || exit 1