extra/kdiff3 to 1.9.4-1

This commit is contained in:
David Beauchamp 2021-11-22 11:39:53 -05:00
parent 6840f328fa
commit 330587bc65
1 changed files with 2 additions and 5 deletions

View File

@ -5,7 +5,7 @@
# - patch to explicitly link v5/v6 with libatomic
pkgname=kdiff3
pkgver=1.9.3
pkgver=1.9.4
pkgrel=1
pkgdesc='A file comparator/merge tool'
arch=(x86_64)
@ -14,16 +14,13 @@ 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=('317bf5c7e27cba81bce7e1a7a579105443133b633cbb71bc1f169e86a235af9c'
sha256sums=('a130712ceef074df691426909fc4a332b66f4c3f1490a548ab5bfb46316c385a'
'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