From 4df42c9c5af97705e9ecf1dcc66f6109520b77eb Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 18 May 2021 16:01:38 +0000
Subject: [PATCH] extra/kdiff3 to 1.9.2-1

---
 extra/kdiff3/PKGBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 09f161bba..de229d79f 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -5,7 +5,7 @@
 #  - patch to explicitly link v5/v6 with libatomic
 
 pkgname=kdiff3
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc='A file comparator/merge tool'
 arch=(x86_64)
@@ -14,13 +14,16 @@ license=(GPL)
 depends=(kparts hicolor-icon-theme)
 makedepends=(extra-cmake-modules kdoctools boost)
 source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+        https://invent.kde.org/sdk/kdiff3/-/commit/0476b1da.patch
         0001-link-atomic.patch)
-sha256sums=('079df4523c15919489707dc89b738ad6432680d42de59caecb3a9219b5cbd294'
+sha256sums=('f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805'
             'SKIP'
+            'ff2b8f3548c61cc6a4155a0297e79f434ac861455a0673dd339da22a60bc0577'
             '47ce388156ae3d70efb6915c94db3502b0bbdfa439aaf4a6b75f7ab6702e338c')
 validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves <reeves.87@gmail.com>
 
 prepare() {
+  patch -d $pkgname-$pkgver -p1 < 0476b1da.patch # Fix build with GCC 11
   if [[ $CARCH == "armv6h" || $CARCH == "arm" ]]; then
     cd $pkgname-$pkgver
     patch -p1 -i ../0001-link-atomic.patch