diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2020-04-23 04:11:19 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2020-04-23 04:11:19 +0000 |
| commit | a6c6ecb4f3da39e3049cc084e1492e993551910c (patch) | |
| tree | 91121cf34abb82b431b4437977ec918f34d3f080 /x11 | |
| parent | 1086d4865516f555c08952859e5c9f107ad24697 (diff) | |
| download | pkgsrc-a6c6ecb4f3da39e3049cc084e1492e993551910c.tar.gz | |
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).
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qtermwidget/distinfo | 5 | ||||
| -rw-r--r-- | x11/qtermwidget/patches/patch-lib_kpty.cpp | 15 | ||||
| -rw-r--r-- | x11/qtermwidget/patches/patch-lib_kpty__p.h | 16 |
3 files changed, 30 insertions, 6 deletions
diff --git a/x11/qtermwidget/distinfo b/x11/qtermwidget/distinfo index bd1fa15d94b..bc04c2796a2 100644 --- a/x11/qtermwidget/distinfo +++ b/x11/qtermwidget/distinfo @@ -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 diff --git a/x11/qtermwidget/patches/patch-lib_kpty.cpp b/x11/qtermwidget/patches/patch-lib_kpty.cpp index 6e5b2bfbf89..482066a6bbe 100644 --- a/x11/qtermwidget/patches/patch-lib_kpty.cpp +++ b/x11/qtermwidget/patches/patch-lib_kpty.cpp @@ -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 // diff --git a/x11/qtermwidget/patches/patch-lib_kpty__p.h b/x11/qtermwidget/patches/patch-lib_kpty__p.h new file mode 100644 index 00000000000..aba81184a7b --- /dev/null +++ b/x11/qtermwidget/patches/patch-lib_kpty__p.h @@ -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; |