From owner-svn-ports-all@freebsd.org Tue Jun 25 16:22:23 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60E8815D0BF6; Tue, 25 Jun 2019 16:22:23 +0000 (UTC) (envelope-from danfe@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02FAD6AE5C; Tue, 25 Jun 2019 16:22:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D44541AE42; Tue, 25 Jun 2019 16:22:22 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5PGMMTC082890; Tue, 25 Jun 2019 16:22:22 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5PGMLc7082884; Tue, 25 Jun 2019 16:22:21 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201906251622.x5PGMLc7082884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 25 Jun 2019 16:22:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505098 - in head/x11/cool-retro-term: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/cool-retro-term: . files X-SVN-Commit-Revision: 505098 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 02FAD6AE5C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2019 16:22:23 -0000 Author: danfe Date: Tue Jun 25 16:22:21 2019 New Revision: 505098 URL: https://svnweb.freebsd.org/changeset/ports/505098 Log: - Update to version 1.1.1, install manual page - Add run-time dependency on sql-sqlite3 to enable save/restore of profile and other settings [*] - Fix some stage Q/A warnings while here Reported by: Lundin Cahill [*] Added: head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp (contents, props changed) Modified: head/x11/cool-retro-term/Makefile head/x11/cool-retro-term/distinfo head/x11/cool-retro-term/files/patch-lib_kpty.cpp head/x11/cool-retro-term/pkg-plist Modified: head/x11/cool-retro-term/Makefile ============================================================================== --- head/x11/cool-retro-term/Makefile Tue Jun 25 16:16:31 2019 (r505097) +++ head/x11/cool-retro-term/Makefile Tue Jun 25 16:22:21 2019 (r505098) @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= cool-retro-term -PORTVERSION= 1.0.0 -PORTREVISION= 7 -DISTVERSIONPREFIX= v +PORTVERSION= 1.1.1 CATEGORIES= x11 MAINTAINER= danfe@FreeBSD.org @@ -15,11 +13,13 @@ 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 @@ -33,7 +33,7 @@ CPP= clang-cpp 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:,,' \ @@ -42,5 +42,9 @@ post-patch: ${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 Modified: head/x11/cool-retro-term/distinfo ============================================================================== --- head/x11/cool-retro-term/distinfo Tue Jun 25 16:16:31 2019 (r505097) +++ head/x11/cool-retro-term/distinfo Tue Jun 25 16:22:21 2019 (r505098) @@ -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 Added: head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/cool-retro-term/files/patch-lib_Vt102Emulation.cpp Tue Jun 25 16:22:21 2019 (r505098) @@ -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); Modified: head/x11/cool-retro-term/files/patch-lib_kpty.cpp ============================================================================== --- head/x11/cool-retro-term/files/patch-lib_kpty.cpp Tue Jun 25 16:16:31 2019 (r505097) +++ head/x11/cool-retro-term/files/patch-lib_kpty.cpp Tue Jun 25 16:22:21 2019 (r505098) @@ -3,7 +3,7 @@ @@ -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 @@ -21,15 +21,6 @@ # 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 @@ -48,12 +39,3 @@ 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; Modified: head/x11/cool-retro-term/pkg-plist ============================================================================== --- head/x11/cool-retro-term/pkg-plist Tue Jun 25 16:16:31 2019 (r505097) +++ head/x11/cool-retro-term/pkg-plist Tue Jun 25 16:22:21 2019 (r505098) @@ -3,11 +3,15 @@ bin/cool-retro-term %%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 @@ -30,13 +34,13 @@ bin/cool-retro-term %%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