upgpkg: alps 2022.03.01-2

Add a fix patch for #160

4 files changed, 51 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51c736c20136..23963b9f8c86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alps
 	pkgdesc = A simple and extensible webmail
 	pkgver = 2022.03.01
-	pkgrel = 1
+	pkgrel = 2
 	url = https://git.sr.ht/~migadu/alps
 	arch = i686
 	arch = x86_64
@@ -18,10 +18,12 @@ pkgbase = alps
 	source = alps-system.service
 	source = alps-user.service
 	source = alps-themes-path.patch
+	source = alps-fix-160.patch
 	b2sums = ad632b1978b03b6ce491b5e6eb47dad39a4d4d33b317de8efd660f2c56bbe175b59822fa8f29ae3abeaf687122b4499fa10f53e7bcc989fe09d257f4cbea8653
 	b2sums = 8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5
 	b2sums = 56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e
 	b2sums = a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c
 	b2sums = f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21
+	b2sums = 225f9d365c6c44cb4c0526229f27984d9bc95010b38131a1a26d96b5a49370822d4a976d3a552d4009d1612293da035948dd4f7445e36c0ade987a5dd3af22c8
 
 pkgname = alps
diff --git a/.gitignore b/.gitignore
index 320d7012ffc1..fe526418c35b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *
 !alps.conf
+!alps-fix-160.patch
 !alps-system.service
 !alps-themes-path.patch
 !alps-user.service
diff --git a/PKGBUILD b/PKGBUILD
index d2dbe2d35ef1..553e43b6c23c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _commit='f4523b51af0787795973b403b978ff74737a47ef'
 pkgname=alps
 pkgver=2022.03.01
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple and extensible webmail'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url='https://git.sr.ht/~migadu/alps'
@@ -16,15 +16,18 @@ source=("${pkgname}-${pkgver}.tar.gz::https://git.sr.ht/~migadu/${pkgname}/archi
         "${pkgname}.conf"
         "${pkgname}-system.service"
         "${pkgname}-user.service"
-        "${pkgname}-themes-path.patch")
+        "${pkgname}-themes-path.patch"
+        "${pkgname}-fix-160.patch")
 b2sums=('ad632b1978b03b6ce491b5e6eb47dad39a4d4d33b317de8efd660f2c56bbe175b59822fa8f29ae3abeaf687122b4499fa10f53e7bcc989fe09d257f4cbea8653'
         '8c9109649da6b030cd1c7ff32a5db1034391a8858593b649e953bd074b7329181c52575403d22b59113760423d15e0fb3cb3e8cdf5feb8415efe5aba936ae0c5'
         '56f6f6439e537901c953a840ff08c70c9acf63b029e3298e612fb75c152d198f4d1535327b911790c01ca74b5ef5bba2a98c2fb4f14180727a457ea5b846a74e'
         'a9ef4a29b26f950f3a1bd9f262a3c23bb731b79d15ff0cee979692b0b99cb0b678ed54da7fe36449ca146aa7e1da7ba7302fb7afc4620ef1a07a119ba789464c'
-        'f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21')
+        'f34d00a82db978ade7c92ca13109e73be25fdff5046e2e9f279c09733a7ce7a5e11b368ddd76234d154b9af0fd917901fda2c2b33d3f41342b3a5f6d8e6afb21'
+        '225f9d365c6c44cb4c0526229f27984d9bc95010b38131a1a26d96b5a49370822d4a976d3a552d4009d1612293da035948dd4f7445e36c0ade987a5dd3af22c8')
 
 prepare(){
   patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-themes-path".patch
+  patch -d "${pkgname}-${_commit}" -p1 <"${pkgname}-fix-160".patch
 }
 
 build() {
diff --git a/alps-fix-160.patch b/alps-fix-160.patch
new file mode 100644
index 000000000000..81e9138d8717
--- /dev/null
+++ b/alps-fix-160.patch
@@ -0,0 +1,41 @@
+--- a/themes/alps/assets/style.css	2022-03-01 11:17:34.000000000 +0100
++++ b/themes/alps/assets/style.css	2022-04-12 08:46:03.754595788 +0200
+@@ -655,8 +655,7 @@
+ 
+ .action-group label,
+ .action-group input,
+-.action-group textarea,
+-.action-group select {
++.action-group textarea {
+   display: block;
+   width: 100%;
+ }
+@@ -668,7 +667,8 @@
+ }
+ 
+ .action-group select {
+-  height: 10rem;
++  display:inline-block;
++  -webkit-appearance: none;
+ }
+ 
+ .actions-message,
+@@ -833,7 +833,7 @@
+ input[type="submit"],
+ .button,
+ button,
+-.button-link {
++.button-link, select {
+   margin: 0;
+   cursor: pointer;
+   text-decoration: none;
+@@ -859,7 +859,8 @@
+ input[type="submit"],
+ .button,
+ button,
+-.button-link {
++.button-link,
++select {
+   background-color: #f5f5f5;
+   border: 1px solid #ddd;
+   color: black;