[arch-commits] Commit in kdiff3/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, May 18, 2021 @ 13:40:42
  Author: arojas
Revision: 415677

archrelease: copy trunk to extra-x86_64

Added:
  kdiff3/repos/extra-x86_64/PKGBUILD
    (from rev 415676, kdiff3/trunk/PKGBUILD)
Deleted:
  kdiff3/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   56 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-18 13:40:32 UTC (rev 415676)
+++ PKGBUILD	2021-05-18 13:40:42 UTC (rev 415677)
@@ -1,25 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=kdiff3
-pkgver=1.9.1
-pkgrel=1
-pkgdesc='A file comparator/merge tool'
-arch=(x86_64)
-url='https://kde.org/applications/development/kdiff3/'
-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})
-sha256sums=('079df4523c15919489707dc89b738ad6432680d42de59caecb3a9219b5cbd294'
-            'SKIP')
-validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves <reeves.87 at gmail.com>
-
-build() {
-  cmake -B build -S $pkgname-$pkgver
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: kdiff3/repos/extra-x86_64/PKGBUILD (from rev 415676, kdiff3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-18 13:40:42 UTC (rev 415677)
@@ -0,0 +1,31 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kdiff3
+pkgver=1.9.2
+pkgrel=1
+pkgdesc='A file comparator/merge tool'
+arch=(x86_64)
+url='https://kde.org/applications/development/kdiff3/'
+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)
+sha256sums=('f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805'
+            'SKIP'
+            'ff2b8f3548c61cc6a4155a0297e79f434ac861455a0673dd339da22a60bc0577')
+validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves <reeves.87 at gmail.com>
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < 0476b1da.patch # Fix build with GCC 11
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}