pkgsrc-WIP-changes archive

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

qt6-qtbase: fix build on systems use the older elfabi C define for GNU/Linux



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Tue Oct 4 22:21:15 2022 +0200
Changeset:	68caaa70afcbee16d60535e0826bd09764a80024

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

Log Message:
qt6-qtbase: fix build on systems use the older elfabi C define for GNU/Linux

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

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

diffstat:
 qt6-qtbase/distinfo                                  |  1 +
 .../patch-src_corelib_plugin_qelfparser__p.cpp       | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diffs:
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 67e4426e92..d26d1b8624 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -14,6 +14,7 @@ SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf9
 SHA1 (patch-src_corelib_global_qglobal.cpp) = 6368692c2d5d64633d956a89c6b4607667c121a7
 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_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
new file mode 100644
index 0000000000..48976ab479
--- /dev/null
+++ b/qt6-qtbase/patches/patch-src_corelib_plugin_qelfparser__p.cpp
@@ -0,0 +1,20 @@
+$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
+@@ -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;   
++#endif
+     case ELFOSABI_SOLARIS:  d << " (Solaris"; break;
+     case ELFOSABI_AIX:      d << " (AIX"; break;
+     case ELFOSABI_IRIX:     d << " (IRIX"; break;


Home | Main Index | Thread Index | Old Index