From d30770a4c1a7d21d303cff59e657ecb6d24646cb Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Fri, 29 Mar 2019 12:45:19 +0000 Subject: [PATCH] extra/kdiff3 to 1.7.90.git20190329-1 --- extra/kdiff3/0001-link-atomic.patch | 18 +++++++++--------- extra/kdiff3/PKGBUILD | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extra/kdiff3/0001-link-atomic.patch b/extra/kdiff3/0001-link-atomic.patch index 339ebcc51..5e27e4e70 100644 --- a/extra/kdiff3/0001-link-atomic.patch +++ b/extra/kdiff3/0001-link-atomic.patch @@ -1,4 +1,4 @@ -From aef93ed6c8713ca700d99944ec299e1a07e317f2 Mon Sep 17 00:00:00 2001 +From ffb46846f6124ba7e28ba0a27c5457b5891dbdf9 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Tue, 21 Aug 2018 06:51:04 -0600 Subject: [PATCH] link atomic @@ -8,24 +8,24 @@ Subject: [PATCH] link atomic 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 973eadd..c28d3b3 100644 +index 463e7a9..b7a641a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -33,7 +33,7 @@ add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS}) +@@ -35,7 +35,7 @@ add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS}) set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART) target_compile_features(kdiff3part PRIVATE ${needed_features}) --target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts) -+target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts atomic) +-target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts KF5::Crash) ++target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts KF5::Crash atomic) + target_compile_definitions(kdiff3part PRIVATE -DTRANSLATION_DOMAIN=\"kdiff3\") install(TARGETS kdiff3part DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts ) - -@@ -48,7 +48,7 @@ set(kdiff3_SRCS +@@ -51,7 +51,7 @@ set(kdiff3_SRCS add_executable(kdiff3 ${kdiff3_SRCS}) --target_link_libraries(kdiff3 KF5::ConfigCore KF5::ConfigGui KF5::Parts ${KDiff3_LIBRARIES} ) -+target_link_libraries(kdiff3 KF5::ConfigCore KF5::ConfigGui KF5::Parts ${KDiff3_LIBRARIES} atomic) +-target_link_libraries(kdiff3 KF5::ConfigCore KF5::ConfigGui KF5::Parts KF5::Crash ${KDiff3_LIBRARIES} ) ++target_link_libraries(kdiff3 KF5::ConfigCore KF5::ConfigGui KF5::Parts KF5::Crash ${KDiff3_LIBRARIES} atomic) target_compile_features(kdiff3 PRIVATE ${needed_features}) install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index ff8f13d35..f0c1d876f 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.git20190308 +pkgver=1.7.90.git20190329 pkgrel=1 -_commit=8df1172bf96ed1b9b72bb59313ca884b6ae4e052 +_commit=0caf3edb739cfcf5a57df305c6d6dec37dbc8bff 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' - 'cf937b439d988eeb65484cb6967be4b89574e48eed3efe53574842fb5c266e8b') + '414fd602932d4572eb564da71c8adde822dfcc96727693c266195580a04d9809') prepare() { mkdir -p build