head 1.3; access; symbols pkgsrc-2020Q1:1.1.0.2 pkgsrc-2020Q1-base:1.1; locks; strict; comment @// @; 1.3 date 2020.06.01.15.00.59; author pin; state dead; branches; next 1.2; commitid LTe83B5KzHdI5xaC; 1.2 date 2020.04.23.04.11.19; author gutteridge; state Exp; branches; next 1.1; commitid SlOGZu5KmOrOIs5C; 1.1 date 2020.02.20.05.47.44; author gutteridge; state Exp; branches; next ; commitid C8kzgbSgKlX6jnXB; desc @@ 1.3 log @x11/qtermwidget: Remove upstreamed patches @ text @$NetBSD: patch-lib_kpty.cpp,v 1.2 2020/04/23 04:11:19 gutteridge Exp $ Allow the package to build on NetBSD and macOS. https://github.com/lxqt/qtermwidget/pull/338 --- 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,14 +180,12 @@@@ KPtyPrivate::~KPtyPrivate() { } -#ifndef HAVE_OPENPTY bool KPtyPrivate::chownpty(bool) { // return !QProcess::execute(KStandardDirs::findExe("kgrantpty"), // QStringList() << (grant?"--grant":"--revoke") << QString::number(masterFd)); return true; } -#endif ///////////////////////////// // public member functions // @ 1.2 log @qtermwidget: amend the build fix patching Also fix macOS builds (upstream has done the same), and note the PR I submitted for the NetBSD fix (which I should have sent months ago). @ text @d1 1 a1 1 $NetBSD: patch-lib_kpty.cpp,v 1.1 2020/02/20 05:47:44 gutteridge Exp $ @ 1.1 log @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.) @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 1 Allow the package to build on NetBSD. d30 1 a30 1 @@@@ -174,7 +180,7 @@@@ KPtyPrivate::~KPtyPrivate() a34 1 +#ifndef __APPLE__ d38 7 @