所有用户请注意:应管局要求,请各位尽量将代码仓库设置为内部可见。管理员会巡查公开的代码仓库。

Unverified Commit 864f8629 authored by Kiryuu Sakuya's avatar Kiryuu Sakuya
Browse files

Merge branch 'master' of https://aur.archlinux.org/joplin

parents e0cb5371 e96d239f
Pipeline #251 passed with stage
in 22 minutes and 19 seconds
pkgbase = joplin
pkgdesc = Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS.
pkgver = 1.0.175
pkgrel = 2
url = https://joplin.cozic.net
pkgver = 1.0.178
pkgrel = 1
url = https://joplinapp.org/
arch = x86_64
arch = i686
license = MIT
......@@ -12,18 +12,17 @@ pkgbase = joplin
makedepends = npm
makedepends = python
depends = nodejs
depends = gconf
depends = libxss
provides = joplin
provides = joplin-cli
source = joplin.desktop
source = joplin-desktop.sh
source = joplin.sh
source = https://github.com/laurent22/joplin/archive/v1.0.175.zip
sha256sums = c1ece73d0d8afcd3723ebf3b4d4d614d84e5ef8de0e61fc00c118847563da88d
source = https://github.com/laurent22/joplin/archive/v1.0.178.zip
sha256sums = ce4435654ee1f6d51d361945f32dd9bf07308f423c3f3c3db147744f203fbc2b
sha256sums = 41bfdc95a6ee285eb644d05eb3bded72a83950d4720c3c8058ddd3c605cd625d
sha256sums = 5245da6f5f647d49fbe044b747994c9f5a8e98b3c2cd02757dd189426a677276
sha256sums = cebf2c82ba11a2dece36606319cd16f0c1a5b36bec88813c61f41cb576e4a37a
sha256sums = a883032e2e929d4ce322fc5fefa36eedce77f86aeae3217eb52653ec6320351e
pkgname = joplin
# Maintainer: Alfredo Palhares <alfredo@palhares.me>
# Please contribute to:
# https://github.com/masterkorp/joplin-pkgbuild
pkgname=joplin
pkgver=1.0.175
pkgrel=2
pkgver=1.0.178
pkgrel=1
pkgdesc="Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS."
arch=("x86_64" "i686")
makedepends=("git" "nodejs" "rsync" "npm" "python")
depends=("nodejs" "gconf" "libxss")
depends=("nodejs" "libxss")
provides=("joplin" "joplin-cli")
url="https://joplin.cozic.net"
url="https://joplinapp.org/"
license=("MIT")
source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
"https://github.com/laurent22/joplin/archive/v${pkgver}.zip")
sha256sums=('c1ece73d0d8afcd3723ebf3b4d4d614d84e5ef8de0e61fc00c118847563da88d'
sha256sums=('ce4435654ee1f6d51d361945f32dd9bf07308f423c3f3c3db147744f203fbc2b'
'41bfdc95a6ee285eb644d05eb3bded72a83950d4720c3c8058ddd3c605cd625d'
'5245da6f5f647d49fbe044b747994c9f5a8e98b3c2cd02757dd189426a677276'
'cebf2c82ba11a2dece36606319cd16f0c1a5b36bec88813c61f41cb576e4a37a')
'a883032e2e929d4ce322fc5fefa36eedce77f86aeae3217eb52653ec6320351e')
build() {
# Remove husky (git hooks) from dependencies
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i '/"husky": ".*"/d' package.json
# Force Lang
# INFO: https://github.com/alfredopalhares/joplin-pkgbuild/issues/25
export LANG=en_US.utf8
# Install dependencies for the Tools used on another projects
cd "${srcdir}/${pkgname}-${pkgver}/Tools"
npm install
# Run copyLib and build the typescript
# INFO: https://github.com/alfredopalhares/joplin-pkgbuild/issues/40
cd "${srcdir}/${pkgname}-${pkgver}"
npm install
npm run copyLib
npm run tsc
# Build Cli CLient
cd "${srcdir}/${pkgname}-${pkgver}/CliClient"
......@@ -46,11 +57,7 @@ build() {
# Electron App
cd "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app"
# NOTE: Manually forcing sqlite 4.0.7 for node v12, remove later on
npm install sqlite3@4.0.7
npm install
# Remove uneeed .vscode path that comes with it
rm -r node_modules/sqlite3/.vscode
rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/lib/" \
"${srcdir}/${pkgname}-${pkgver}/ElectronClient/app/lib/"
......@@ -67,7 +74,7 @@ package() {
cp -R "${srcdir}/${pkgname}-${pkgver}/CliClient/node_modules" \
"${pkgdir}/usr/share/${pkgname}-cli"
# Remove uneeded .vscode from a dependency
rm -r "${pkgdir}/usr/share/${pkgname}-cli/node_modules/sqlite3/.vscode"
#rm -r "${pkgdir}/usr/share/${pkgname}-cli/node_modules/sqlite3/.vscode"
cp -R "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app/dist/linux-unpacked/"* \
"${pkgdir}/usr/share/${pkgname}"
......
[Desktop Entry]
Version=1.0.175
Version=1.0.178
Name=Joplin
Comment=Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS.
Exec=/usr/bin/joplin-desktop
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment