git: 0eefb94230da - main - textproc/kdiff3: Fix crash upon exit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Sep 2023 19:27:32 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0eefb94230da5041b16936e22e73d549c95da1f8
commit 0eefb94230da5041b16936e22e73d549c95da1f8
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-09-26 19:15:43 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-09-26 19:26:57 +0000
textproc/kdiff3: Fix crash upon exit
Add a few upstream patches to fix crashes upon application exit.
While here, drop a few unused KF5 components.
PR: 273031
Reported by: emaste
---
textproc/kdiff3/Makefile | 12 ++++++++----
textproc/kdiff3/distinfo | 6 +++++-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 01561ee2cfd3..e264d0788d4d 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -1,8 +1,13 @@
PORTNAME= kdiff3
DISTVERSION= 1.10.5
+PORTREVISION= 1
CATEGORIES= textproc kde
MASTER_SITES= KDE/stable/${PORTNAME}
+PATCH_SITES= https://github.com/KDE/${PORTNAME}/commit/
+PATCHFILES+= 2642a7e71cfdf7ef95c1c07c7ccea3930c11cc48.patch:-p1
+PATCHFILES+= 341bb0322026053400def3aa7f46e1ac171d0fc5.patch:-p1
+
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE graphical frontend for diff
WWW= http://kdiff3.sourceforge.net/
@@ -13,10 +18,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs
USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg
-USE_KDE= auth bookmarks codecs completion config configwidgets \
- coreaddons crash i18n iconthemes jobwidgets kio \
- parts service solid sonnet textwidgets widgetsaddons windowsystem \
- xmlgui \
+USE_KDE= auth codecs completion config configwidgets coreaddons \
+ crash i18n jobwidgets kio parts service solid sonnet \
+ textwidgets widgetsaddons windowsystem xmlgui \
doctools:build ecm:build
USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools:build qmake:build
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index d6f9c92f48b6..12c1efe6e68b 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1689519144
+TIMESTAMP = 1695752915
SHA256 (kdiff3-1.10.5.tar.xz) = db0326d248411a7a9ac41301c7ff0ef3779cbf040a330ff28500ddc2d4f18c8c
SIZE (kdiff3-1.10.5.tar.xz) = 1119712
+SHA256 (2642a7e71cfdf7ef95c1c07c7ccea3930c11cc48.patch) = dfbf92b5ffbab534a774ba8514f6cda3317e868d7963d2e96066b7f97c226871
+SIZE (2642a7e71cfdf7ef95c1c07c7ccea3930c11cc48.patch) = 1861
+SHA256 (341bb0322026053400def3aa7f46e1ac171d0fc5.patch) = 48dbd1835dc3fe5a6fd6bc289d4cbf61ddef631772afc3cade8a27c8ce2e27fb
+SIZE (341bb0322026053400def3aa7f46e1ac171d0fc5.patch) = 2761