From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] kdiff3: update to 1.8.1.
Date: Wed, 29 May 2019 23:20:05 +0200 [thread overview]
Message-ID: <20190529212005.tqbOm__vTaIjNYEgiIvMsXRFHKcnKznTDu5yWMDzm1k@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12016@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org kdiff3
https://github.com/void-linux/void-packages/pull/12016
[WIP] kdiff3: update to 1.8.1.
A patch file from https://github.com/void-linux/void-packages/pull/12016.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kdiff3-12016.patch --]
[-- Type: application/text/x-diff, Size: 1658 bytes --]
From 5ea20d4510ae34ef4af16cd89dfea8b7772c3db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 May 2019 22:30:38 +0200
Subject: [PATCH] kdiff3: update to 1.8.1.
---
srcpkgs/kdiff3/template | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template
index a560ef38d6a..0733c016e0d 100644
--- a/srcpkgs/kdiff3/template
+++ b/srcpkgs/kdiff3/template
@@ -1,21 +1,19 @@
# Template file for 'kdiff3'
pkgname=kdiff3
-version=0.9.98
-revision=2
-build_wrksrc=src-QT4
-build_style=qmake
-makedepends="qt5-devel"
+version=1.8.1
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kcoreaddons kdoctools
+ qt5-host-tools qt5-qmake"
+makedepends="kparts-devel qt5-devel"
short_desc="File comparator/merge tool"
maintainer="Ben Sung Hsu <pobetiger+kdiff3@gmail.com>"
license="GPL-2.0-or-later"
-homepage="http://kdiff3.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/kdiff3/kdiff3-${version}.tar.gz"
-checksum=802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
+homepage="https://kde.org/applications/development/kdiff3"
+distfiles="${KDE_SITE}/kdiff3/kdiff3-${version}.tar.xz"
+checksum=7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-devel qt5-host-tools"
-fi
-
-pre_install() {
- vsed -i 's@usr\/local@usr@g' Makefile
-}
+case "$XBPS_TARGET_MACHINE" in
+ armv6*-musl) CXXFLAGS+=" -latomic";;
+ armv6*) broken="static assertion failed: template parameter is an integral of a size not supported on this platform";;
+esac
next prev parent reply other threads:[~2019-05-29 21:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12016@inbox.vuxu.org>
2019-05-29 21:20 ` voidlinux-github
2019-05-29 21:20 ` voidlinux-github [this message]
2019-05-30 19:41 ` voidlinux-github
2019-05-31 21:57 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190529212005.tqbOm__vTaIjNYEgiIvMsXRFHKcnKznTDu5yWMDzm1k@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).