From owner-dev-commits-ports-main@freebsd.org Mon Aug 30 10:36:52 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7D75D6744CC; Mon, 30 Aug 2021 10:36:52 +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 4Gymw43913z4ZSx; Mon, 30 Aug 2021 10:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 508A81C33F; Mon, 30 Aug 2021 10:36:52 +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 17UAaqSZ062326; Mon, 30 Aug 2021 10:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17UAaqNP062325; Mon, 30 Aug 2021 10:36:52 GMT (envelope-from git) Date: Mon, 30 Aug 2021 10:36:52 GMT Message-Id: <202108301036.17UAaqNP062325@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 3e0e47becc96 - main - textproc/kdiff3: update to latest release, 1.9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e0e47becc96fd33151c453fb9927b431723aa58 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2021 10:36:52 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e0e47becc96fd33151c453fb9927b431723aa58 commit 3e0e47becc96fd33151c453fb9927b431723aa58 Author: Adriaan de Groot AuthorDate: 2021-08-28 20:57:44 +0000 Commit: Adriaan de Groot CommitDate: 2021-08-30 10:36:49 +0000 textproc/kdiff3: update to latest release, 1.9.3 There do not seem to be release notes. Looking at commits, there is a handful of bug-fixes (including one to deal with the bug we previously had patched in ports). --- textproc/kdiff3/Makefile | 9 ++-- textproc/kdiff3/distinfo | 6 +-- .../kdiff3/files/patch-src_mergeresultwindow.cpp | 50 ---------------------- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 2bd43a3078f0..33f59e9d3881 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -1,6 +1,5 @@ PORTNAME= kdiff3 -DISTVERSION= 1.9.2 -PORTREVISION= 2 +DISTVERSION= 1.9.3 CATEGORIES= textproc kde MASTER_SITES= KDE/stable/${PORTNAME} @@ -14,10 +13,10 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ - coreaddons crash ecm i18n iconthemes jobwidgets kio \ - parts service sonnet textwidgets widgetsaddons windowsystem \ + coreaddons crash i18n iconthemes jobwidgets kio \ + parts service solid sonnet textwidgets widgetsaddons windowsystem \ xmlgui \ - doctools_build + 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 5ae5dc3e8ac5..d4dab6cae027 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621514687 -SHA256 (kdiff3-1.9.2.tar.xz) = f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805 -SIZE (kdiff3-1.9.2.tar.xz) = 1053404 +TIMESTAMP = 1630183188 +SHA256 (kdiff3-1.9.3.tar.xz) = 317bf5c7e27cba81bce7e1a7a579105443133b633cbb71bc1f169e86a235af9c +SIZE (kdiff3-1.9.3.tar.xz) = 1056920 diff --git a/textproc/kdiff3/files/patch-src_mergeresultwindow.cpp b/textproc/kdiff3/files/patch-src_mergeresultwindow.cpp deleted file mode 100644 index 508fc50cc56f..000000000000 --- a/textproc/kdiff3/files/patch-src_mergeresultwindow.cpp +++ /dev/null @@ -1,50 +0,0 @@ -See https://invent.kde.org/sdk/kdiff3/-/merge_requests/31 - -When writing out files, don't treat removed lines as real lines, -and append a newline to the whole output file. ---- src/mergeresultwindow.cpp.orig 2021-05-17 17:26:58 UTC -+++ src/mergeresultwindow.cpp -@@ -2964,6 +2964,9 @@ bool MergeResultWindow::saveDocument(const QString& fi - textOutStream.setGenerateByteOrderMark(true); // Only for UTF-16 - textOutStream.setCodec(pEncoding); - -+ // Determine the line feed for this file -+ const QString lineFeed(eLineEndStyle == eLineEndStyleDos ? QString("\r\n") : QString("\n")); -+ - int line = 0; - MergeLineList::iterator mlIt = m_mergeLineList.begin(); - for(mlIt = m_mergeLineList.begin(); mlIt != m_mergeLineList.end(); ++mlIt) -@@ -2976,18 +2979,14 @@ bool MergeResultWindow::saveDocument(const QString& fi - - if(mel.isEditableText()) - { -- QString str = mel.getString(m_pldA, m_pldB, m_pldC); -+ const QString str = mel.getString(m_pldA, m_pldB, m_pldC); - -- if(line > 0) // Prepend line feed, but not for first line -+ if(line > 0 && !mel.isRemoved()) - { -- if(eLineEndStyle == eLineEndStyleDos) -- { -- str.prepend("\r\n"); -- } -- else -- { -- str.prepend("\n"); -- } -+ // Put line feed between lines, but not for the first line -+ // or between lines that have been removed (because there -+ // isn't a line there). -+ textOutStream << lineFeed; - } - - textOutStream << str; -@@ -2995,6 +2994,8 @@ bool MergeResultWindow::saveDocument(const QString& fi - } - } - } -+ // At the end of the stream, needs a newline -+ textOutStream << lineFeed; - textOutStream.flush(); - bool bSuccess = file.writeFile(dataArray.data(), dataArray.size()); - if(!bSuccess)