From 3b6a75d3b67e90b576102939e6844cd133236331 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 Jan 2022 13:45:02 +0100
Subject: [PATCH] Possibly fixed patch prompts

---
 PKGBUILD  | 11 ++++++-----
 patch.exp | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 patch.exp

diff --git a/PKGBUILD b/PKGBUILD
index a8cb74f..181f80c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,16 +7,16 @@
 # https://github.com/alfredopalhares/arch-pkgbuilds
 
 pkgbase="joplin"
-pkgname=('joplin' 'joplin-desktop')
+pkgname=('jjr-joplin' 'jjr-joplin-desktop')
 pkgver=2.6.10
-groups=('joplin')
+groups=('jjr-joplin')
 pkgrel=4
 install="joplin.install"
 depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc' 'rsync' 'libvips')
 optdepends=('libappindicator-gtk3: for tray icon')
 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/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
@@ -46,11 +46,12 @@ prepare() {
   msg2 "Disabling husky (git hooks)"
   sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json"
 
-  msg2 "Appliying patches..."
+  msg2 "Applying patches..."
   cd "${srcdir}/joplin-${pkgver}"
   tar xvJf "${srcdir}/joplin-patches.tar.xz"
   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"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"
diff --git a/patch.exp b/patch.exp
new file mode 100644
index 0000000..8bc6c60
--- /dev/null
+++ b/patch.exp
@@ -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"