pkgsrc-WIP-changes archive

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

qtermwidget, almost build



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Sun Jan 12 17:18:33 2020 +0100
Changeset:	b557f3d7bd2cf6a4e63f681714f9c0821bfe3a41

Modified Files:
	qtermwidget/TODO
	qtermwidget/distinfo
Added Files:
	qtermwidget/patches/patch-lib_kpty.cpp

Log Message:
qtermwidget, almost build

Still having issues after patching.
See TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b557f3d7bd2cf6a4e63f681714f9c0821bfe3a41

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

diffstat:
 qtermwidget/TODO                       | 41 +++++++---------------------------
 qtermwidget/distinfo                   |  1 +
 qtermwidget/patches/patch-lib_kpty.cpp | 27 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 33 deletions(-)

diffs:
diff --git a/qtermwidget/TODO b/qtermwidget/TODO
index 3efe7d6089..b84dff6676 100644
--- a/qtermwidget/TODO
+++ b/qtermwidget/TODO
@@ -1,34 +1,9 @@
-[ 61%] Building CXX object CMakeFiles/qtermwidget5.dir/lib/kpty.cpp.o
-/usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/lib/kpty.cpp:87:11: fatal error: libutil.h: No such file or directory
- # include <libutil.h>
-           ^~~~~~~~~~~
-compilation terminated.
---- CMakeFiles/qtermwidget5.dir/lib/kpty.cpp.o ---
-*** [CMakeFiles/qtermwidget5.dir/lib/kpty.cpp.o] Error code 1
-
-make[2]: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
-1 error
-
-make[2]: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
---- CMakeFiles/qtermwidget5.dir/all ---
-*** [CMakeFiles/qtermwidget5.dir/all] Error code 2
-
-make[1]: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
-1 error
-
-make[1]: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
-*** [all] Error code 2
-
-make: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
-1 error
-
-make: stopped in /usr/pkgsrc/wip/qtermwidget/work/qtermwidget-0.14.1/build
-*** Error code 2
-
-Stop.
-make[1]: stopped in /usr/pkgsrc/wip/qtermwidget
-*** Error code 1
-
-Stop.
-make: stopped in /usr/pkgsrc/wip/qtermwidget
+[100%] Linking CXX shared library libqtermwidget5.so
+ld: CMakeFiles/qtermwidget5.dir/lib/kpty.cpp.o: in function `KPty::login(char const*, char const*)':
+kpty.cpp:(.text+0xd39): undefined reference to `__login50'
+ld: CMakeFiles/qtermwidget5.dir/lib/kpty.cpp.o: in function `KPty::logout()':
+kpty.cpp:(.text+0xdb7): undefined reference to `logout'
+ld: kpty.cpp:(.text+0xde0): undefined reference to `logout'
+--- libqtermwidget5.so.0.14.1 ---
+*** [libqtermwidget5.so.0.14.1] Error code 1
 
diff --git a/qtermwidget/distinfo b/qtermwidget/distinfo
index 3eb8c5a50c..47a3533d92 100644
--- a/qtermwidget/distinfo
+++ b/qtermwidget/distinfo
@@ -4,3 +4,4 @@ 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) = 973e78103d9dd96e154461a29804b4678f527e97
diff --git a/qtermwidget/patches/patch-lib_kpty.cpp b/qtermwidget/patches/patch-lib_kpty.cpp
new file mode 100644
index 0000000000..e2dc9a044b
--- /dev/null
+++ b/qtermwidget/patches/patch-lib_kpty.cpp
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Allow kpty to find libutil
+
+--- 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,11 @@
+ #define HAVE_UTIL_H
+ #endif
+ 
++#if defined(__NetBSD__)
++#define HAVE_LOGIN
++#define HAVE_UTIL_H
++#endif
++
+ #if defined(__APPLE__)
+ #define HAVE_OPENPTY
+ #define HAVE_UTIL_H


Home | Main Index | Thread Index | Old Index