qtcreator: incomplete update to 4.13.2

[Maya Rashish <maya%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Fri Nov 27 13:08:42 2020 +0200
Changeset:	1589f2f093ce9dff8e6441a46c5f32ac714c4251

Modified Files:
	qtcreator/Makefile
	qtcreator/distinfo
Removed Files:
	qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
	qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp

Log Message:
qtcreator: incomplete update to 4.13.2

this doesn't build, but neither did the previous version

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

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

diffstat:
 qtcreator/Makefile                                 |  3 +-
 qtcreator/distinfo                                 | 10 ++---
 .../patch-src_plugins_projectexplorer_abi.cpp      | 40 -----------------
 ...ared_qbs_src_lib_corelib_tools_processutils.cpp | 51 ----------------------
 4 files changed, 6 insertions(+), 98 deletions(-)

diffs:
diff --git a/qtcreator/Makefile b/qtcreator/Makefile
index ca9849fcd0..8034cfce43 100644
--- a/qtcreator/Makefile
+++ b/qtcreator/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.11 2012/12/15 08:27:24 asau Exp $
 
-DISTNAME=	qt-creator-opensource-src-4.0.1
+DISTNAME=	qt-creator-opensource-src-4.13.2
 PKGNAME=	${DISTNAME:S/qt-/qt/:S/-opensource-src//}
 CATEGORIES=	devel
 MASTER_SITES=	http://download.qt.io/official_releases/${PKGBASE}/${PKGVERSION_NOREV:R}/${PKGVERSION_NOREV}/
@@ -67,6 +67,7 @@ do-configure:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtserialport/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qtcreator/distinfo b/qtcreator/distinfo
index 94361b3299..f59cdb4451 100644
--- a/qtcreator/distinfo
+++ b/qtcreator/distinfo
@@ -1,8 +1,6 @@
 $NetBSD: distinfo,v 1.6 2012/11/26 01:05:10 fwsf Exp $
 
-SHA1 (qt-creator-opensource-src-4.0.1.zip) = 2ab795222850cf9735661c02ac7ee27abcbdb1ef
-RMD160 (qt-creator-opensource-src-4.0.1.zip) = 636d52578f0a7c9f5b32de1e78dfc09fe8a5c400
-SHA512 (qt-creator-opensource-src-4.0.1.zip) = 8685641b225186c121d1ad0e77817a0dd1c018240e9bfd095f66650eadd007711c291e79c01f2d307b65e2dd95a2408c72dd943a2484669d42da006a169b4045
-Size (qt-creator-opensource-src-4.0.1.zip) = 30243285 bytes
-SHA1 (patch-src_plugins_projectexplorer_abi.cpp) = 61f416b01fad576ed880bfbcc98647177462e3b6
-SHA1 (patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp) = 9a500ceedaf04b697dc8b709ba14bbd890c70923
+SHA1 (qt-creator-opensource-src-4.13.2.zip) = 8665c26a95f4e83b85840abd40dd949163a120fb
+RMD160 (qt-creator-opensource-src-4.13.2.zip) = ecdba94f789ffd1747a0c6edfdff79e0bf509437
+SHA512 (qt-creator-opensource-src-4.13.2.zip) = efbe7f4ee6ccfcd32ecd182e4a7c88023df86790771c1621b732530fa8bb1f125f0e809c92806903e401a6192df9b3876cc87bae4b504c4e4fbf2e5407b0203a
+Size (qt-creator-opensource-src-4.13.2.zip) = 65177262 bytes
diff --git a/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp b/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
deleted file mode 100644
index 5ee3055ade..0000000000
--- a/qtcreator/patches/patch-src_plugins_projectexplorer_abi.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-Cherry-pick upstream patch by Ralf Nolden:
-https://codereview.qt-project.org/#/c/162330/2/src/plugins/projectexplorer/abi.cpp
-
---- src/plugins/projectexplorer/abi.cpp.orig	2016-06-06 13:26:59.000000000 +0000
-+++ src/plugins/projectexplorer/abi.cpp
-@@ -199,12 +199,20 @@ static QList<Abi> abiOf(const QByteArray
-         Abi::OSFlavor flavor = Abi::GenericUnixFlavor;
-         // http://www.sco.com/developers/gabi/latest/ch4.eheader.html#elfid
-         switch (osAbi) {
--        case 2: // NetBSD:
-+#if defined(Q_OS_NETBSD)
-+        case 0: // NetBSD: ELFOSABI_NETBSD  2, however, NetBSD uses 0
-             os = Abi::BsdOS;
-             flavor = Abi::NetBsdFlavor;
-             break;
-+#elif defined(Q_OS_OPENBSD)
-+	case 0: // OpenBSD: ELFOSABI_OPENBSD 12, however, OpenBSD uses 0
-+		os = Abi::BsdOS;
-+		flavor = Abi::OpenBsdFlavor;
-+		break;
-+#else
-+	case 0: // no extra info available: Default to Linux
-+#endif
-         case 3: // Linux:
--        case 0: // no extra info available: Default to Linux:
-         case 97: // ARM, also linux most of the time.
-             os = Abi::LinuxOS;
-             flavor = Abi::GenericLinuxFlavor;
-@@ -217,9 +225,6 @@ static QList<Abi> abiOf(const QByteArray
-             os = Abi::BsdOS;
-             flavor = Abi::FreeBsdFlavor;
-             break;
--        case 12: // OpenBSD:
--            os = Abi::BsdOS;
--            flavor = Abi::OpenBsdFlavor;
-         }
- 
-         switch (machine) {
diff --git a/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp b/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp
deleted file mode 100644
index 6411445421..0000000000
--- a/qtcreator/patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-Implement for NetBSD.
-
-Upstream approved newer patch by Ralf Nolden support as well (it adds FreeBSD and OpenBSD):
-https://codereview.qt-project.org/#/c/162259/5/src/lib/corelib/tools/processutils.cpp
-
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig	2016-06-02 14:28:45.000000000 +0000
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp
-@@ -40,10 +40,14 @@
- #   include "fileinfo.h"
- #   include <unistd.h>
- #   include <cstdio>
--#elif defined(Q_OS_BSD4)
-+#elif defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
- #   include <libutil.h>
- #   include <sys/types.h>
- #   include <sys/user.h>
-+#elif defined(Q_OS_NETBSD)
-+#   include <sys/cdefs.h>
-+#   include <sys/param.h>
-+#   include <sys/sysctl.h>
- #else
- #   error Missing implementation of processNameByPid for this platform.
- #endif
-@@ -81,13 +85,24 @@ QString processNameByPid(qint64 pid)
-     sprintf(exePath, "/proc/%lld/exe", pid);
-     readlink(exePath, buf, sizeof(buf));
-     return FileInfo::fileName(QString::fromUtf8(buf));
--#elif defined(Q_OS_BSD4)
-+#elif defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
-     kinfo_proc *proc = kinfo_getproc(pid);
-     if (!proc)
-         return QString();
-     QString name = QString::fromUtf8(proc->ki_comm);
-     free(proc);
-     return name;
-+#elif defined(Q_OS_NETBSD)
-+    struct kinfo_proc2 kp;
-+    int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), 1 };
-+    size_t len = sizeof(kp);
-+    u_int mib_len = sizeof(mib)/sizeof(u_int);
-+    if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0)
-+        return QString();
-+    if (kp.p_pid != pid)
-+        return QString();
-+    QString name = QString::fromUtf8(kp.p_comm);
-+    return name;
- #else
-     return QString();
- #endif