Possibly fixed patch prompts

main
Jef Roosens 2022-01-02 13:45:02 +01:00
parent 22c8b5c954
commit 3b6a75d3b6
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
2 changed files with 17 additions and 5 deletions

View File

@ -7,16 +7,16 @@
# https://github.com/alfredopalhares/arch-pkgbuilds # https://github.com/alfredopalhares/arch-pkgbuilds
pkgbase="joplin" pkgbase="joplin"
pkgname=('joplin' 'joplin-desktop') pkgname=('jjr-joplin' 'jjr-joplin-desktop')
pkgver=2.6.10 pkgver=2.6.10
groups=('joplin') groups=('jjr-joplin')
pkgrel=4 pkgrel=4
install="joplin.install" install="joplin.install"
depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs' depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
'nss' 'orc' 'rsync' 'libvips') 'nss' 'orc' 'rsync' 'libvips')
optdepends=('libappindicator-gtk3: for tray icon') optdepends=('libappindicator-gtk3: for tray icon')
arch=('x86_64' 'i686') arch=('x86_64' 'i686')
makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips') makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips' 'expect')
url="https://joplinapp.org/" url="https://joplinapp.org/"
license=('MIT') license=('MIT')
source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh" source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
@ -46,11 +46,12 @@ prepare() {
msg2 "Disabling husky (git hooks)" msg2 "Disabling husky (git hooks)"
sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json" sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json"
msg2 "Appliying patches..." msg2 "Applying patches..."
cd "${srcdir}/joplin-${pkgver}" cd "${srcdir}/joplin-${pkgver}"
tar xvJf "${srcdir}/joplin-patches.tar.xz" tar xvJf "${srcdir}/joplin-patches.tar.xz"
patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch" patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch"
patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch" # patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
expect "${srcdir}/patch.exp" "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
msg2 "Tweaking lerna.json" msg2 "Tweaking lerna.json"
local tmp_json="$(mktemp --tmpdir="$srcdir")" local tmp_json="$(mktemp --tmpdir="$srcdir")"

11
patch.exp 100644
View File

@ -0,0 +1,11 @@
#!/usr/bin/expect -f
set timeout -1
set patchfile [lindex $argv 0]
spawn sh -c "patch -p1 < $patchfile"
expect "Assume -R?"
send -- "y\r"