pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qtermwidget, build fixed
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Tue Jan 14 09:28:43 2020 +0100
Changeset: 4db7ccf8e13851d97aad8e15cce7209577788606
Modified Files:
qtermwidget/Makefile
qtermwidget/PLIST
qtermwidget/distinfo
qtermwidget/patches/patch-lib_kpty.cpp
Added Files:
qtermwidget/buildlink3.mk
Removed Files:
qtermwidget/TODO
Log Message:
qtermwidget, build fixed
Thanks to David H. Gutteridge for dropping the needed changes.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4db7ccf8e13851d97aad8e15cce7209577788606
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qtermwidget/Makefile | 4 +-
qtermwidget/PLIST | 67 ++++++++++++++++++++++++++++++++--
qtermwidget/TODO | 9 -----
qtermwidget/buildlink3.mk | 13 +++++++
qtermwidget/distinfo | 2 +-
qtermwidget/patches/patch-lib_kpty.cpp | 14 ++++++-
6 files changed, 93 insertions(+), 16 deletions(-)
diffs:
diff --git a/qtermwidget/Makefile b/qtermwidget/Makefile
index 48eb17257a..de5d56ae3f 100644
--- a/qtermwidget/Makefile
+++ b/qtermwidget/Makefile
@@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://lxqt.org/
COMMENT= Terminal emulator widget for Qt5
-LICENSE= gnu-lgpl-v2.1
+LICENSE= gnu-lgpl-v2.1 AND modified-bsd
USE_CMAKE= yes
USE_TOOLS+= pkg-config
@@ -21,6 +21,8 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE
INSTALLATION_DIRS+= lib
+LDFLAGS.NetBSD+= -lutil
+
pre-configure:
${MKDIR} -p ${WRKSRC}/build
diff --git a/qtermwidget/PLIST b/qtermwidget/PLIST
index 92ba51a2d7..a11944c32c 100644
--- a/qtermwidget/PLIST
+++ b/qtermwidget/PLIST
@@ -1,4 +1,65 @@
@comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+include/qtermwidget5/Emulation.h
+include/qtermwidget5/Filter.h
+include/qtermwidget5/qtermwidget.h
+include/qtermwidget5/qtermwidget_export.h
+lib/cmake/qtermwidget5/qtermwidget5-config-version.cmake
+lib/cmake/qtermwidget5/qtermwidget5-config.cmake
+lib/cmake/qtermwidget5/qtermwidget5-targets-release.cmake
+lib/cmake/qtermwidget5/qtermwidget5-targets.cmake
+lib/libqtermwidget5.so
+lib/libqtermwidget5.so.0
+lib/libqtermwidget5.so.${PKGVERSION}
+lib/pkgconfig/qtermwidget5.pc
+share/qtermwidget5/color-schemes/BlackOnLightYellow.schema
+share/qtermwidget5/color-schemes/BlackOnRandomLight.colorscheme
+share/qtermwidget5/color-schemes/BlackOnWhite.schema
+share/qtermwidget5/color-schemes/BreezeModified.colorscheme
+share/qtermwidget5/color-schemes/DarkPastels.colorscheme
+share/qtermwidget5/color-schemes/GreenOnBlack.colorscheme
+share/qtermwidget5/color-schemes/Linux.colorscheme
+share/qtermwidget5/color-schemes/Solarized.colorscheme
+share/qtermwidget5/color-schemes/SolarizedLight.colorscheme
+share/qtermwidget5/color-schemes/Tango.colorscheme
+share/qtermwidget5/color-schemes/Ubuntu.colorscheme
+share/qtermwidget5/color-schemes/WhiteOnBlack.schema
+share/qtermwidget5/color-schemes/historic/BlackOnLightColor.schema
+share/qtermwidget5/color-schemes/historic/DarkPicture.schema
+share/qtermwidget5/color-schemes/historic/GreenOnBlack.schema
+share/qtermwidget5/color-schemes/historic/GreenTint.schema
+share/qtermwidget5/color-schemes/historic/GreenTint_MC.schema
+share/qtermwidget5/color-schemes/historic/LightPicture.schema
+share/qtermwidget5/color-schemes/historic/Linux.schema
+share/qtermwidget5/color-schemes/historic/Transparent.schema
+share/qtermwidget5/color-schemes/historic/Transparent_MC.schema
+share/qtermwidget5/color-schemes/historic/Transparent_darkbg.schema
+share/qtermwidget5/color-schemes/historic/Transparent_lightbg.schema
+share/qtermwidget5/color-schemes/historic/XTerm.schema
+share/qtermwidget5/color-schemes/historic/syscolor.schema
+share/qtermwidget5/color-schemes/historic/vim.schema
+share/qtermwidget5/kb-layouts/default.keytab
+share/qtermwidget5/kb-layouts/historic/vt100.keytab
+share/qtermwidget5/kb-layouts/historic/x11r5.keytab
+share/qtermwidget5/kb-layouts/linux.keytab
+share/qtermwidget5/kb-layouts/macbook.keytab
+share/qtermwidget5/kb-layouts/solaris.keytab
+share/qtermwidget5/kb-layouts/vt420pc.keytab
+share/qtermwidget5/translations/qtermwidget_ca.qm
+share/qtermwidget5/translations/qtermwidget_cs.qm
+share/qtermwidget5/translations/qtermwidget_cy.qm
+share/qtermwidget5/translations/qtermwidget_da.qm
+share/qtermwidget5/translations/qtermwidget_de.qm
+share/qtermwidget5/translations/qtermwidget_el.qm
+share/qtermwidget5/translations/qtermwidget_es.qm
+share/qtermwidget5/translations/qtermwidget_fr.qm
+share/qtermwidget5/translations/qtermwidget_gl.qm
+share/qtermwidget5/translations/qtermwidget_he.qm
+share/qtermwidget5/translations/qtermwidget_hu.qm
+share/qtermwidget5/translations/qtermwidget_ja.qm
+share/qtermwidget5/translations/qtermwidget_lt.qm
+share/qtermwidget5/translations/qtermwidget_nb_NO.qm
+share/qtermwidget5/translations/qtermwidget_pl.qm
+share/qtermwidget5/translations/qtermwidget_pt.qm
+share/qtermwidget5/translations/qtermwidget_tr.qm
+share/qtermwidget5/translations/qtermwidget_zh_CN.qm
+share/qtermwidget5/translations/qtermwidget_zh_TW.qm
diff --git a/qtermwidget/TODO b/qtermwidget/TODO
deleted file mode 100644
index b84dff6676..0000000000
--- a/qtermwidget/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-[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/buildlink3.mk b/qtermwidget/buildlink3.mk
new file mode 100644
index 0000000000..3a4cbd394d
--- /dev/null
+++ b/qtermwidget/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= qtermwidget
+
+.if !defined(QTERMWIDGET_BUILDLINK3_MK)
+QTERMWIDGET_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qtermwidget+= qtermwidget>=0.14.1
+BUILDLINK_PKGSRCDIR.qtermwidget?= ../../wip/qtermwidget
+
+.endif # QTERMWIDGET_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -qtermwidget
diff --git a/qtermwidget/distinfo b/qtermwidget/distinfo
index 47a3533d92..59e6de76c9 100644
--- a/qtermwidget/distinfo
+++ b/qtermwidget/distinfo
@@ -4,4 +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
+SHA1 (patch-lib_kpty.cpp) = c72855ea1ae4c0ddd2a77ebdd2e53b25153d0db7
diff --git a/qtermwidget/patches/patch-lib_kpty.cpp b/qtermwidget/patches/patch-lib_kpty.cpp
index e2dc9a044b..d746cd86db 100644
--- a/qtermwidget/patches/patch-lib_kpty.cpp
+++ b/qtermwidget/patches/patch-lib_kpty.cpp
@@ -1,6 +1,6 @@
$NetBSD$
-Allow kpty to find libutil
+Allow the package to build on NetBSD.
--- lib/kpty.cpp.orig 2019-02-25 22:13:12.000000000 +0000
+++ lib/kpty.cpp
@@ -13,15 +13,25 @@ Allow kpty to find libutil
#define HAVE_LOGIN
#define HAVE_LIBUTIL_H
#endif
-@@ -37,6 +37,11 @@
+@@ -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,7 +180,7 @@ KPtyPrivate::~KPtyPrivate()
+ {
+ }
+
+-#ifndef HAVE_OPENPTY
++#ifndef __APPLE__
+ bool KPtyPrivate::chownpty(bool)
+ {
+ // return !QProcess::execute(KStandardDirs::findExe("kgrantpty"),
Home |
Main Index |
Thread Index |
Old Index