-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
virtualbox: fix build with libxml 2.12 + gcc 13 #280675
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp | ||
index 8a9d15c0..260ebc5c 100644 | ||
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp | ||
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp | ||
@@ -46,6 +46,9 @@ | ||
#if defined(VBOX_VBGLR3_XFREE86) | ||
extern "C" { | ||
# define XFree86LOADER | ||
+# ifdef RT_GNUC_PREREQ(13,0) /* cmath gets dragged in and the c++/13/cmath header is allergic to -ffreestanding. */ | ||
+# define _GLIBCXX_INCLUDE_NEXT_C_HEADERS | ||
+# endif | ||
# include <xf86_ansic.h> | ||
# undef size_t | ||
} | ||
diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp | ||
index 2c5e9314..64890169 100644 | ||
--- a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp | ||
+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp | ||
@@ -1,3 +1,5 @@ | ||
+#include <cstdint> | ||
+ | ||
#include "util_matrix.h" | ||
|
||
namespace dxvk { | ||
diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h | ||
index 77cdf294..9dcb4bf9 100644 | ||
--- a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h | ||
+++ b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h | ||
@@ -1,5 +1,6 @@ | ||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <iostream> | ||
|
||
#include "util_bit.h" |
47 changes: 47 additions & 0 deletions
47
pkgs/applications/virtualization/virtualbox/libxml-2.12.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h | ||
index 40975e86..7639c281 100644 | ||
--- a/include/iprt/cpp/xml.h | ||
+++ b/include/iprt/cpp/xml.h | ||
@@ -113,9 +113,9 @@ public: | ||
class RT_DECL_CLASS XmlError : public RuntimeError | ||
{ | ||
public: | ||
- XmlError(xmlErrorPtr aErr); | ||
+ XmlError(const xmlError *aErr); | ||
|
||
- static char* Format(xmlErrorPtr aErr); | ||
+ static char* Format(const xmlError *aErr); | ||
}; | ||
|
||
// Logical errors | ||
diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp | ||
index a6661760..b301a6c6 100644 | ||
--- a/src/VBox/Runtime/r3/xml.cpp | ||
+++ b/src/VBox/Runtime/r3/xml.cpp | ||
@@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL) | ||
RTStrFree(msg); | ||
} | ||
|
||
-XmlError::XmlError(xmlErrorPtr aErr) | ||
+XmlError::XmlError(const xmlError *aErr) | ||
{ | ||
if (!aErr) | ||
throw EInvalidArg(RT_SRC_POS); | ||
@@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr) | ||
* Composes a single message for the given error. The caller must free the | ||
* returned string using RTStrFree() when no more necessary. | ||
*/ | ||
-/* static */ char *XmlError::Format(xmlErrorPtr aErr) | ||
+/* static */ char *XmlError::Format(const xmlError *aErr) | ||
{ | ||
const char *msg = aErr->message ? aErr->message : "<none>"; | ||
size_t msgLen = strlen(msg); | ||
@@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO | ||
va_end(args); | ||
} | ||
|
||
-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF | ||
+static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF | ||
{ | ||
NOREF(pCtx); | ||
/* we expect that there is always a trailing NL */ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there some reference for this? It seems rather magical.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I just copied it from upstream: https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp?rev=99876#L49