From nobody Tue Sep 26 19:27:32 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 4Rw8s100rhz4vYZh; Tue, 26 Sep 2023 19:27:33 +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 4Rw8s06g81z3PvB; Tue, 26 Sep 2023 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695756452; 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=xccgxGsVKV0pwEN32db7n2XjUyGcEyzVxvZBGpc2nHA=; b=cubFGBt3frC+2zKvkCaZK/L9i/OG01Ykprhc51SFBtwE0JRTKWByzhctKy+wMHB0Yx+kyA GnE6K0pD32g3QQitlItkEaPsJgZJHRAPudwhZ+DosFqTfQChKUGtF0N5jXHmEqJUvgBJPk ECfSYYGKSTgUDv4YpDEyC7l+ACp+BfvlYT5wpJKWFjMTiED6tdDQsK4adDBiIV4AtT18D9 cFIdkjhxHehkZkbcFnk74dC85UkJOO7PH5BSLDk1R3fD6+3jC3Kb4TSoKtnZ08x7KEF3GV PsPnZEuRab14cRRtYp0jp6fZtVLjhTM/VxQhMBIClDsMP5ir+bpBo1FCsW8/3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695756452; a=rsa-sha256; cv=none; b=WGRC5hqgT2xGKffnCLQ4r8gnxEAqEDhnnJyizTshTn6jR0F98JZBjaHE+iKwyJsj85Wd8N IHeOmy79dbeNQ2B6GzJ3VXdgXMSvMHd9PqzNgV+0BhrPncHt57U9rWAHpERd+tidMyyrn0 nml7Rq2VJIj4p5D3od64AV8DY1PlEldMeNXWIsr9k1lGDc0P+1P0+bVliyNGhXpWAOMqdF pVnxf1t5Uj9h/0W2RQmvnYHjOvobnmIfl+rJKRIbNyBsSur10FCPGwx+5fveUdnEQ/5YBu 73+HKNlpuyRDTFyuFgXkrYUwtiMu7HOBY0CUmUtcOsG/9mzdccDS0dMoPAtI/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695756452; 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=xccgxGsVKV0pwEN32db7n2XjUyGcEyzVxvZBGpc2nHA=; b=m5dpx1d8lIEHyWPoh/rUw2np/GT8c4bTN4Q0TNvfoqPmY7T8msF7Sxxe6xF0QDr7fC8oVG tjZ3ekLve/OvGP18ZgOhztlIkJhvQxjpeEXakQjqAw+qM0tgnCTU4fQ7pQb+t6AC/ZnZ0Z 72FnLCO43rXbqSTJGJWJAOed1ukoN4H/w2erxNRxWXbCXE/dig9p8xeTG9GxVqICgVfwv7 7/ZYSvLmMFTb8DaAnPp7bCW9LoHtZg6Zb0KWxWnIJjH6cxkHnpe6rnYXgUOlp03lUQ6ZAp i2Y1Q08896ipqBB/2Lid1KxFWQPX3Z+zx591KaHyxDuR3bKkbniyugiGGbO7QA== 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 4Rw8s05lNnz17mX; Tue, 26 Sep 2023 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38QJRWZe083741; Tue, 26 Sep 2023 19:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38QJRW5g083738; Tue, 26 Sep 2023 19:27:32 GMT (envelope-from git) Date: Tue, 26 Sep 2023 19:27:32 GMT Message-Id: <202309261927.38QJRW5g083738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 0eefb94230da - main - textproc/kdiff3: Fix crash upon exit 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eefb94230da5041b16936e22e73d549c95da1f8 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=0eefb94230da5041b16936e22e73d549c95da1f8 commit 0eefb94230da5041b16936e22e73d549c95da1f8 Author: Jason E. Hale AuthorDate: 2023-09-26 19:15:43 +0000 Commit: Jason E. Hale 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