qt6-qtbase: make a better patch for fixing missing ELFOSABI_GNU

[Niclas Rosenvik <nros%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Thu Nov 3 13:38:16 2022 +0100
Changeset:	7bd11e1fea2279951afdc7bd6d6d5a2ed5aaf900

Modified Files:
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp

Log Message:
qt6-qtbase: make a better patch for fixing missing ELFOSABI_GNU

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

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

diffstat:
 qt6-qtbase/distinfo                                |  2 +-
 .../patch-src_corelib_plugin_qelfparser__p.cpp     | 25 +++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index eea445872e..c9e1779b5a 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -16,7 +16,7 @@ SHA1 (patch-src_corelib_global_qlogging.cpp) = 34b4e80ed80a001de8df6278ee797244a
 SHA1 (patch-src_corelib_global_qversiontagging.h) = 7a91e19fe1eb9a5b97edb6be3a7bcbf6405b3eb8
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
-SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = 2a8c7b052472afaeb3b0e797625615072e1b4abf
+SHA1 (patch-src_corelib_plugin_qelfparser__p.cpp) = 61e943fb4359d7207ece7e128827a35d448644a9
 SHA1 (patch-src_corelib_qt__cmdline.cmake) = 25fe89821ba1e1323edae87ca1ee0bd5ccf0e407
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 47047f5af4383b622c59c3969145e44c6ac4bf18
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
diff --git a/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp b/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp
index 48976ab479..22b76c2aee 100644
--- a/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp
+++ b/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp
@@ -3,18 +3,17 @@ $NetBSD$
 * Support older ELFOSABI_LINUX that has been replaced with ELFOSABI_GNU.
   Needed on NetBSD 9.
 
---- src/corelib/plugin/qelfparser_p.cpp.orig	2022-10-04 19:58:26.404142170 +0000
+--- src/corelib/plugin/qelfparser_p.cpp.orig	2022-09-19 10:23:04.000000000 +0000
 +++ src/corelib/plugin/qelfparser_p.cpp
-@@ -329,7 +329,11 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
-     case ELFOSABI_SYSV:     d << " (SYSV"; break;
-     case ELFOSABI_HPUX:     d << " (HP-UX"; break;
-     case ELFOSABI_NETBSD:   d << " (NetBSD"; break;
--    case ELFOSABI_GNU:      d << " (GNU/Linux"; break;
-+#if defined(ELFOSABI_LINUX)
-+    case ELFOSABI_LINUX:    d << " (GNU/Linux"; break;
-+#else
-+    case ELFOSABI_GNU:      d << " (GNU/Linux"; break;   
+@@ -20,6 +20,11 @@
+ #  error "Need ELF header to parse plugins."
+ #endif
+ 
++// support older ELFOSABI define for GNU/Linux
++#if !defined(ELFOSABI_GNU) && defined(ELFOSABI_LINUX)
++#define ELFOSABI_GNU ELFOSABI_LINUX
 +#endif
-     case ELFOSABI_SOLARIS:  d << " (Solaris"; break;
-     case ELFOSABI_AIX:      d << " (AIX"; break;
-     case ELFOSABI_IRIX:     d << " (IRIX"; break;
++
+ QT_BEGIN_NAMESPACE
+ 
+ using namespace Qt::StringLiterals;