From nobody Sun Apr 16 06:32:34 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzgN33Qz8z44jv5; Sun, 16 Apr 2023 06:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzgN26wN4z3qfH; Sun, 16 Apr 2023 06:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681626755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yf4n0w+7tAQp9HwpL+K9sYvlLehcgxTK247LOelQCzo=; b=drFR4G3rnWL2D8KBctPek2BNgLRqyCw/fy81mGKM6vCQYDWVVpd1NsussqYAPpmR5KWHFg eBrJDT1AxjxWzdv4hK3yxGVbWaHwrU6XOPV1BZTIbKm0dF9Yrr0jE3ghv5Xmlv5VH3PZyz 8EXaqmhqeKlrSpqSGTBpjzaxolPPpRmjmMWuJS+z5kDAcF8HQpTfbkdtSITCb6NEbeKzfc mkKFJkuxXbkd0ss1ZgM1SE3YdxOrnlOS/PQgb2aueQz8o0uQji22HUwXnHF0GvXrmqdoS6 9NDDxpRQlMDCjgOdOb6asHt4KkKYfkjkEsIA4OeFemcFoNc5iBVl32skYVFPig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681626755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yf4n0w+7tAQp9HwpL+K9sYvlLehcgxTK247LOelQCzo=; b=I+lyO5nKmODlDlWyxPrH6OAf7LB22QMINjOjK+VpiAy6Pdr8Uq7kPfMW4fOlU6xdfh3c80 WbwEI8Yd4sal3MLLgHCBGao1ixBcICiyCV6N7KKzU6e9mPqsqo6CULkanlHK7XRSmCeKNI VNUZR9VDRM4uSmo49NxnfC3pAwYmUpnoDfj2/2tTDJpwXGDwbJVbbc4lmRfvI6UPZIFc6Y r9Idqo2yxeDvczN7zG1enzE1SmD6zyZJZOi64j0WYjSLhJYH9yQKz+2kq+1wjo6bVu7vwh wf2mYxP4pkicPOW8kOa3ig0zm9VPZv8zHGtjnw8j4HNcSij8dvBKjBvIQXqGqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681626755; a=rsa-sha256; cv=none; b=CSnZTWV23M7sl0lUH4cOeRiqaYPkwqQ8aamGUQDjcfb7vttKEDJXCEBhcWaiVna+qEsXVE lC1zIyTRpUZw0zHqCR0EP/KQdkcmuqwMHfbF0P0vZNuDaNJ7n5cMcaxelz0uI39dNPIrPK bytoyfTGcxR50HAF1zKLCHneqEFdKdmvYhFnZmdTO3MuMLPkGQfQ1swUpsrAZRFzsdPyQD CTJHdBIZAceyBJLEmxHuRPMOCky6Y1IX025fa4canmnLDEBvkW9yyWRZ2Sc9RcHT1NNw+2 2gg6WZNjsUNUQyZAata6PzpYk74XtzIj5Gpc6SQbGs3zchvPnv+iGKfDIeooBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzgN260BVzd2X; Sun, 16 Apr 2023 06:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33G6WYTR092421; Sun, 16 Apr 2023 06:32:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G6WYkF092420; Sun, 16 Apr 2023 06:32:34 GMT (envelope-from git) Date: Sun, 16 Apr 2023 06:32:34 GMT Message-Id: <202304160632.33G6WYkF092420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 82d99dea8625 - main - textproc/kdiff3: update to 1.10.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82d99dea86250c59277b77e49cf1c25c41d752ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=82d99dea86250c59277b77e49cf1c25c41d752ee commit 82d99dea86250c59277b77e49cf1c25c41d752ee Author: Tobias C. Berner AuthorDate: 2023-04-16 06:31:38 +0000 Commit: Tobias C. Berner 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.