diff options
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0001-support-enable-wayland-ime.patch | 18 | ||||
-rw-r--r-- | PKGBUILD | 78 |
3 files changed, 23 insertions, 93 deletions
@@ -1,21 +1,10 @@ pkgbase = joplin-electron pkgdesc = Joplin Desktop for Linux, using the system Electron package - pkgver = 2.12.19 + pkgver = 2.13.9 pkgrel = 1 url = https://github.com/laurent22/joplin arch = any license = AGPL-3.0 - makedepends = git - makedepends = npm - makedepends = yarn - makedepends = python - makedepends = rsync - makedepends = jq - makedepends = yq - makedepends = electron - makedepends = libgsf - makedepends = node-gyp>=8.4.1 - makedepends = libvips depends = electron25 depends = gtk3 depends = libexif @@ -23,20 +12,17 @@ pkgbase = joplin-electron depends = libjpeg-turbo depends = libwebp depends = libxss - depends = nodejs>=17.3 depends = nss depends = orc depends = rsync depends = libvips optdepends = libappindicator-gtk3: for tray icon conflicts = joplin-desktop - source = joplin-2.12.19.tar.gz::https://github.com/laurent22/joplin/archive/v2.12.19.tar.gz + source = https://github.com/ruslin-note/joplin-electron/releases/download/v2.13.9-1/resources.tar.gz source = joplin.desktop source = joplin.sh - source = 0001-support-enable-wayland-ime.patch - sha256sums = 4aa2030b355d5fd1a879ed65ce4016fec416a86779730036bd285fb50a8072b8 + sha256sums = a17c608cd4568733a409ec1107f519b8140c05301d7a4a45411588c804d75a99 sha256sums = 9e26cd5f41d08c3c2804cf4f34cb867090371423ccbe250a890fac006d405deb sha256sums = bd8324d35faaf6815217d1cf31a0b5e4df80692b0312ad17aea20d51f95efd56 - sha256sums = f95bda681102c99d08db8bf65fac026a0decfc3f07acb3eecb83cface6465c7c pkgname = joplin-electron diff --git a/0001-support-enable-wayland-ime.patch b/0001-support-enable-wayland-ime.patch deleted file mode 100644 index d7a6a0f15123..000000000000 --- a/0001-support-enable-wayland-ime.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/packages/lib/BaseApplication.ts b/packages/lib/BaseApplication.ts -index 40d95a7..c35408d 100644 ---- a/packages/lib/BaseApplication.ts -+++ b/packages/lib/BaseApplication.ts -@@ -288,6 +288,13 @@ export default class BaseApplication { - continue; - } - -+ if (arg === '--enable-wayland-ime') { -+ // Electron-specific flag - ignore it -+ // Allows users to enable wayland ime -+ argv.splice(0, 1); -+ continue; -+ } -+ - if (arg === '--disable-smooth-scrolling') { - // Electron-specific flag - ignore it - // Allows users to disable smooth scrolling @@ -1,80 +1,42 @@ _pkgname=joplin pkgname=$_pkgname-electron -pkgver=2.12.19 +pkgver=2.13.9 pkgrel=1 _electronversion=25 pkgdesc="Joplin Desktop for Linux, using the system Electron package" arch=('any') url="https://github.com/laurent22/joplin" license=('AGPL-3.0') -depends=("electron$_electronversion" 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs>=17.3' - 'nss' 'orc' 'rsync' 'libvips') +depends=( + "electron${_electronversion}" 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' + 'nss' 'orc' 'rsync' 'libvips' +) optdepends=('libappindicator-gtk3: for tray icon') -makedepends=('git' 'npm' 'yarn' 'python' 'rsync' 'jq' 'yq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips') conflicts=("joplin-desktop") source=( - "joplin-${pkgver}.tar.gz::https://github.com/laurent22/joplin/archive/v${pkgver}.tar.gz" - "joplin.desktop" - "joplin.sh" - "0001-support-enable-wayland-ime.patch" + "https://github.com/ruslin-note/joplin-electron/releases/download/v${pkgver}-${pkgrel}/resources.tar.gz" + "joplin.desktop" + "joplin.sh" ) sha256sums=( - '4aa2030b355d5fd1a879ed65ce4016fec416a86779730036bd285fb50a8072b8' - '9e26cd5f41d08c3c2804cf4f34cb867090371423ccbe250a890fac006d405deb' - 'bd8324d35faaf6815217d1cf31a0b5e4df80692b0312ad17aea20d51f95efd56' - 'f95bda681102c99d08db8bf65fac026a0decfc3f07acb3eecb83cface6465c7c' + 'a17c608cd4568733a409ec1107f519b8140c05301d7a4a45411588c804d75a99' + '9e26cd5f41d08c3c2804cf4f34cb867090371423ccbe250a890fac006d405deb' + 'bd8324d35faaf6815217d1cf31a0b5e4df80692b0312ad17aea20d51f95efd56' ) prepare() { - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - - patch -Np1 -i "${srcdir}"/0001-support-enable-wayland-ime.patch -d "${srcdir}/joplin-${pkgver}" - - msg2 "Disabling husky (git hooks)" - sed -i '/"husky": ".*"/d' "$srcdir/joplin-${pkgver}/package.json" - - msg2 "Deleting app-mobile and app-cli" - rm -r "$srcdir/joplin-$pkgver/packages/app-mobile" - rm -r "$srcdir/joplin-$pkgver/packages/app-clipper" - rm -r "$srcdir/joplin-$pkgver/packages/app-cli" - - # Patch build to make it work with system electron - export SYSTEM_ELECTRON_VERSION=$(electron$_electronversion -v | sed 's/v//g') - export ELECTRONVERSION=$_electronversion - sed -i "s|@electronversion@|${ELECTRONVERSION}|" "$srcdir/joplin.sh" - - msg2 "Installing dependencies through Yarn 3..." - - cd "$srcdir/joplin-$pkgver" - yarn install -} - -build() { - electronDist=/usr/lib/electron$_electronversion - electronVer=$(electron$_electronversion --version | tail -c +2) - - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - export LANG=en_US.utf8 - - msg2 "Building the workspace" - cd "$srcdir/joplin-$pkgver" - - yarn workspace @joplin/app-desktop build - yarn workspace @joplin/app-desktop electron-builder --linux -c.electronDist=$electronDist -c.electronVersion=$electronVer + sed -i "s|@electronversion@|${_electronversion}|" "$srcdir/joplin.sh" } package() { - cd "${srcdir}/joplin-${pkgver}" - cd packages/app-desktop - - install -vDm644 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${_pkgname}" - cp -vr dist/linux-unpacked/resources/app.asar.unpacked -t "${pkgdir}/usr/lib/${_pkgname}" - cp -vr dist/linux-unpacked/resources/build -t "${pkgdir}/usr/lib/${_pkgname}" + install -vDm644 ${srcdir}/app.asar -t "${pkgdir}/usr/lib/${_pkgname}" + cp -vr ${srcdir}/app.asar.unpacked -t "${pkgdir}/usr/lib/${_pkgname}" + cp -vr ${srcdir}/build -t "${pkgdir}/usr/lib/${_pkgname}" - for i in 16 32 64 128 256 512 1024; do - [[ -f "build/icons/${i}x${i}.png" ]] && install -vDm644 build/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png" - done + for i in 16 32 64 128 256 512 1024; do + [[ -f "${srcdir}/build/icons/${i}x${i}.png" ]] && install -vDm644 ${srcdir}/build/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png" + done - install -vDm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/joplin-desktop" - install -vDm644 "${srcdir}"/${_pkgname}.desktop -t "${pkgdir}"/usr/share/applications + install -vDm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/joplin-desktop" + install -vDm644 "${srcdir}"/${_pkgname}.desktop -t "${pkgdir}"/usr/share/applications } |