Merge branch 'main' of git.rustybever.be:bur/jjr-joplin

.woodpecker.yml

@@ -0,0 +1,22 @@
+pipeline:
+  build:
+    image: 'archlinux:latest'
+    commands:
+      # Update packages
+      - pacman -Syu --needed --noconfirm base-devel
+      # Create non-root user to perform build & switch to their home
+      - groupadd -g 1000 builder
+      - useradd -mg builder builder
+      - 'chown -R builder:builder "$PWD"'
+      - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - su builder
+      # Build the package
+      - makepkg -s --noconfirm --needed
+
+  publish:
+    image: 'archlinux:latest'
+    secrets:
+      - api_key
+    commands:
+      # Publish the package
+      - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "${pkg}" -H "X-API-KEY: $API_KEY" https://arch.r8r.be/publish; done'

PKGBUILD

@@ -7,26 +7,27 @@
 # 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' 'npm' '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"
   "joplin-${pkgver}.tar.gz::https://github.com/laurent22/joplin/archive/v${pkgver}.tar.gz"
-  "joplin-patches.tar.xz")
+  "joplin-patches.tar.xz" "patch.exp")
 sha256sums=('c7c5d8b0ff9edb810ed901ea21352c9830bfa286f3c18b1292deca5b2f8febd2'
             'a450284fe66d89aa463d129ce8fff3a0a1a783a64209e4227ee47449d5737be8'
             'dc1236767ee055ea1d61f10e5266a23e70f3e611b405fe713ed24ca18ee9eeb5'
             '1994cf5a32cf72f60f0455ad8204ff1d5ebb70933ad50ade78431fa359b561c6'
-            '43f86e589f20141d7a2478fd12b4aa2dc73c6a52d7037137515358f4cd65616f')
+            '43f86e589f20141d7a2478fd12b4aa2dc73c6a52d7037137515358f4cd65616f'
+            '2b135b769c3f5da630ac06da30ef15c79e286e5355e98e26e04b59c68f7904bd')
 
 # local npm cache directory
 _npm_cache="npm-cache"
@@ -46,11 +47,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")"
@@ -92,7 +94,7 @@ check() {
   #npm run test || exit 0
 }
 
-package_joplin() {
+package_jjr-joplin() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
   depends=('coreutils' 'libsecret' 'nodejs' 'python')
 
@@ -145,7 +147,7 @@ package_joplin() {
 }
 
 
-package_joplin-desktop() {
+package_jjr-joplin-desktop() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - Desktop"
   depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc')

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"