removed extra/kdiff3

This commit is contained in:
Kevin Mihelich 2022-03-03 13:48:18 +00:00
parent b1000f4cb8
commit dbd1c4296f
2 changed files with 0 additions and 71 deletions

View file

@ -1,34 +0,0 @@
From 325099960900c49b06e7e0da736f0d86a3f96092 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
---
src/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3190160..eaac426 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,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 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 )
@@ -67,7 +67,7 @@ endif()
include(icons/CMakeLists.txt)
add_executable(kdiff3 ${kdiff3_SRCS})
-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})
# See https://cmake.org/cmake/help/v3.15/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.html
--
2.30.1

View file

@ -1,37 +0,0 @@
# Maintainer: Antonio Rojas <arojas@archlinux.org>
# Maintainer: Eric Bélanger <eric@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch to explicitly link v5/v6 with libatomic
pkgname=kdiff3
pkgver=1.9.4
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}
0001-link-atomic.patch)
sha256sums=('a130712ceef074df691426909fc4a332b66f4c3f1490a548ab5bfb46316c385a'
'SKIP'
'47ce388156ae3d70efb6915c94db3502b0bbdfa439aaf4a6b75f7ab6702e338c')
validpgpkeys=(EE56D710885D36FB1E4D21F3F442B36D614B06BC) # Michael Reeves <reeves.87@gmail.com>
prepare() {
if [[ $CARCH == "armv6h" || $CARCH == "arm" ]]; then
cd $pkgname-$pkgver
patch -p1 -i ../0001-link-atomic.patch
fi
}
build() {
cmake -B build -S $pkgname-$pkgver
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}