git: 4cbdaf82ef44 - main - x11/coreterminal: Update to 5.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 16 Sep 2025 13:44:03 UTC
The branch main has been updated by jwb:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4cbdaf82ef446ae6f5a64bb713840258515f8803
commit 4cbdaf82ef446ae6f5a64bb713840258515f8803
Author: Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-09-16 13:42:28 +0000
Commit: Jason W. Bacon <jwb@FreeBSD.org>
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 <bsd.port.mk>
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();