Index: head/x11/cool-retro-term/Makefile =================================================================== --- head/x11/cool-retro-term/Makefile (revision 505097) +++ head/x11/cool-retro-term/Makefile (revision 505098) @@ -1,46 +1,50 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= cool-retro-term -PORTVERSION= 1.0.0 -PORTREVISION= 7 -DISTVERSIONPREFIX= v +PORTVERSION= 1.1.1 CATEGORIES= x11 MAINTAINER= danfe@FreeBSD.org COMMENT= Terminal emulator which mimics the old cathode display LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= Swordfish90 GH_PROJECT= qmltermwidget:qtw -GH_TAGNAME= v0.1.0:qtw +GH_TAGNAME= 0.2.0:qtw -USES= gmake desktop-file-utils qmake qt:5 -USE_QT= qmake_build buildtools_build core declarative gui widgets \ - graphicaleffects_run quickcontrols_run +USES= gmake gl qmake qt:5 +USE_GL= gl +USE_QT= qmake_build buildtools_build core declarative gui \ + network sql widgets graphicaleffects_run \ + quickcontrols_run sql-sqlite3_run .include .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 USE_GCC= yes .else CC= clang CXX= clang++ CPP= clang-cpp .endif post-extract: @${RMDIR} ${WRKSRC}/qmltermwidget - @${LN} -s ../qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget + @${LN} -s ../qmltermwidget-0.2.0 ${WRKSRC}/qmltermwidget post-patch: @${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \ ${WRKSRC}/qmltermwidget/qmltermwidget.pro @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${WRKSRC}/app/app.pro ${WRKSRC}/cool-retro-term.pro @${REINPLACE_CMD} -e 's,\.\./icons,/icons,' \ ${WRKSRC}/app/main.cpp + +post-install: + ${INSTALL_MAN} ${WRKSRC}/packaging/debian/cool-retro-term.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/x11/cool-retro-term/distinfo =================================================================== --- head/x11/cool-retro-term/distinfo (revision 505097) +++ head/x11/cool-retro-term/distinfo (revision 505098) @@ -1,4 +1,5 @@ -SHA256 (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9 -SIZE (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = 7809236 -SHA256 (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9 -SIZE (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 196864 +TIMESTAMP = 1547928537 +SHA256 (Swordfish90-cool-retro-term-1.1.1_GH0.tar.gz) = 1252bafa33c8befbb86528ed75db98677cdc1298704db728e326ffd258d5ed13 +SIZE (Swordfish90-cool-retro-term-1.1.1_GH0.tar.gz) = 1975853 +SHA256 (Swordfish90-qmltermwidget-0.2.0_GH0.tar.gz) = 23e19eedb59d6fe3e37ecc06872f54befd94384946926e009c42c4b39914cfe2 +SIZE (Swordfish90-qmltermwidget-0.2.0_GH0.tar.gz) = 219516 Index: head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp =================================================================== --- head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp (nonexistent) +++ head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp (revision 505098) @@ -0,0 +1,20 @@ +From 2233b6f998b2e8ca05761aaeefa59a77f3bf1b64 +From: Kent Engstrom +Date: Mon, 17 Jun 2019 11:15:17 +0200 +Subject: [PATCH] Refix CTRL+SPACE behaviour on QT5. + +As per discussion in Swordfish90/cool-retro-term issue #165, revert +later change back to the state after commit 490eeaf, "Fix CTRL+SPACE +behaviour on QT5." + +--- qmltermwidget/lib/Vt102Emulation.cpp.orig ++++ qmltermwidget/lib/Vt102Emulation.cpp +@@ -1230,7 +1230,7 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* origEvent ) + } + else if ( !entry.text().isEmpty() ) + { +- textToSend += _codec->fromUnicode(QString::fromUtf8(entry.text(true,modifiers))); ++ textToSend += entry.text(true,modifiers); + } + else if((modifiers & Qt::ControlModifier) && event->key() >= 0x40 && event->key() < 0x5f) { + textToSend += (event->key() & 0x1f); Property changes on: head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/cool-retro-term/files/patch-lib_kpty.cpp =================================================================== --- head/x11/cool-retro-term/files/patch-lib_kpty.cpp (revision 505097) +++ head/x11/cool-retro-term/files/patch-lib_kpty.cpp (revision 505098) @@ -1,59 +1,41 @@ --- qmltermwidget/lib/kpty.cpp.orig +++ qmltermwidget/lib/kpty.cpp @@ -28,7 +28,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -#define HAVE_LOGIN +//#define HAVE_LOGIN #define HAVE_LIBUTIL_H #endif @@ -84,9 +84,10 @@ extern "C" { # include } #else -# include # ifdef HAVE_UTMPX # include +# else +# include # endif # if !defined(_PATH_UTMPX) && defined(_UTMPX_FILE) # define _PATH_UTMPX _UTMPX_FILE -@@ -503,7 +504,7 @@ void KPty::login(const char * user, cons - // note: strncpy without terminators _is_ correct here. man 4 utmp - - if (user) { -- strncpy(l_struct.ut_name, user, sizeof(l_struct.ut_name)); -+ strncpy(l_struct.ut_user, user, sizeof(l_struct.ut_user)); - } - - if (remotehost) { @@ -550,7 +551,7 @@ void KPty::login(const char * user, cons # endif # endif # ifdef HAVE_UTMPX - utmpxname(_PATH_UTMPX); + //utmpxname(_PATH_UTMPX); setutxent(); pututxline(&l_struct); endutxent(); @@ -606,7 +607,7 @@ void KPty::logout() strncpy(l_struct.ut_line, str_ptr, sizeof(l_struct.ut_line)); # ifdef HAVE_UTMPX - utmpxname(_PATH_UTMPX); + //utmpxname(_PATH_UTMPX); setutxent(); if ((ut = getutxline(&l_struct))) { # else -@@ -614,7 +615,7 @@ void KPty::logout() - setutent(); - if ((ut = getutline(&l_struct))) { - # endif -- memset(ut->ut_name, 0, sizeof(*ut->ut_name)); -+ memset(ut->ut_user, 0, sizeof(*ut->ut_user)); - memset(ut->ut_host, 0, sizeof(*ut->ut_host)); - # ifdef HAVE_STRUCT_UTMP_UT_SYSLEN - ut->ut_syslen = 0; Index: head/x11/cool-retro-term/pkg-plist =================================================================== --- head/x11/cool-retro-term/pkg-plist (revision 505097) +++ head/x11/cool-retro-term/pkg-plist (revision 505098) @@ -1,44 +1,48 @@ bin/cool-retro-term %%QT_QMLDIR%%/QMLTermWidget/QMLTermScrollbar.qml %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnLightYellow.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme %%QT_QMLDIR%%/QMLTermWidget/color-schemes/BlackOnWhite.schema +%%QT_QMLDIR%%/QMLTermWidget/color-schemes/BreezeModified.colorscheme %%QT_QMLDIR%%/QMLTermWidget/color-schemes/DarkPastels.colorscheme %%QT_QMLDIR%%/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme %%QT_QMLDIR%%/QMLTermWidget/color-schemes/Linux.colorscheme +%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Solarized.colorscheme +%%QT_QMLDIR%%/QMLTermWidget/color-schemes/SolarizedLight.colorscheme +%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Tango.colorscheme +%%QT_QMLDIR%%/QMLTermWidget/color-schemes/Ubuntu.colorscheme %%QT_QMLDIR%%/QMLTermWidget/color-schemes/WhiteOnBlack.schema -%%QT_QMLDIR%%/QMLTermWidget/color-schemes/color-schemes.qrc %%QT_QMLDIR%%/QMLTermWidget/color-schemes/cool-retro-term.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/DarkPicture.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Example.Schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/GreenOnBlack.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/GreenTint.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/GreenTint_MC.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/LightPicture.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Linux.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/README.Schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/README.default.Schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Transparent.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Transparent_MC.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Transparent_darkbg.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/Transparent_lightbg.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/XTerm.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/syscolor.schema %%QT_QMLDIR%%/QMLTermWidget/color-schemes/historic/vim.schema %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/README %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/default.keytab %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/historic/vt100.keytab %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/historic/x11r5.keytab -%%QT_QMLDIR%%/QMLTermWidget/kb-layouts/kb-layouts.qrc %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/linux.keytab %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/macbook.keytab %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/solaris.keytab %%QT_QMLDIR%%/QMLTermWidget/kb-layouts/vt420pc.keytab %%QT_QMLDIR%%/QMLTermWidget/libqmltermwidget.so %%QT_QMLDIR%%/QMLTermWidget/qmldir +man/man1/cool-retro-term.1.gz share/applications/cool-retro-term.desktop share/icons/hicolor/128x128/apps/cool-retro-term.png share/icons/hicolor/256x256/apps/cool-retro-term.png share/icons/hicolor/32x32/apps/cool-retro-term.png share/icons/hicolor/64x64/apps/cool-retro-term.png