updated checksums

added int32 include patch for mimetic headers

3 files changed, 42 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b2ffb665779..1387d7eb54a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trojita
 	pkgdesc = A Qt IMAP email client
 	pkgver = 0.7
-	pkgrel = 9
+	pkgrel = 10
 	url = https://trojita.flaska.net
 	arch = x86_64
 	license = GPL
@@ -22,13 +22,15 @@ pkgbase = trojita
 	source = trojita-desktop.patch::https://invent.kde.org/pim/trojita/-/commit/d080f785.patch
 	source = trojita-highdpi.patch::https://invent.kde.org/pim/trojita/-/commit/eecc474a.patch
 	source = trojita-wayland.patch::https://invent.kde.org/pim/trojita/-/commit/81e84200.patch
+	source = trojita-0-7-mimetic-inttypes.patch
 	validpgpkeys = 61AB87D6F66CE2FCD2D2E1F56A65DFA844722517
 	sha512sums = fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
-	sha512sums = 4058e6633210e289bafb7e051f284442f34f6096cce0f714fadcf31671deec41b2df2b587e1aadc8df8c42b43a411a7c6a0269b1725552e1f2d470191c00c36d
-	sha512sums = 714b6d3b8a791783039f51d98b5d14b2b01ec3228993500623c980c09d04c38e6f26d236efa7fc722d68cd72692b646e5c4b2ca13d3d9b342e2072afb466ded0
-	sha512sums = 2f1c1de165f8fede77cbb0fe9a5cc1139def4d903692adefcc25a14fcec0c50f1070d458ddaa17bdb2c999f54c3dbf6e6403ccd5c897f4c861a1df7d121e978a
-	sha512sums = 7b3e89c5c889b61e3074923eec6d7365908ff2641730a12cbccc235859733770e120029a7f2e3a395317120fc45556ad3cbbc11c2d6e3cd2a06bd1d7abb93534
-	sha512sums = a76ca7920ddc766d259565b7dd8cb52d24e116e83ed83acad6bb6e6b38f5956b6a6f2174bfb2c93583bd6e30285618a1162f1c5eef657bb66bd67b8843d35d2c
-	sha512sums = ce2f42e4c3cc3d21c428918016ec28492a8e47ef5aa9fad5cdad93fd8b17fe81e190b34d83b21bd651a3ebf8921f2c7ab6ae99dcf071add499fe6f2df084ac83
+	sha512sums = SKIP
+	sha512sums = 7b455ec4147a137ad055c4fb96d46f0921e2229daeac1618e08277eb93ef1f7c4c73e3bbf6cf5da5ccc85819370cbd802d3b6e11b17072654d53e2ffb1f52997
+	sha512sums = 286c8086dd10c177f2ef30b08f913892923d7f9489519a337e89b10754adb14d275750b4b32e2242adb33d832fb448f39f1c599996093df330158a582ecdd845
+	sha512sums = 0e4085a756bcdbc4eb4c33607a7a71d928d64d7e5ee8d6c672d2b3e3a054b71fdd975b220c0746d84cc4a4d360e9be7ef561cf2776263100c9c2db7dd556fced
+	sha512sums = 8eb0691ff0f68316aab4cbed3d270b626bc330719bba6a3706c371fc9f15f6ed970fa72286859d935d49497446b88c8d68fddd96e29cde4adff7ace8be0399f1
+	sha512sums = 0e1530af9dc49f60d5ce771b116afd29553f713917b63e8dd5bccfdf5a364f7ff5dced838b59d423c308fb226e8f94291f6d995cf59ca63eba002019ef10b389
+	sha512sums = 04d0cead94f7c7394b6cf242eceddcd23efdcb6e21ccf243f93458a9c0b03acfdf1799b9d812f31cf1fbd1801e438f7c49bb2322b0722f52da64e922b6193c62
 
 pkgname = trojita
diff --git a/PKGBUILD b/PKGBUILD
index 0d18502655db..2f5215436ec4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=trojita
 pkgver=0.7
-pkgrel=9
+pkgrel=10
 pkgdesc='A Qt IMAP email client'
 arch=(x86_64)
 url='https://trojita.flaska.net'
