Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qtermwidget/patches x11/qtermwidget: Remove upstre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/836339278423
branches:  trunk
changeset: 433345:836339278423
user:      pin <pin%pkgsrc.org@localhost>
date:      Mon Jun 01 15:00:59 2020 +0000

description:
x11/qtermwidget: Remove upstreamed patches

diffstat:

 x11/qtermwidget/patches/patch-lib_kpty.cpp  |  44 -----------------------------
 x11/qtermwidget/patches/patch-lib_kpty__p.h |  16 ----------
 2 files changed, 0 insertions(+), 60 deletions(-)

diffs (68 lines):

diff -r 6d8c20295d84 -r 836339278423 x11/qtermwidget/patches/patch-lib_kpty.cpp
--- a/x11/qtermwidget/patches/patch-lib_kpty.cpp        Mon Jun 01 14:58:40 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$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 <QtDebug>
- 
- 
--#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 //
diff -r 6d8c20295d84 -r 836339278423 x11/qtermwidget/patches/patch-lib_kpty__p.h
--- a/x11/qtermwidget/patches/patch-lib_kpty__p.h       Mon Jun 01 14:58:40 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$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;



Home | Main Index | Thread Index | Old Index