pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel
Module Name: pkgsrc
Committed By: markd
Date: Sun May 26 12:02:21 UTC 2024
Modified Files:
pkgsrc/devel: Makefile
Added Files:
pkgsrc/devel/kf6-kpty: DESCR Makefile PLIST buildlink3.mk distinfo
pkgsrc/devel/kf6-kpty/patches: patch-src_ConfigureChecks.cmake
patch-src_kgrantpty.c patch-src_kpty.cpp patch-src_kptydevice.cpp
Log Message:
kf6-kpty: add version 6.2.0
KDE Frameworks 6 kpty.
This library provides primitives to interface with pseudo terminal devices
as well as a KProcess derived class for running child processes and
communicating with them using a pty.
To generate a diff of this commit:
cvs rdiff -u -r1.4296 -r1.4297 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/kf6-kpty/DESCR \
pkgsrc/devel/kf6-kpty/Makefile pkgsrc/devel/kf6-kpty/PLIST \
pkgsrc/devel/kf6-kpty/buildlink3.mk pkgsrc/devel/kf6-kpty/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/kf6-kpty/patches/patch-src_ConfigureChecks.cmake \
pkgsrc/devel/kf6-kpty/patches/patch-src_kgrantpty.c \
pkgsrc/devel/kf6-kpty/patches/patch-src_kpty.cpp \
pkgsrc/devel/kf6-kpty/patches/patch-src_kptydevice.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.4296 pkgsrc/devel/Makefile:1.4297
--- pkgsrc/devel/Makefile:1.4296 Sun May 26 11:56:33 2024
+++ pkgsrc/devel/Makefile Sun May 26 12:02:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4296 2024/05/26 11:56:33 markd Exp $
+# $NetBSD: Makefile,v 1.4297 2024/05/26 12:02:20 markd Exp $
#
COMMENT= Development utilities
@@ -858,6 +858,7 @@ SUBDIR+= kf6-knotifyconfig
SUBDIR+= kf6-kpackage
SUBDIR+= kf6-kparts
SUBDIR+= kf6-kpeople
+SUBDIR+= kf6-kpty
SUBDIR+= ki18n
SUBDIR+= kidletime
SUBDIR+= kio
Added files:
Index: pkgsrc/devel/kf6-kpty/DESCR
diff -u /dev/null pkgsrc/devel/kf6-kpty/DESCR:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/DESCR Sun May 26 12:02:20 2024
@@ -0,0 +1,3 @@
+This library provides primitives to interface with pseudo terminal devices
+as well as a KProcess derived class for running child processes and
+communicating with them using a pty.
Index: pkgsrc/devel/kf6-kpty/Makefile
diff -u /dev/null pkgsrc/devel/kf6-kpty/Makefile:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/Makefile Sun May 26 12:02:20 2024
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+DISTNAME= kpty-${KF6VER}
+CATEGORIES= devel
+
+HOMEPAGE= https://community.kde.org/Frameworks
+COMMENT= Pty abstraction
+LICENSE= gnu-lgpl-v2.1
+
+.include "../../meta-pkgs/kde/kf6.mk"
+
+USE_TOOLS+= msgmerge
+
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
+.include "../../lang/python/tool.mk"
+.include "../../devel/kf6-kcoreaddons/buildlink3.mk"
+.include "../../devel/kf6-ki18n/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/kf6-kpty/PLIST
diff -u /dev/null pkgsrc/devel/kf6-kpty/PLIST:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/PLIST Sun May 26 12:02:20 2024
@@ -0,0 +1,119 @@
+@comment $NetBSD: PLIST,v 1.1 2024/05/26 12:02:20 markd Exp $
+include/KF6/KPty/KPty
+include/KF6/KPty/KPtyDevice
+include/KF6/KPty/KPtyProcess
+include/KF6/KPty/kpty.h
+include/KF6/KPty/kpty_export.h
+include/KF6/KPty/kpty_version.h
+include/KF6/KPty/kptydevice.h
+include/KF6/KPty/kptyprocess.h
+lib/cmake/KF6Pty/KF6PtyConfig.cmake
+lib/cmake/KF6Pty/KF6PtyConfigVersion.cmake
+lib/cmake/KF6Pty/KF6PtyTargets-noconfig.cmake
+lib/cmake/KF6Pty/KF6PtyTargets.cmake
+lib/libKF6Pty.so
+lib/libKF6Pty.so.6
+lib/libKF6Pty.so.${PKGVERSION}
+share/locale/af/LC_MESSAGES/kpty6.mo
+share/locale/ar/LC_MESSAGES/kpty6.mo
+share/locale/as/LC_MESSAGES/kpty6.mo
+share/locale/ast/LC_MESSAGES/kpty6.mo
+share/locale/az/LC_MESSAGES/kpty6.mo
+share/locale/be/LC_MESSAGES/kpty6.mo
+share/locale/be@latin/LC_MESSAGES/kpty6.mo
+share/locale/bg/LC_MESSAGES/kpty6.mo
+share/locale/bn/LC_MESSAGES/kpty6.mo
+share/locale/bn_IN/LC_MESSAGES/kpty6.mo
+share/locale/br/LC_MESSAGES/kpty6.mo
+share/locale/bs/LC_MESSAGES/kpty6.mo
+share/locale/ca/LC_MESSAGES/kpty6.mo
+share/locale/ca@valencia/LC_MESSAGES/kpty6.mo
+share/locale/crh/LC_MESSAGES/kpty6.mo
+share/locale/cs/LC_MESSAGES/kpty6.mo
+share/locale/csb/LC_MESSAGES/kpty6.mo
+share/locale/cy/LC_MESSAGES/kpty6.mo
+share/locale/da/LC_MESSAGES/kpty6.mo
+share/locale/de/LC_MESSAGES/kpty6.mo
+share/locale/el/LC_MESSAGES/kpty6.mo
+share/locale/en_GB/LC_MESSAGES/kpty6.mo
+share/locale/eo/LC_MESSAGES/kpty6.mo
+share/locale/es/LC_MESSAGES/kpty6.mo
+share/locale/et/LC_MESSAGES/kpty6.mo
+share/locale/eu/LC_MESSAGES/kpty6.mo
+share/locale/fa/LC_MESSAGES/kpty6.mo
+share/locale/fi/LC_MESSAGES/kpty6.mo
+share/locale/fr/LC_MESSAGES/kpty6.mo
+share/locale/fy/LC_MESSAGES/kpty6.mo
+share/locale/ga/LC_MESSAGES/kpty6.mo
+share/locale/gd/LC_MESSAGES/kpty6.mo
+share/locale/gl/LC_MESSAGES/kpty6.mo
+share/locale/gu/LC_MESSAGES/kpty6.mo
+share/locale/ha/LC_MESSAGES/kpty6.mo
+share/locale/he/LC_MESSAGES/kpty6.mo
+share/locale/hi/LC_MESSAGES/kpty6.mo
+share/locale/hne/LC_MESSAGES/kpty6.mo
+share/locale/hr/LC_MESSAGES/kpty6.mo
+share/locale/hsb/LC_MESSAGES/kpty6.mo
+share/locale/hu/LC_MESSAGES/kpty6.mo
+share/locale/hy/LC_MESSAGES/kpty6.mo
+share/locale/ia/LC_MESSAGES/kpty6.mo
+share/locale/id/LC_MESSAGES/kpty6.mo
+share/locale/is/LC_MESSAGES/kpty6.mo
+share/locale/it/LC_MESSAGES/kpty6.mo
+share/locale/ja/LC_MESSAGES/kpty6.mo
+share/locale/ka/LC_MESSAGES/kpty6.mo
+share/locale/kk/LC_MESSAGES/kpty6.mo
+share/locale/km/LC_MESSAGES/kpty6.mo
+share/locale/kn/LC_MESSAGES/kpty6.mo
+share/locale/ko/LC_MESSAGES/kpty6.mo
+share/locale/ku/LC_MESSAGES/kpty6.mo
+share/locale/lb/LC_MESSAGES/kpty6.mo
+share/locale/lt/LC_MESSAGES/kpty6.mo
+share/locale/lv/LC_MESSAGES/kpty6.mo
+share/locale/mai/LC_MESSAGES/kpty6.mo
+share/locale/mk/LC_MESSAGES/kpty6.mo
+share/locale/ml/LC_MESSAGES/kpty6.mo
+share/locale/mr/LC_MESSAGES/kpty6.mo
+share/locale/ms/LC_MESSAGES/kpty6.mo
+share/locale/nb/LC_MESSAGES/kpty6.mo
+share/locale/nds/LC_MESSAGES/kpty6.mo
+share/locale/ne/LC_MESSAGES/kpty6.mo
+share/locale/nl/LC_MESSAGES/kpty6.mo
+share/locale/nn/LC_MESSAGES/kpty6.mo
+share/locale/oc/LC_MESSAGES/kpty6.mo
+share/locale/or/LC_MESSAGES/kpty6.mo
+share/locale/pa/LC_MESSAGES/kpty6.mo
+share/locale/pl/LC_MESSAGES/kpty6.mo
+share/locale/ps/LC_MESSAGES/kpty6.mo
+share/locale/pt/LC_MESSAGES/kpty6.mo
+share/locale/pt_BR/LC_MESSAGES/kpty6.mo
+share/locale/ro/LC_MESSAGES/kpty6.mo
+share/locale/ru/LC_MESSAGES/kpty6.mo
+share/locale/sa/LC_MESSAGES/kpty6.mo
+share/locale/se/LC_MESSAGES/kpty6.mo
+share/locale/si/LC_MESSAGES/kpty6.mo
+share/locale/sk/LC_MESSAGES/kpty6.mo
+share/locale/sl/LC_MESSAGES/kpty6.mo
+share/locale/sq/LC_MESSAGES/kpty6.mo
+share/locale/sr/LC_MESSAGES/kpty6.mo
+share/locale/sr@ijekavian/LC_MESSAGES/kpty6.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/kpty6.mo
+share/locale/sr@latin/LC_MESSAGES/kpty6.mo
+share/locale/sv/LC_MESSAGES/kpty6.mo
+share/locale/ta/LC_MESSAGES/kpty6.mo
+share/locale/te/LC_MESSAGES/kpty6.mo
+share/locale/tg/LC_MESSAGES/kpty6.mo
+share/locale/th/LC_MESSAGES/kpty6.mo
+share/locale/tr/LC_MESSAGES/kpty6.mo
+share/locale/tt/LC_MESSAGES/kpty6.mo
+share/locale/ug/LC_MESSAGES/kpty6.mo
+share/locale/uk/LC_MESSAGES/kpty6.mo
+share/locale/uz/LC_MESSAGES/kpty6.mo
+share/locale/uz@cyrillic/LC_MESSAGES/kpty6.mo
+share/locale/vi/LC_MESSAGES/kpty6.mo
+share/locale/wa/LC_MESSAGES/kpty6.mo
+share/locale/xh/LC_MESSAGES/kpty6.mo
+share/locale/zh_CN/LC_MESSAGES/kpty6.mo
+share/locale/zh_HK/LC_MESSAGES/kpty6.mo
+share/locale/zh_TW/LC_MESSAGES/kpty6.mo
+share/qlogging-categories6/kpty.categories
Index: pkgsrc/devel/kf6-kpty/buildlink3.mk
diff -u /dev/null pkgsrc/devel/kf6-kpty/buildlink3.mk:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/buildlink3.mk Sun May 26 12:02:20 2024
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+BUILDLINK_TREE+= kf6-kpty
+
+.if !defined(KF6_KPTY_BUILDLINK3_MK)
+KF6_KPTY_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kf6-kpty+= kf6-kpty>=6.2.0
+BUILDLINK_PKGSRCDIR.kf6-kpty?= ../../devel/kf6-kpty
+
+.include "../../devel/kf6-kcoreaddons/buildlink3.mk"
+.include "../../devel/kf6-ki18n/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif # KF6_KPTY_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -kf6-kpty
Index: pkgsrc/devel/kf6-kpty/distinfo
diff -u /dev/null pkgsrc/devel/kf6-kpty/distinfo:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/distinfo Sun May 26 12:02:20 2024
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+BLAKE2s (kpty-6.2.0.tar.xz) = 1da5def9785be6e685b32560a1ec4294c06d32b04b0068065d7e239b47dac704
+SHA512 (kpty-6.2.0.tar.xz) = 6f00313e07dc80e4f2749af20e7873f901b538c3884b9b02bc2cfd8aff11abd430f001df53d8f782917ca1864ccb32cf2b4d3a72c5345b53aa24a0537110fd30
+Size (kpty-6.2.0.tar.xz) = 2407576 bytes
+SHA1 (patch-src_ConfigureChecks.cmake) = aa44e7b76545c450bc41265a8077877e9f69506b
+SHA1 (patch-src_kgrantpty.c) = 81787e45e3399871387d9f665b5430500bf96992
+SHA1 (patch-src_kpty.cpp) = da6e41dbfc4256e2474d144dc4b14aa32523e6b1
+SHA1 (patch-src_kptydevice.cpp) = 7c9dcf4ce662996286444c393a1f377bbbf88511
Index: pkgsrc/devel/kf6-kpty/patches/patch-src_ConfigureChecks.cmake
diff -u /dev/null pkgsrc/devel/kf6-kpty/patches/patch-src_ConfigureChecks.cmake:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/patches/patch-src_ConfigureChecks.cmake Sun May 26 12:02:20 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_ConfigureChecks.cmake,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- src/ConfigureChecks.cmake.orig 2016-04-03 21:01:19.000000000 +0000
++++ src/ConfigureChecks.cmake
+@@ -42,6 +42,7 @@ if (UNIX)
+ endif (HAVE_UTMPX)
+ if (login_in_libc OR login_in_libutil)
+ set(HAVE_LOGIN 1)
++ check_struct_has_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
+ else (login_in_libc OR login_in_libutil)
+ set(HAVE_LOGIN)
+ check_struct_has_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
Index: pkgsrc/devel/kf6-kpty/patches/patch-src_kgrantpty.c
diff -u /dev/null pkgsrc/devel/kf6-kpty/patches/patch-src_kgrantpty.c:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/patches/patch-src_kgrantpty.c Sun May 26 12:02:20 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_kgrantpty.c,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+Don't include C++ headers in a C file.
+
+--- src/kgrantpty.c.orig 2022-04-02 10:26:01.000000000 +0000
++++ src/kgrantpty.c
+@@ -27,7 +27,7 @@
+
+ #include <config-pty.h>
+
+-#include <cerrno>
++#include <errno.h>
+ #include <grp.h>
+ #include <stdio.h>
+ #include <stdlib.h>
Index: pkgsrc/devel/kf6-kpty/patches/patch-src_kpty.cpp
diff -u /dev/null pkgsrc/devel/kf6-kpty/patches/patch-src_kpty.cpp:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/patches/patch-src_kpty.cpp Sun May 26 12:02:20 2024
@@ -0,0 +1,95 @@
+$NetBSD: patch-src_kpty.cpp,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- src/kpty.cpp.orig 2022-04-02 10:26:01.000000000 +0000
++++ src/kpty.cpp
+@@ -10,6 +10,7 @@
+
+ #include "kpty_p.h"
+
++#include <QFile>
+ #include <QProcess>
+ #include <kpty_debug.h>
+
+@@ -168,7 +169,7 @@ KPtyPrivate::~KPtyPrivate()
+ bool KPtyPrivate::chownpty(bool grant)
+ {
+ return !QProcess::execute(QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBEXECDIR_KF "/kgrantpty"),
+- QStringList() << (grant ? "--grant" : "--revoke") << QString::number(masterFd));
++ QStringList() << (grant ? QStringLiteral("--grant") : QStringLiteral("--revoke")) << QString::number(masterFd));
+ }
+ #endif
+
+@@ -260,6 +261,7 @@ bool KPty::open()
+ }
+ #endif // HAVE_PTSNAME || TIOCGPTN
+
++#if 0
+ // Linux device names, FIXME: Trouble on other systems?
+ for (const char *s3 = "pqrstuvwxyzabcde"; *s3; s3++) {
+ for (const char *s4 = "0123456789abcdef"; *s4; s4++) {
+@@ -289,8 +291,10 @@ bool KPty::open()
+
+ qCWarning(KPTY_LOG) << "Can't open a pseudo teletype";
+ return false;
++#endif
+
+ gotpty:
++#if 0
+ QFileInfo info(d->ttyName.data());
+ if (!info.exists()) {
+ return false; // this just cannot happen ... *cough* Yeah right, I just
+@@ -302,14 +306,15 @@ gotpty:
+ && !d->chownpty(true)) {
+ qCWarning(KPTY_LOG) << "chownpty failed for device " << ptyName << "::" << d->ttyName << "\nThis means the communication can be eavesdropped." << endl;
+ }
++#endif
+
+ grantedpt:
+
+-#ifdef HAVE_REVOKE
++#if HAVE_REVOKE
+ revoke(d->ttyName.data());
+ #endif
+
+-#ifdef HAVE_UNLOCKPT
++#if HAVE_UNLOCKPT
+ unlockpt(d->masterFd);
+ #elif defined(TIOCSPTLCK)
+ int flag = 0;
+@@ -502,11 +507,14 @@ void KPty::login(const char *user, const
+ #endif
+
+ #if HAVE_UTMPX
+- gettimeofday(&l_struct.ut_tv, 0);
++ gettimeofday(&l_struct.ut_tv, nullptr);
+ #else
+ l_struct.ut_time = time(0);
+ #endif
+
++#if HAVE_STRUCT_UTMP_UT_TYPE
++ l_struct.ut_type = USER_PROCESS;
++#endif
+ #if HAVE_LOGIN
+ #if HAVE_LOGINX
+ ::loginx(&l_struct);
+@@ -514,9 +522,6 @@ void KPty::login(const char *user, const
+ ::login(&l_struct);
+ #endif
+ #else
+-#if HAVE_STRUCT_UTMP_UT_TYPE
+- l_struct.ut_type = USER_PROCESS;
+-#endif
+ #if HAVE_STRUCT_UTMP_UT_PID
+ l_struct.ut_pid = getpid();
+ #if HAVE_STRUCT_UTMP_UT_SESSION
+@@ -605,7 +610,7 @@ void KPty::logout()
+ ut->ut_type = DEAD_PROCESS;
+ #endif
+ #if HAVE_UTMPX
+- gettimeofday(&(ut->ut_tv), 0);
++ gettimeofday(&(ut->ut_tv), nullptr);
+ pututxline(ut);
+ }
+ endutxent();
Index: pkgsrc/devel/kf6-kpty/patches/patch-src_kptydevice.cpp
diff -u /dev/null pkgsrc/devel/kf6-kpty/patches/patch-src_kptydevice.cpp:1.1
--- /dev/null Sun May 26 12:02:21 2024
+++ pkgsrc/devel/kf6-kpty/patches/patch-src_kptydevice.cpp Sun May 26 12:02:20 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_kptydevice.cpp,v 1.1 2024/05/26 12:02:20 markd Exp $
+
+NetBSD like FreeBSD
+
+--- src/kptydevice.cpp.orig 2022-04-02 10:26:01.000000000 +0000
++++ src/kptydevice.cpp
+@@ -29,7 +29,7 @@
+ #include <sys/time.h>
+ #endif
+
+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD)
+ // "the other end's output queue size" -- that is is our end's input
+ #define PTY_BYTES_AVAILABLE TIOCOUTQ
+ #elif defined(TIOCINQ)
Home |
Main Index |
Thread Index |
Old Index