wip/cool-retro-term: Update from 1.1.1 to 1.2.0

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Wed Mar 2 13:32:52 2022 +1100
Changeset:	9d57984089348fd48483c4559c2c6204b0993f25

Modified Files:
	cool-retro-term-git/Makefile
	cool-retro-term-git/PLIST
	cool-retro-term-git/distinfo
Added Files:
	cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp
Removed Files:
	cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty_cpp

Log Message:
wip/cool-retro-term: Update from 1.1.1 to 1.2.0

Release notes:
- Migrated QtQuickControls from 1.x to 2.x
- Fixed a lot of issues with MacOS build
- Added support for blinking cursor
- Added sub-pixel rasteration
- Updated qtermwidget engine
- Updated many fonts to the latest version

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d57984089348fd48483c4559c2c6204b0993f25

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cool-retro-term-git/Makefile                       | 10 ++++----
 cool-retro-term-git/PLIST                          |  8 +++----
 cool-retro-term-git/distinfo                       |  2 +-
 .../patches/patch-qmltermwidget_lib_kpty.cpp       | 17 +++++++++++++
 .../patches/patch-qmltermwidget_lib_kpty_cpp       | 28 ----------------------
 5 files changed, 27 insertions(+), 38 deletions(-)

diffs:
diff --git a/cool-retro-term-git/Makefile b/cool-retro-term-git/Makefile
index 6a7200ebf7..6ad65b4c9f 100644
--- a/cool-retro-term-git/Makefile
+++ b/cool-retro-term-git/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
-PKGNAME=		cool-retro-term-1.1.1
+PKGVERSION=		1.2.0
+PKGNAME=		cool-retro-term-${PKGVERSION}
 CATEGORIES=		x11
 
 MAINTAINER=		stix%stix.id.au@localhost
@@ -10,7 +11,7 @@ LICENSE=		gnu-gpl-v3
 
 # For non-pkgsrc/wip:
 # MASTER_SITES=		${MASTER_SITE_GITHUB:=Swordfish90/}
-# TERM_TAG=		1.1.1
+# TERM_TAG=		${PKGVERSION}
 # QMLTERMWIDGET_TAG=	0.2.0
 # DISTFILES+=		${TERM_TAG}.tar.gz
 # DISTFILES+=		${QMLTERMWIDGET_TAG}.tar.gz
@@ -22,10 +23,9 @@ LICENSE=		gnu-gpl-v3
 # WRKSRC=		${WRKDIR}/cool-retro-term-${TERM_TAG}
 
 # For pkgsrc/wip:
-PKGREVISION=			1
 GIT_REPOSITORIES=		cool-retro-term
 GIT_REPO.cool-retro-term=	https://github.com/Swordfish90/cool-retro-term.git
-GIT_TAG.cool-retro-term=	1.1.1
+GIT_TAG.cool-retro-term=	${PKGVERSION}
 WRKSRC=				${WRKDIR}/cool-retro-term
 
 SUBST_CLASSES+=		usrpath
@@ -51,7 +51,7 @@ do-configure:
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
-.include "../../x11/qt5-qtquickcontrols/buildlink3.mk"
+.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cool-retro-term-git/PLIST b/cool-retro-term-git/PLIST
index 70095788e9..cf58739577 100644
--- a/cool-retro-term-git/PLIST
+++ b/cool-retro-term-git/PLIST
@@ -1,9 +1,9 @@
 @comment $NetBSD$
 bin/cool-retro-term
 qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
-qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.schema
+qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.schema
+qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
@@ -12,8 +12,8 @@ qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.schema
-qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.schema
+qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.colorscheme
 qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
 qt5/qml/QMLTermWidget/color-schemes/historic/DarkPicture.schema
 qt5/qml/QMLTermWidget/color-schemes/historic/Example.Schema
diff --git a/cool-retro-term-git/distinfo b/cool-retro-term-git/distinfo
index b9ecf1010c..94ba577704 100644
--- a/cool-retro-term-git/distinfo
+++ b/cool-retro-term-git/distinfo
@@ -1 +1 @@
-SHA1 (patch-qmltermwidget_lib_kpty_cpp) = 8d7e71c0212441b7a61d701ce9f2eb7abc41625f
+SHA1 (patch-qmltermwidget_lib_kpty.cpp) = 583d9718f0902e244ced73f6ee04145313e552ed
diff --git a/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp b/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp
new file mode 100644
index 0000000000..676617b368
--- /dev/null
+++ b/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Switch NetBSD from pty to pts terminal ops.
+
+--- qmltermwidget/lib/kpty.cpp.orig	2022-03-02 01:05:10.815701940 +0000
++++ qmltermwidget/lib/kpty.cpp
+@@ -39,7 +39,9 @@
+ #if defined(__NetBSD__)
+ #define HAVE_LOGIN
+ #define HAVE_UTIL_H
+-#define HAVE_OPENPTY
++#define HAVE_PTSNAME
++#define HAVE_UNLOCKPT
++#define HAVE_GRANTPT
+ #endif
+ 
+ #if defined(__APPLE__)
diff --git a/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty_cpp b/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty_cpp
deleted file mode 100644
index 8578a5038e..0000000000
--- a/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty_cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Fix terminal handling for handling for NetBSD.
-TODO: fix upstream.
-
---- qmltermwidget/lib/kpty.cpp.orig	2018-11-25 08:06:16.000000000 +1100
-+++ qmltermwidget/lib/kpty.cpp	2020-07-21 12:19:27.296908414 +1000
-@@ -27,11 +27,19 @@
- #include <QtDebug>
- 
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #define HAVE_LOGIN
- #define HAVE_LIBUTIL_H
- #endif
- 
-+#if defined(__NetBSD__)
-+#define HAVE_LOGIN
-+#define HAVE_UTIL_H
-+#define HAVE_PTSNAME
-+#define HAVE_UNLOCKPT
-+#define HAVE_GRANTPT
-+#endif
-+
- #if defined(__OpenBSD__)
- #define HAVE_LOGIN
- #define HAVE_UTIL_H