From 90bfd0ac46866c3a4b8a9689f20f7b91b5e9b88f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 3 Nov 2022 21:44:01 +0100
Subject: [PATCH] Add further patches for syncthingtray tests

---
 syncthingtray/default/PKGBUILD | 14 ++++++++++----
 syncthingtray/qt6/PKGBUILD     | 10 +++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD
index 456e808b..fde5df77 100644
--- a/syncthingtray/default/PKGBUILD
+++ b/syncthingtray/default/PKGBUILD
@@ -25,7 +25,7 @@ _enable_plasmoid=${SYNCTHING_TRAY_ENABLE_PLASMOID:-1}
 _reponame=syncthingtray
 pkgname=syncthingtray
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing'
 license=('GPL')
@@ -45,12 +45,16 @@ checkdepends=('cppunit' 'syncthing' 'iproute2' 'appstream')
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
         'https://github.com/Martchus/syncthingtray/commit/f121f5f740d799c2b29e9f5ce8e15ddae7857a28.patch'
-	'https://github.com/Martchus/syncthingtray/commit/ad81c29a1d8024e79da51efc2b3dc19583be1e21.patch'
-	'https://github.com/Martchus/syncthingtray/commit/0ca1fd163824e3100ff3ab258ffeb65a6ceadb3a.patch')
+        'https://github.com/Martchus/syncthingtray/commit/ad81c29a1d8024e79da51efc2b3dc19583be1e21.patch'
+        'https://github.com/Martchus/syncthingtray/commit/0ca1fd163824e3100ff3ab258ffeb65a6ceadb3a.patch'
+        'https://github.com/Martchus/syncthingtray/commit/0ab21657c4feb0500299af79314664b05edfc365.patch'
+        'https://github.com/Martchus/syncthingtray/commit/521567f2350baa1e75a60ad48f5ed7923777b024.patch')
 sha256sums=('aece0be140187a3c0c989a50007c3d5541d9e1abd51ec45b8c1e45ab783a9e52'
             '2df0516de56fa279af4fa1f85d524a1aa9e9df4ea3ecd8bacbc146aabf5920d9'
             'd6b4af56e0a80d3c813637bc0e9b74dae51f2fbd3919e992a342f9a5abd10acc'
-            '763fd7e2804c5bcf2f78ed3fb3669528163f2ba0b0b4d14eda07174932761cc2')
+            '763fd7e2804c5bcf2f78ed3fb3669528163f2ba0b0b4d14eda07174932761cc2'
+            '8dfddabf8f231457327d4eb91a6d204af64f4c621038cdb488b050c07581a430'
+            'db68ebd99729865788da17d2b7d61e58602b0df494dcd83de58b5ad088dd225c')
 
 ephemeral_port() {
   comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1
@@ -62,6 +66,8 @@ prepare() {
   patch -p1 -i ../f121f5f740d799c2b29e9f5ce8e15ddae7857a28.patch
   patch -p1 -i ../ad81c29a1d8024e79da51efc2b3dc19583be1e21.patch
   patch -p1 -i ../0ca1fd163824e3100ff3ab258ffeb65a6ceadb3a.patch
+  patch -p1 -i ../0ab21657c4feb0500299af79314664b05edfc365.patch
+  patch -p1 -i ../521567f2350baa1e75a60ad48f5ed7923777b024.patch
 }
 
 build() {
diff --git a/syncthingtray/qt6/PKGBUILD b/syncthingtray/qt6/PKGBUILD
index 69830bd7..c334415d 100644
--- a/syncthingtray/qt6/PKGBUILD
+++ b/syncthingtray/qt6/PKGBUILD
@@ -27,7 +27,7 @@ _cfg=qt6
 pkgname=syncthingtray-$_cfg
 _name=${pkgname%-$_cfg}
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing (using Qt 6)'
 license=('GPL')
@@ -48,11 +48,15 @@ url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
         'https://github.com/Martchus/syncthingtray/commit/f121f5f740d799c2b29e9f5ce8e15ddae7857a28.patch'
         'https://github.com/Martchus/syncthingtray/commit/ad81c29a1d8024e79da51efc2b3dc19583be1e21.patch'
-        'https://github.com/Martchus/syncthingtray/commit/0ca1fd163824e3100ff3ab258ffeb65a6ceadb3a.patch')
+        'https://github.com/Martchus/syncthingtray/commit/0ca1fd163824e3100ff3ab258ffeb65a6ceadb3a.patch'
+        'https://github.com/Martchus/syncthingtray/commit/0ab21657c4feb0500299af79314664b05edfc365.patch'
+        'https://github.com/Martchus/syncthingtray/commit/521567f2350baa1e75a60ad48f5ed7923777b024.patch')
 sha256sums=('aece0be140187a3c0c989a50007c3d5541d9e1abd51ec45b8c1e45ab783a9e52'
             '2df0516de56fa279af4fa1f85d524a1aa9e9df4ea3ecd8bacbc146aabf5920d9'
             'd6b4af56e0a80d3c813637bc0e9b74dae51f2fbd3919e992a342f9a5abd10acc'
-            '763fd7e2804c5bcf2f78ed3fb3669528163f2ba0b0b4d14eda07174932761cc2')
+            '763fd7e2804c5bcf2f78ed3fb3669528163f2ba0b0b4d14eda07174932761cc2'
+            '8dfddabf8f231457327d4eb91a6d204af64f4c621038cdb488b050c07581a430'
+            'db68ebd99729865788da17d2b7d61e58602b0df494dcd83de58b5ad088dd225c')
 
 ephemeral_port() {
   comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1