From nobody Tue Sep 16 13:44:03 2025 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 4cR35w1N2lz67H8h; Tue, 16 Sep 2025 13:44:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR35v61GFz3Tdw; Tue, 16 Sep 2025 13:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758030243; 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=hCvEJ/scsui0C3xI+BhJ8ifrrNOb8cEi/gMTuijwnFQ=; b=FjNA/cxUwygm6u/SVL7WWKTv3qiRh5Apqbq6gVZtq7jyrzKFp31K3JgyVf3FRFyNnQOP4j qGcVcmrAKy7iv1hK248pRMX5rkkdKo/FhJWNK5KEYVVH72mmuVB6Fv8ErTOdV98HqM9naj iROCHiUcDxtLeeBo52qK9yUoA/LPj8LgMNfAWzKe7oXPc8s15JdFwOJr7p48YR8ySqgg2P 4Rtr3kVPIgkmfY3WfjwKrT0RdYYX6D0mHTF6JtSXMkMloWOsERHnzTTuDNlXP6rZ0E7Rqm 71gYQfhU/UEkMP1A9OOMjrNnzxgI7mtQelSpE6t60/UuFm6IYFi17UDnV/z4MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758030243; 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=hCvEJ/scsui0C3xI+BhJ8ifrrNOb8cEi/gMTuijwnFQ=; b=Wjf8eBZQ2UOF10BiwDeJCbdRSXfGlMgYS+Y24m4iGDtSBVcd1jW3LAZKIBux9YBhJJVow1 bqna1QLVtTBwsJFCOijVwK8Sot6eAnAqapX0vIiJcoPBASpT1XlIJtZlH5777gKwm4AdpI Bi6i8zVDTE8DKqKXszOaDlRPqzV+XzOGgDq3tv5hWCi9SReFjt2+2jdiVzYYLh22kdq+vv OKZIWJoB+U70fX4txRIF6pI+S/TZP8wWEFi1EQtP7rUZMDuq+P1TpTEI582XEjo1fjK4DU w9cvk7ssEobSFWwrTkAO3DZVZi1e6o2sKG00wUI5Ca45f6fNtYjQA+aghNXtmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758030243; a=rsa-sha256; cv=none; b=PUnmigU+uD9IBZUswVTI1ECYPlymY+lMgK4s2t8jVSEf6lrLHtVcTIUhMLiz4GVze4FXiL 0Zq1i84ElZhFdo62Ru04AYDvNmbZ5MFSk0HjE97VnTXxtszUUIgDJFgBc3hy5tDlskidum 8lcyLjCYlaRSg7ibom7IwA9i/v7H+oTIPaYXdARZJVeA1ojvmtPP8bpwM0nN60l86YPnjZ uLs77VEJiH60HMmt5EzBP/DMhXGEFoKyhtw7LFN0aRRVdhTQVEjd67xgxAyZ3frUCoFZ8Q ZnYBzC4ZlQQb3xIwJ/NbmXPaK8CEBJ+WxDfK18F2x3wZDqaJyo9K6zRn9bnYlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR35v5Zcpzjq0; Tue, 16 Sep 2025 13:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDi34f043125; Tue, 16 Sep 2025 13:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDi3Q5043122; Tue, 16 Sep 2025 13:44:03 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:44:03 GMT Message-Id: <202509161344.58GDi3Q5043122@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: 4cbdaf82ef44 - main - x11/coreterminal: Update to 5.0.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cbdaf82ef446ae6f5a64bb713840258515f8803 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cbdaf82ef446ae6f5a64bb713840258515f8803 commit 4cbdaf82ef446ae6f5a64bb713840258515f8803 Author: Jason W. Bacon AuthorDate: 2025-09-16 13:42:28 +0000 Commit: Jason W. Bacon CommitDate: 2025-09-16 13:42:28 +0000 x11/coreterminal: Update to 5.0.0 Switch to Qt6 Changes: https://gitlab.com/cubocore/coreapps/coreterminal/-/commits/master --- x11/coreterminal/Makefile | 19 +++++++++-------- x11/coreterminal/distinfo | 6 +++--- x11/coreterminal/files/patch-coreterminal.cpp | 20 ------------------ x11/coreterminal/files/patch-settings.cpp | 23 --------------------- x11/coreterminal/files/patch-src_coreterminal.cpp | 20 ++++++++++++++++++ x11/coreterminal/files/patch-src_settings.cpp | 25 +++++++++++++++++++++++ 6 files changed, 58 insertions(+), 55 deletions(-) diff --git a/x11/coreterminal/Makefile b/x11/coreterminal/Makefile index d52440e5e0a0..b2ccdbee8716 100644 --- a/x11/coreterminal/Makefile +++ b/x11/coreterminal/Makefile @@ -1,5 +1,5 @@ PORTNAME= coreterminal -DISTVERSION= 4.5.0 +DISTVERSION= 5.0.0 CATEGORIES= x11 MAINTAINER= jwb@FreeBSD.org @@ -9,24 +9,25 @@ WWW= https://gitlab.com/cubocore/coreterminal LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libqtermwidget5.so:x11-toolkits/qtermwidget-qt5 \ - libcprime-core.so:deskutils/libcprime +LIB_DEPENDS= libqtermwidget6.so:x11-toolkits/qtermwidget \ + libcprime-widgets.so:deskutils/libcprime RUN_DEPENDS= coregarage:deskutils/coregarage -USES= cmake desktop-file-utils localbase:ldflags qt:5 -USE_QT= buildtools:build core gui qmake:build serialport widgets +USES= cmake desktop-file-utils gl localbase:ldflags qt:6 +USE_GL= gl +USE_QT= base serialport tools:build USE_GITLAB= yes GL_ACCOUNT= CuboCore -GL_TAGNAME= a04d47537f2d01d1742d11dd4d28adc401a19a0c +GL_TAGNAME= v5.0.0 PLIST_FILES= bin/coreterminal \ - share/applications/org.cubocore.CoreTerminal.desktop \ - share/icons/hicolor/scalable/apps/org.cubocore.CoreTerminal.svg + share/applications/cc.cubocore.CoreTerminal.desktop \ + share/icons/hicolor/scalable/apps/cc.cubocore.CoreTerminal.svg pre-configure: @${REINPLACE_CMD} \ -e 's|/usr/bin/coreterminal|${PREFIX}/bin/coreterminal|g' \ - ${WRKSRC}/org.cubocore.CoreTerminal.desktop + ${WRKSRC}/cc.cubocore.CoreTerminal.desktop .include diff --git a/x11/coreterminal/distinfo b/x11/coreterminal/distinfo index 436fbad376c6..c776bd3e2d22 100644 --- a/x11/coreterminal/distinfo +++ b/x11/coreterminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730204631 -SHA256 (CuboCore-coreterminal-a04d47537f2d01d1742d11dd4d28adc401a19a0c_GL0.tar.gz) = c83f83f043ce53d7e38f3dc4a0d87686867d49c248ada7abd9f89453bdcd17e1 -SIZE (CuboCore-coreterminal-a04d47537f2d01d1742d11dd4d28adc401a19a0c_GL0.tar.gz) = 74484 +TIMESTAMP = 1757765480 +SHA256 (coreterminal-v5.0.0.tar.bz2) = 1662ff79ccf78a6b54a07ac12790e2ca206853ec15f85ab9bddd8e46885c552c +SIZE (coreterminal-v5.0.0.tar.bz2) = 74549 diff --git a/x11/coreterminal/files/patch-coreterminal.cpp b/x11/coreterminal/files/patch-coreterminal.cpp deleted file mode 100644 index b13707825b91..000000000000 --- a/x11/coreterminal/files/patch-coreterminal.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- coreterminal.cpp.orig 2022-06-05 22:56:33 UTC -+++ coreterminal.cpp -@@ -55,7 +55,7 @@ CoreTerminal::CoreTerminal(settings *s, QWidget *paren - : QMainWindow(parent) - , uiMode(0) - , mRows(30) -- , mCols(120) -+ , mCols(80) - , smi(s) - { - createGUI(); -@@ -86,7 +86,7 @@ void CoreTerminal::loadSettings() - { - uiMode = smi->getValue("CoreApps", "UIMode"); - mRows = smi->getValue("CoreTerminal", "Rows", 30); -- mCols = smi->getValue("CoreTerminal", "Columns", 120); -+ mCols = smi->getValue("CoreTerminal", "Columns", 80); - - QFont terminalFont = smi->getValue("CoreTerminal", "Font"); - diff --git a/x11/coreterminal/files/patch-settings.cpp b/x11/coreterminal/files/patch-settings.cpp deleted file mode 100644 index 47da1a755ab8..000000000000 --- a/x11/coreterminal/files/patch-settings.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- settings.cpp.orig 2024-10-29 12:23:05 UTC -+++ settings.cpp -@@ -137,9 +137,9 @@ void settings::setAppDefaultSettings(QSettings &settin - // Add system font to CoreTerminal - QFont monoFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); - if ( not monoFont.family().count() ) { -- monoFont = QFont("monospace", 9);} -+ monoFont = QFont("monospace", 12);} - if (monoFont.styleHint() != QFont::Monospace) { -- monoFont = QFont("monospace", 9);} -+ monoFont = QFont("monospace", 12);} - - struct passwd *pwent; - pwent = getpwuid(getuid()); -@@ -182,7 +182,7 @@ void settings::setAppDefaultSettings(QSettings &settin - - // Check if "CoreTerminal/Columns" exists - if (!settings.contains("CoreTerminal/Columns")) { -- settings.setValue("CoreTerminal/Columns", 120);} -+ settings.setValue("CoreTerminal/Columns", 80);} - - cSetting->sync(); - } diff --git a/x11/coreterminal/files/patch-src_coreterminal.cpp b/x11/coreterminal/files/patch-src_coreterminal.cpp new file mode 100644 index 000000000000..fcbaeba69bd6 --- /dev/null +++ b/x11/coreterminal/files/patch-src_coreterminal.cpp @@ -0,0 +1,20 @@ +--- src/coreterminal.cpp.orig 2025-09-13 12:09:34 UTC ++++ src/coreterminal.cpp +@@ -48,7 +48,7 @@ CoreTerminal::CoreTerminal(settings *s, QWidget *paren + : QMainWindow(parent) + , uiMode(0) + , mRows(30) +- , mCols(120) ++ , mCols(80) + , smi(s) + { + createGUI(); +@@ -82,7 +82,7 @@ void CoreTerminal::loadSettings() + // get app's settings + windowMaximized = smi->getValue("CoreTerminal", "WindowMaximized"); + mRows = smi->getValue("CoreTerminal", "Rows", 30); +- mCols = smi->getValue("CoreTerminal", "Columns", 120); ++ mCols = smi->getValue("CoreTerminal", "Columns", 80); + + QFont tFont = smi->getValue("CoreTerminal", "Font"); + fm = new QFontMetrics(tFont); diff --git a/x11/coreterminal/files/patch-src_settings.cpp b/x11/coreterminal/files/patch-src_settings.cpp new file mode 100644 index 000000000000..5017497d6a5a --- /dev/null +++ b/x11/coreterminal/files/patch-src_settings.cpp @@ -0,0 +1,25 @@ +--- src/settings.cpp.orig 2024-12-30 17:49:40 UTC ++++ src/settings.cpp +@@ -129,11 +129,11 @@ void settings::setAppDefaultSettings(QSettings& settin + // Add system font to CoreTerminal + QFont monoFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); + if (not monoFont.family().length()) { +- monoFont = QFont("monospace", 9); ++ monoFont = QFont("monospace", 12); + } + + if (monoFont.styleHint() != QFont::Monospace) { +- monoFont = QFont("monospace", 9); ++ monoFont = QFont("monospace", 12); + } + + struct passwd* pwent; +@@ -186,7 +186,7 @@ void settings::setAppDefaultSettings(QSettings& settin + + // Check if "CoreTerminal/Columns" exists + if (!settings.contains("CoreTerminal/Columns")) { +- settings.setValue("CoreTerminal/Columns", 120); ++ settings.setValue("CoreTerminal/Columns", 80); + } + + cSetting->sync();