Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Apr 2023 06:32:34 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 82d99dea8625 - main - textproc/kdiff3: update to 1.10.1
Message-ID:  <202304160632.33G6WYkF092420@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82d99dea86250c59277b77e49cf1c25c41d752ee

commit 82d99dea86250c59277b77e49cf1c25c41d752ee
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-04-16 06:31:38 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-04-16 06:31:38 +0000

    textproc/kdiff3: update to 1.10.1
    
    Version 1.10.1 - 2023
    ===========================
     * 467652 - "Escape" shortcut ignored if merge output in focus
     * 466522 - save and restore dock states
     * 439148 - Show UI before comparison start
     * 466241 - Don't crash on broken links
     * 466524 - Fix memory safety issues during reload.
     * Fix mishandling line count for files containing '0x0b'
---
 textproc/kdiff3/Makefile                   |  2 +-
 textproc/kdiff3/distinfo                   |  6 +++---
 textproc/kdiff3/files/patch-CMakeLists.txt | 11 -----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 2d91bb4efb80..b228de3c0d12 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	kdiff3
-DISTVERSION=	1.10.0
+DISTVERSION=	1.10.1
 CATEGORIES=	textproc kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index 8f777f268e0c..fe26fe93ba65 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673373292
-SHA256 (kdiff3-1.10.0.tar.xz) = acddb30b8a067e17477105bcdf67d75ff8bdd1b1f0ebd840063b841067252eae
-SIZE (kdiff3-1.10.0.tar.xz) = 1074824
+TIMESTAMP = 1681625464
+SHA256 (kdiff3-1.10.1.tar.xz) = 205434930f67536c20519162af7ddf435846e2a1a125d7a0986f4ce27f9b33c8
+SIZE (kdiff3-1.10.1.tar.xz) = 1111276
diff --git a/textproc/kdiff3/files/patch-CMakeLists.txt b/textproc/kdiff3/files/patch-CMakeLists.txt
deleted file mode 100644
index ee79e462d35b..000000000000
--- a/textproc/kdiff3/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2023-01-11 06:42:35 UTC
-+++ CMakeLists.txt
-@@ -48,7 +48,7 @@ include(ECMOptionalAddSubdirectory)
- include(ECMAddTests)
- include(ECMOptionalAddSubdirectory)
- 
--ecm_setup_version(1.9.70 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h)
-+ecm_setup_version(1.10.0 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h)
- 
- # Some older versions on boost contain a bug that prevents compiling gcc offers a built-in workaround
- # but that isn't enough to ship as clang has no such workaround. 1.65 is known to be affected.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304160632.33G6WYkF092420>