upgpkg: alps 2022.03.01-4

Include missing plugin assets

4 files changed, 28 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd593ebe5516..b74c3b0c2bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alps
 	pkgdesc = A simple and extensible webmail
 	pkgver = 2022.03.01
-	pkgrel = 3
+	pkgrel = 4
 	url = https://git.sr.ht/~migadu/alps
 	arch = i686
 	arch = x86_64
@@ -17,12 +17,14 @@ pkgbase = alps
 	source = alps.conf
 	source = alps-system.service
 	source = alps-user.service
+	source = alps-plugins-path.patch
 	source = alps-themes-path.patch
 	source = alps-fix-160.patch
 	b2sums = ad632b1978b03b6ce491b5e6eb47dad39a4d4d33b317de8efd660f2c56bbe175b59822fa8f29ae3abeaf687122b4499fa10f53e7bcc989fe09d257f4cbea8653
 	b2sums = 8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5
 	b2sums = 56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e
 	b2sums = a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c
+	b2sums = b3bc983fa8350e36ff176e882bf7b67cb5ba4c0863e70c9cb5c2bd78a0ee12504ae997dec44cb008e68ead14d08dd30ea33719f0a107b170d6906ee4d69f8e5d
 	b2sums = f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21
 	b2sums = 225f9d365c6c44cb4c0526229f27984d9bc95010b38131a1a26d96b5a49370822d4a976d3a552d4009d1612293da035948dd4f7445e36c0ade987a5dd3af22c8
 
diff --git a/.gitignore b/.gitignore
index fe526418c35b..f3069af13585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *
 !alps.conf
 !alps-fix-160.patch
+!alps-plugins-path.patch
 !alps-system.service
 !alps-themes-path.patch
 !alps-user.service
diff --git a/PKGBUILD b/PKGBUILD
index b36cff15487d..dcc1bfbb48e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _commit='f4523b51af0787795973b403b978ff74737a47ef'
 pkgname=alps
 pkgver=2022.03.01
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple and extensible webmail'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url='https://git.sr.ht/~migadu/alps'
@@ -16,16 +16,19 @@ source=("${pkgname}-${pkgver}.tar.gz::https://git.sr.ht/~migadu/${pkgname}/archi
         "${pkgname}.conf"
         "${pkgname}-system.service"
         "${pkgname}-user.service"
+        "${pkgname}-plugins-path.patch"
         "${pkgname}-themes-path.patch"
         "${pkgname}-fix-160.patch")
 b2sums=('ad632b1978b03b6ce491b5e6eb47dad39a4d4d33b317de8efd660f2c56bbe175b59822fa8f29ae3abeaf687122b4499fa10f53e7bcc989fe09d257f4cbea8653'
         '8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5'
         '56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e'
         'a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c'
+        'b3bc983fa8350e36ff176e882bf7b67cb5ba4c0863e70c9cb5c2bd78a0ee12504ae997dec44cb008e68ead14d08dd30ea33719f0a107b170d6906ee4d69f8e5d'
         'f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21'
         '225f9d365c6c44cb4c0526229f27984d9bc95010b38131a1a26d96b5a49370822d4a976d3a552d4009d1612293da035948dd4f7445e36c0ade987a5dd3af22c8')
 
 prepare(){
+  patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-plugins-path".patch
   patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-themes-path".patch
   patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-fix-160".patch
 }
@@ -52,14 +55,16 @@ package() {
   cd "${pkgname}-${_commit}"
   # binary
   install -D -m755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}"
+  # plugin assets
+  install -d -m755 "${pkgdir}/usr/lib/${pkgname}/plugins"
+  for plugin in plugins/*; do
+    [ -d "${plugin}/public" ] && \
+      install -d -m755 "${pkgdir}/usr/lib/${pkgname}/${plugin}" && \
+      cp -a "${plugin}/public" \
+        "${pkgdir}/usr/lib/${pkgname}/${plugin}"
+  done
   # themes
-  install -d -m755 "${pkgdir}/usr/lib/${pkgname}/themes"
-  cp -a themes/alps "${pkgdir}/usr/lib/${pkgname}/themes/alps"
-  cp -a themes/alps "${pkgdir}/usr/lib/${pkgname}/themes/sourcehut"
-  cp -a themes/sourcehut/*html \
-    "${pkgdir}/usr/lib/${pkgname}/themes/sourcehut"
-  cp -a themes/sourcehut/assets/*css \
-    "${pkgdir}/usr/lib/${pkgname}/themes/sourcehut/assets"
+  cp -a themes "${pkgdir}/usr/lib/${pkgname}"
   # docs
   install -D -m644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
   cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
diff --git a/alps-plugins-path.patch b/alps-plugins-path.patch
new file mode 100644
index 000000000000..fc782c95ca40
--- /dev/null
+++ b/alps-plugins-path.patch
@@ -0,0 +1,11 @@
+--- a/plugin.go	2022-04-18 08:26:37.395274661 +0200
++++ b/plugin.go	2022-04-18 08:28:09.476688414 +0200
+@@ -7,7 +7,7 @@
+ )
+ 
+ // PluginDir is the path to the plugins directory.
+-const PluginDir = "plugins"
++const PluginDir = "/usr/lib/alps/plugins"
+ 
+ // Plugin extends alps with additional functionality.
+ type Plugin interface {