Received: by mail.netbsd.org (Postfix, from userid 605) id 884BC84D7C; Thu, 20 Feb 2020 05:47:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 10F8284D72 for ; Thu, 20 Feb 2020 05:47:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ls6_XCn7Kk5Q for ; Thu, 20 Feb 2020 05:47:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3203684CF1 for ; Thu, 20 Feb 2020 05:47:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 29B18FBF4; Thu, 20 Feb 2020 05:47:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1582177665262210" MIME-Version: 1.0 Date: Thu, 20 Feb 2020 05:47:45 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11 To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20200220054745.29B18FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1582177665262210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Thu Feb 20 05:47:45 UTC 2020 Modified Files: pkgsrc/x11: Makefile Added Files: pkgsrc/x11/qtermwidget: DESCR Makefile PLIST buildlink3.mk distinfo pkgsrc/x11/qtermwidget/patches: patch-lib_kpty.cpp Log Message: qtermwidget: import new package, version 0.14.1 This is a Qt5 terminal emulator widget for LXQt. Packaged in pkgsrc-wip by pin and myself, as part of a broader effort toward providing all of LXQt and associated utility applications. (Additional portability fix by myself on import to pkgsrc.) To generate a diff of this commit: cvs rdiff -u -r1.879 -r1.880 pkgsrc/x11/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qtermwidget/DESCR \ pkgsrc/x11/qtermwidget/Makefile pkgsrc/x11/qtermwidget/PLIST \ pkgsrc/x11/qtermwidget/buildlink3.mk pkgsrc/x11/qtermwidget/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1582177665262210 Content-Disposition: inline Content-Length: 8434 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/Makefile diff -u pkgsrc/x11/Makefile:1.879 pkgsrc/x11/Makefile:1.880 --- pkgsrc/x11/Makefile:1.879 Thu Feb 20 05:31:20 2020 +++ pkgsrc/x11/Makefile Thu Feb 20 05:47:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.879 2020/02/20 05:31:20 gutteridge Exp $ +# $NetBSD: Makefile,v 1.880 2020/02/20 05:47:44 gutteridge Exp $ # COMMENT= Packages to support the X window system @@ -377,6 +377,7 @@ SUBDIR+= qt5-qtwebsockets SUBDIR+= qt5-qtx11extras SUBDIR+= qt5-qtxmlpatterns SUBDIR+= qt5ct +SUBDIR+= qtermwidget SUBDIR+= qwt-qt4 SUBDIR+= qwt6-qt4 SUBDIR+= qwt6-qt5 Added files: Index: pkgsrc/x11/qtermwidget/DESCR diff -u /dev/null pkgsrc/x11/qtermwidget/DESCR:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/DESCR Thu Feb 20 05:47:44 2020 @@ -0,0 +1,7 @@ +A terminal emulator widget for Qt 5. +QTermWidget is an open-source project originally based on the +KDE4 Konsole application, but it took its own direction later on. +The main goal of this project is to provide a Unicode-enabled, +embeddable Qt widget for using as a built-in console +(or terminal emulation widget). +It is compatible with BSD, Linux and OS X. Index: pkgsrc/x11/qtermwidget/Makefile diff -u /dev/null pkgsrc/x11/qtermwidget/Makefile:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/Makefile Thu Feb 20 05:47:44 2020 @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ + +DISTNAME= qtermwidget-0.14.1 +CATEGORIES= x11 +MASTER_SITES= https://downloads.lxqt.org/downloads/qtermwidget/0.14.1/ +EXTRACT_SUFX= .tar.xz + +MAINTAINER= voidpin@protonmail.com +HOMEPAGE= https://lxqt.org/ +COMMENT= Terminal emulator widget for Qt5 +LICENSE= gnu-lgpl-v2.1 AND modified-bsd + +USE_CMAKE= yes +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ + +CONFIGURE_DIRS= build +CMAKE_ARG_PATH= .. + +LDFLAGS.NetBSD+= -lutil + +SUBST_CLASSES+= prefix +SUBST_MESSAGE.prefix= Fixing paths. +SUBST_STAGE.prefix= pre-configure +SUBST_FILES.prefix= lib/qtermwidget.cpp +SUBST_SED.prefix= -e 's,/usr/share,${PREFIX}/share,g' + +pre-configure: + ${MKDIR} -p ${WRKSRC}/build + +TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools +TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools + +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/qtermwidget/PLIST diff -u /dev/null pkgsrc/x11/qtermwidget/PLIST:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/PLIST Thu Feb 20 05:47:44 2020 @@ -0,0 +1,65 @@ +@comment $NetBSD: PLIST,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ +include/qtermwidget5/Emulation.h +include/qtermwidget5/Filter.h +include/qtermwidget5/qtermwidget.h +include/qtermwidget5/qtermwidget_export.h +lib/cmake/qtermwidget5/qtermwidget5-config-version.cmake +lib/cmake/qtermwidget5/qtermwidget5-config.cmake +lib/cmake/qtermwidget5/qtermwidget5-targets-release.cmake +lib/cmake/qtermwidget5/qtermwidget5-targets.cmake +lib/libqtermwidget5.so +lib/libqtermwidget5.so.0 +lib/libqtermwidget5.so.${PKGVERSION} +lib/pkgconfig/qtermwidget5.pc +share/qtermwidget5/color-schemes/BlackOnLightYellow.schema +share/qtermwidget5/color-schemes/BlackOnRandomLight.colorscheme +share/qtermwidget5/color-schemes/BlackOnWhite.schema +share/qtermwidget5/color-schemes/BreezeModified.colorscheme +share/qtermwidget5/color-schemes/DarkPastels.colorscheme +share/qtermwidget5/color-schemes/GreenOnBlack.colorscheme +share/qtermwidget5/color-schemes/Linux.colorscheme +share/qtermwidget5/color-schemes/Solarized.colorscheme +share/qtermwidget5/color-schemes/SolarizedLight.colorscheme +share/qtermwidget5/color-schemes/Tango.colorscheme +share/qtermwidget5/color-schemes/Ubuntu.colorscheme +share/qtermwidget5/color-schemes/WhiteOnBlack.schema +share/qtermwidget5/color-schemes/historic/BlackOnLightColor.schema +share/qtermwidget5/color-schemes/historic/DarkPicture.schema +share/qtermwidget5/color-schemes/historic/GreenOnBlack.schema +share/qtermwidget5/color-schemes/historic/GreenTint.schema +share/qtermwidget5/color-schemes/historic/GreenTint_MC.schema +share/qtermwidget5/color-schemes/historic/LightPicture.schema +share/qtermwidget5/color-schemes/historic/Linux.schema +share/qtermwidget5/color-schemes/historic/Transparent.schema +share/qtermwidget5/color-schemes/historic/Transparent_MC.schema +share/qtermwidget5/color-schemes/historic/Transparent_darkbg.schema +share/qtermwidget5/color-schemes/historic/Transparent_lightbg.schema +share/qtermwidget5/color-schemes/historic/XTerm.schema +share/qtermwidget5/color-schemes/historic/syscolor.schema +share/qtermwidget5/color-schemes/historic/vim.schema +share/qtermwidget5/kb-layouts/default.keytab +share/qtermwidget5/kb-layouts/historic/vt100.keytab +share/qtermwidget5/kb-layouts/historic/x11r5.keytab +share/qtermwidget5/kb-layouts/linux.keytab +share/qtermwidget5/kb-layouts/macbook.keytab +share/qtermwidget5/kb-layouts/solaris.keytab +share/qtermwidget5/kb-layouts/vt420pc.keytab +share/qtermwidget5/translations/qtermwidget_ca.qm +share/qtermwidget5/translations/qtermwidget_cs.qm +share/qtermwidget5/translations/qtermwidget_cy.qm +share/qtermwidget5/translations/qtermwidget_da.qm +share/qtermwidget5/translations/qtermwidget_de.qm +share/qtermwidget5/translations/qtermwidget_el.qm +share/qtermwidget5/translations/qtermwidget_es.qm +share/qtermwidget5/translations/qtermwidget_fr.qm +share/qtermwidget5/translations/qtermwidget_gl.qm +share/qtermwidget5/translations/qtermwidget_he.qm +share/qtermwidget5/translations/qtermwidget_hu.qm +share/qtermwidget5/translations/qtermwidget_ja.qm +share/qtermwidget5/translations/qtermwidget_lt.qm +share/qtermwidget5/translations/qtermwidget_nb_NO.qm +share/qtermwidget5/translations/qtermwidget_pl.qm +share/qtermwidget5/translations/qtermwidget_pt.qm +share/qtermwidget5/translations/qtermwidget_tr.qm +share/qtermwidget5/translations/qtermwidget_zh_CN.qm +share/qtermwidget5/translations/qtermwidget_zh_TW.qm Index: pkgsrc/x11/qtermwidget/buildlink3.mk diff -u /dev/null pkgsrc/x11/qtermwidget/buildlink3.mk:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/buildlink3.mk Thu Feb 20 05:47:44 2020 @@ -0,0 +1,14 @@ +# $NetBSD: buildlink3.mk,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ + +BUILDLINK_TREE+= qtermwidget + +.if !defined(QTERMWIDGET_BUILDLINK3_MK) +QTERMWIDGET_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.qtermwidget+= qtermwidget>=0.14.1 +BUILDLINK_PKGSRCDIR.qtermwidget?= ../../x11/qtermwidget + +#.include "../../x11/qt5-qtbase/buildlink3.mk" +.endif # QTERMWIDGET_BUILDLINK3_MK + +BUILDLINK_TREE+= -qtermwidget Index: pkgsrc/x11/qtermwidget/distinfo diff -u /dev/null pkgsrc/x11/qtermwidget/distinfo:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/distinfo Thu Feb 20 05:47:44 2020 @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ + +SHA1 (qtermwidget-0.14.1.tar.xz) = 07d99b8f4a673fa1f965716f0db89a4ba9e3f9b5 +RMD160 (qtermwidget-0.14.1.tar.xz) = 73bcdbf8847c1816b42ff3da3dbb7c67c1b58a4d +SHA512 (qtermwidget-0.14.1.tar.xz) = 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 +Size (qtermwidget-0.14.1.tar.xz) = 178952 bytes +SHA1 (patch-lib_kpty.cpp) = 4da33557ecfa9faebc1003ac8fab9e4abe0ec3e4 Index: pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp diff -u /dev/null pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp:1.1 --- /dev/null Thu Feb 20 05:47:45 2020 +++ pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp Thu Feb 20 05:47:44 2020 @@ -0,0 +1,37 @@ +$NetBSD: patch-lib_kpty.cpp,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ + +Allow the package to build on NetBSD. + +--- lib/kpty.cpp.orig 2019-02-25 22:13:12.000000000 +0000 ++++ lib/kpty.cpp +@@ -27,7 +27,7 @@ + #include + + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #define HAVE_LOGIN + #define HAVE_LIBUTIL_H + #endif +@@ -37,6 +37,12 @@ + #define HAVE_UTIL_H + #endif + ++#if defined(__NetBSD__) ++#define HAVE_LOGIN ++#define HAVE_UTIL_H ++#define HAVE_OPENPTY ++#endif ++ + #if defined(__APPLE__) + #define HAVE_OPENPTY + #define HAVE_UTIL_H +@@ -174,7 +180,7 @@ KPtyPrivate::~KPtyPrivate() + { + } + +-#ifndef HAVE_OPENPTY ++#ifndef __APPLE__ + bool KPtyPrivate::chownpty(bool) + { + // return !QProcess::execute(KStandardDirs::findExe("kgrantpty"), --_----------=_1582177665262210--