@@ -16,14 +16,16 @@ source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz{,.asc
         trojita-qt5.15.patch::"https://invent.kde.org/pim/trojita/-/commit/2869c385.patch"
         trojita-desktop.patch::"https://invent.kde.org/pim/trojita/-/commit/d080f785.patch"
         trojita-highdpi.patch::"https://invent.kde.org/pim/trojita/-/commit/eecc474a.patch"
-        trojita-wayland.patch::"https://invent.kde.org/pim/trojita/-/commit/81e84200.patch")
+        trojita-wayland.patch::"https://invent.kde.org/pim/trojita/-/commit/81e84200.patch"
+        trojita-0-7-mimetic-inttypes.patch)
 sha512sums=('fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8'
-            '4058e6633210e289bafb7e051f284442f34f6096cce0f714fadcf31671deec41b2df2b587e1aadc8df8c42b43a411a7c6a0269b1725552e1f2d470191c00c36d'
-            '714b6d3b8a791783039f51d98b5d14b2b01ec3228993500623c980c09d04c38e6f26d236efa7fc722d68cd72692b646e5c4b2ca13d3d9b342e2072afb466ded0'
-            '2f1c1de165f8fede77cbb0fe9a5cc1139def4d903692adefcc25a14fcec0c50f1070d458ddaa17bdb2c999f54c3dbf6e6403ccd5c897f4c861a1df7d121e978a'
-            '7b3e89c5c889b61e3074923eec6d7365908ff2641730a12cbccc235859733770e120029a7f2e3a395317120fc45556ad3cbbc11c2d6e3cd2a06bd1d7abb93534'
-            'a76ca7920ddc766d259565b7dd8cb52d24e116e83ed83acad6bb6e6b38f5956b6a6f2174bfb2c93583bd6e30285618a1162f1c5eef657bb66bd67b8843d35d2c'
-            'ce2f42e4c3cc3d21c428918016ec28492a8e47ef5aa9fad5cdad93fd8b17fe81e190b34d83b21bd651a3ebf8921f2c7ab6ae99dcf071add499fe6f2df084ac83')
+            'SKIP'
+            '7b455ec4147a137ad055c4fb96d46f0921e2229daeac1618e08277eb93ef1f7c4c73e3bbf6cf5da5ccc85819370cbd802d3b6e11b17072654d53e2ffb1f52997'
+            '286c8086dd10c177f2ef30b08f913892923d7f9489519a337e89b10754adb14d275750b4b32e2242adb33d832fb448f39f1c599996093df330158a582ecdd845'
+            '0e4085a756bcdbc4eb4c33607a7a71d928d64d7e5ee8d6c672d2b3e3a054b71fdd975b220c0746d84cc4a4d360e9be7ef561cf2776263100c9c2db7dd556fced'
+            '8eb0691ff0f68316aab4cbed3d270b626bc330719bba6a3706c371fc9f15f6ed970fa72286859d935d49497446b88c8d68fddd96e29cde4adff7ace8be0399f1'
+            '0e1530af9dc49f60d5ce771b116afd29553f713917b63e8dd5bccfdf5a364f7ff5dced838b59d423c308fb226e8f94291f6d995cf59ca63eba002019ef10b389'
+            '04d0cead94f7c7394b6cf242eceddcd23efdcb6e21ccf243f93458a9c0b03acfdf1799b9d812f31cf1fbd1801e438f7c49bb2322b0722f52da64e922b6193c62')
 validpgpkeys=('61AB87D6F66CE2FCD2D2E1F56A65DFA844722517')
 options=(debug)
 
@@ -33,6 +35,7 @@ prepare() {
   patch -d $pkgname-$pkgver -p1 < trojita-desktop.patch # Fix taskbar item on Wayland
   patch -d $pkgname-$pkgver -p1 < trojita-highdpi.patch # Enable high DPI support
   patch -d $pkgname-$pkgver -p1 < trojita-wayland.patch # Fix icon on Wayland
+  patch -d $pkgname-$pkgver -p1 < trojita-0-7-mimetic-inttypes.patch # Fix missing includes for uint32_t in mimetic (should be fixed there actually)
 }
 
 build() {
diff --git a/trojita-0-7-mimetic-inttypes.patch b/trojita-0-7-mimetic-inttypes.patch
new file mode 100644
index 000000000000..38684d06fe0d
--- /dev/null
+++ b/trojita-0-7-mimetic-inttypes.patch
@@ -0,0 +1,22 @@
+diff -rauN trojita-0.7/src/Cryptography/LocalMimeParser.cpp trojita-0-7-mimetic-inttypes-patch/src/Cryptography/LocalMimeParser.cpp
+--- trojita-0.7/src/Cryptography/LocalMimeParser.cpp	2016-06-15 09:17:23.000000000 +0200
++++ trojita-0-7-mimetic-inttypes-patch/src/Cryptography/LocalMimeParser.cpp	2023-06-30 08:47:21.566308271 +0200
+@@ -20,6 +20,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <inttypes.h>
+ #include <mimetic/mimetic.h>
+ #include <QBrush>
+ #include <QFont>
+diff -rauN trojita-0.7/src/Cryptography/MimeticUtils.cpp trojita-0-7-mimetic-inttypes-patch/src/Cryptography/MimeticUtils.cpp
+--- trojita-0.7/src/Cryptography/MimeticUtils.cpp	2016-06-15 09:17:23.000000000 +0200
++++ trojita-0-7-mimetic-inttypes-patch/src/Cryptography/MimeticUtils.cpp	2023-06-30 08:47:11.756330571 +0200
+@@ -22,6 +22,7 @@
+ */
+ 
+ #include <sstream>
++#include <inttypes.h>
+ #include <mimetic/mimetic.h>
+ #include "Cryptography/MimeticUtils.h"
+ #include "Imap/Encoders.h"