CVS commit: pkgsrc/x11/qtermwidget

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Apr 23 04:11:19 UTC 2020

Modified Files:
        pkgsrc/x11/qtermwidget: distinfo
        pkgsrc/x11/qtermwidget/patches: patch-lib_kpty.cpp
Added Files:
        pkgsrc/x11/qtermwidget/patches: patch-lib_kpty__p.h

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qtermwidget/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/qtermwidget/patches/patch-lib_kpty__p.h

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

Modified files:

Index: pkgsrc/x11/qtermwidget/distinfo
diff -u pkgsrc/x11/qtermwidget/distinfo:1.1 pkgsrc/x11/qtermwidget/distinfo:1.2
--- pkgsrc/x11/qtermwidget/distinfo:1.1 Thu Feb 20 05:47:44 2020
+++ pkgsrc/x11/qtermwidget/distinfo     Thu Apr 23 04:11:19 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2020/02/20 05:47:44 gutteridge Exp $
+$NetBSD: distinfo,v 1.2 2020/04/23 04:11:19 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
+SHA1 (patch-lib_kpty.cpp) = 083f01444518ef6e9596417a112bde6b2f4b5c5c
+SHA1 (patch-lib_kpty__p.h) = bd122197507218057e6bf90139a8e1f332281a98

Index: pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp
diff -u pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp:1.1 pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp:1.2
--- pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp:1.1       Thu Feb 20 05:47:44 2020
+++ pkgsrc/x11/qtermwidget/patches/patch-lib_kpty.cpp   Thu Apr 23 04:11:19 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-lib_kpty.cpp,v 1.1 2020/02/20 05:47:44 gutteridge Exp $
+$NetBSD: patch-lib_kpty.cpp,v 1.2 2020/04/23 04:11:19 gutteridge Exp $
 
-Allow the package to build on NetBSD.
+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
@@ -26,12 +27,18 @@ Allow the package to build on NetBSD.
  #if defined(__APPLE__)
  #define HAVE_OPENPTY
  #define HAVE_UTIL_H
-@@ -174,7 +180,7 @@ KPtyPrivate::~KPtyPrivate()
+@@ -174,14 +180,12 @@ KPtyPrivate::~KPtyPrivate()
  {
  }
  
 -#ifndef HAVE_OPENPTY
-+#ifndef __APPLE__
  bool KPtyPrivate::chownpty(bool)
  {
  //    return !QProcess::execute(KStandardDirs::findExe("kgrantpty"),
+ //        QStringList() << (grant?"--grant":"--revoke") << QString::number(masterFd));
+     return true;
+ }
+-#endif
+ 
+ /////////////////////////////
+ // public member functions //

Added files:

Index: pkgsrc/x11/qtermwidget/patches/patch-lib_kpty__p.h
diff -u /dev/null pkgsrc/x11/qtermwidget/patches/patch-lib_kpty__p.h:1.1
--- /dev/null   Thu Apr 23 04:11:19 2020
+++ pkgsrc/x11/qtermwidget/patches/patch-lib_kpty__p.h  Thu Apr 23 04:11:19 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_kpty__p.h,v 1.1 2020/04/23 04:11:19 gutteridge Exp $
+
+Fix macOS build.
+
+--- lib/kpty_p.h.orig  2019-02-25 22:13:12.000000000 +0000
++++ lib/kpty_p.h
+@@ -35,9 +35,7 @@ public:
+     KPtyPrivate(KPty* parent);
+     virtual ~KPtyPrivate();
+ 
+-#ifndef HAVE_OPENPTY
+     bool chownpty(bool grant);
+-#endif
+ 
+     int masterFd;
+     int slaveFd;