diff --git a/extra/kdiff3/0001-link-atomic.patch b/extra/kdiff3/0001-link-atomic.patch index c70f9169c..339ebcc51 100644 --- a/extra/kdiff3/0001-link-atomic.patch +++ b/extra/kdiff3/0001-link-atomic.patch @@ -1,4 +1,4 @@ -From 2ef432401be01de5ebb9e4545d497d2cacab9168 Mon Sep 17 00:00:00 2001 +From aef93ed6c8713ca700d99944ec299e1a07e317f2 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 21 Aug 2018 06:51:04 -0600 Subject: [PATCH] link atomic @@ -8,10 +8,10 @@ Subject: [PATCH] link atomic 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4f9adab..8165292 100644 +index 973eadd..c28d3b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -27,7 +27,7 @@ add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS}) +@@ -33,7 +33,7 @@ add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS}) set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART) target_compile_features(kdiff3part PRIVATE ${needed_features}) @@ -20,7 +20,7 @@ index 4f9adab..8165292 100644 install(TARGETS kdiff3part DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts ) -@@ -42,7 +42,7 @@ set(kdiff3_SRCS +@@ -48,7 +48,7 @@ set(kdiff3_SRCS add_executable(kdiff3 ${kdiff3_SRCS}) @@ -30,5 +30,5 @@ index 4f9adab..8165292 100644 install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS}) -- -2.18.0 +2.21.0 diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index 539e11b40..ff8f13d35 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -5,9 +5,9 @@ # - patch to explicitly link v5/v6 with libatomic pkgname=kdiff3 -pkgver=0.9.98.git20190114 +pkgver=0.9.98.git20190308 pkgrel=1 -_commit=a4da2fd353a66c4f563673973bb727050d4737b6 +_commit=8df1172bf96ed1b9b72bb59313ca884b6ae4e052 pkgdesc="A KDE file comparator/merge tool" arch=(x86_64) url="https://kdiff3.sourceforge.net/" @@ -17,7 +17,7 @@ makedepends=(extra-cmake-modules kdoctools git) source=(git://git.kde.org/kdiff3#commit=$_commit 0001-link-atomic.patch) sha256sums=('SKIP' - '2ace78e6fbc835e9192faefcbb651606ffe5a1e7d8fdfe620726f48117b7ab8e') + 'cf937b439d988eeb65484cb6967be4b89574e48eed3efe53574842fb5c266e8b') prepare() { mkdir -p build