[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     b9b44ce66013e1b517cff46a01fc6b2ec0a194c0
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 07:00:02 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 07:00:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=b9b44ce6

Backport libxml2 patch from 7.0.16 to live

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 patches/021_virtualbox-7.0.14-libxml2-2.12.patch   | 43 ----------------------
 patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch | 33 +++++++++++++++++
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/patches/021_virtualbox-7.0.14-libxml2-2.12.patch b/patches/021_virtualbox-7.0.14-libxml2-2.12.patch
deleted file mode 100644
index a523bad..0000000
--- a/patches/021_virtualbox-7.0.14-libxml2-2.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Bug: https://bugs.gentoo.org/922445
-
-The change in libxml2 is not backwards compatibe.
-A patch like the one in arch does not work with 2.11, so just cast the argument to maintain compatibility with both.
-
-The upstream change is in include/libxml/xmlerror.h:
-
- typedef xmlError *xmlErrorPtr;
-
--typedef void (*xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
-+typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error);
-
-See also: https://gitlab.archlinux.org/archlinux/packaging/packages/virtualbox/-/blob/main/019-libxml-2-12.patch?ref_type=heads
-
---- a/src/VBox/Runtime/r3/xml.cpp
-+++ b/src/VBox/Runtime/r3/xml.cpp
-@@ -1870,7 +1870,7 @@
-         throw std::bad_alloc();
-     /* per-thread so it must be here */
-     xmlSetGenericErrorFunc(NULL, xmlParserBaseGenericError);
--    xmlSetStructuredErrorFunc(NULL, xmlParserBaseStructuredError);
-+    xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc)xmlParserBaseStructuredError);
- }
- 
- XmlParserBase::~XmlParserBase()
-@@ -1931,7 +1931,7 @@
-                                                   pcszFilename,
-                                                   NULL,       // encoding = auto
-                                                   options)))
--        throw XmlError(xmlCtxtGetLastError(m_ctxt));
-+        throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt));
- 
-     doc.refreshInternals();
- }
-@@ -2191,7 +2191,7 @@
-                                               pcszFilename,
-                                               NULL,       // encoding = auto
-                                               options)))
--        throw XmlError(xmlCtxtGetLastError(m_ctxt));
-+        throw XmlError((xmlErrorPtr)xmlCtxtGetLastError(m_ctxt));
- 
-     doc.refreshInternals();
- }

diff --git a/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch b/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch
new file mode 100644
index 0000000..2ef7557
--- /dev/null
+++ b/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch
@@ -0,0 +1,33 @@
+Bug: https://bugs.gentoo.org/922445
+
+The change in libxml2 is not backwards compatibe.
+
+The upstream change is in include/libxml/xmlerror.h:
+
+ typedef xmlError *xmlErrorPtr;
+
+-typedef void (*xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
++typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error);
+
+Upstream fixed it for dev-libs/libxml2-2.12.6, but we need the fix for 2.12.5 as well.
+
+--- a/src/VBox/Runtime/r3/xml.cpp
++++ b/src/VBox/Runtime/r3/xml.cpp
+@@ -1856,7 +1856,7 @@
+     va_end(args);
+ }
+ 
+-#if LIBXML_VERSION >= 21206
++#if LIBXML_VERSION >= 21205
+ static void xmlStructuredErrorFunc(void *userData, const xmlError *error)  RT_NOTHROW_DEF
+ {
+     NOREF(userData);
+@@ -1878,7 +1878,7 @@
+         throw std::bad_alloc();
+     /* per-thread so it must be here */
+     xmlSetGenericErrorFunc(NULL, xmlParserBaseGenericError);
+-#if LIBXML_VERSION >= 21206
++#if LIBXML_VERSION >= 21205
+     xmlSetStructuredErrorFunc(NULL, xmlStructuredErrorFunc);
+ #else
+     xmlSetStructuredErrorFunc(NULL, xmlParserBaseStructuredError);

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     312d758820b7f5add5fe93275482dea5af817f66
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 05:10:42 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 05:10:42 2024 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=312d7588

Update patchset for virtualbox 7.1.0_beta1

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 patches/023_virtualbox-7.0.6-gcc-13.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/023_virtualbox-7.0.6-gcc-13.patch b/patches/023_virtualbox-7.0.6-gcc-13.patch
index ed3a2d0..16abbea 100644
--- a/patches/023_virtualbox-7.0.6-gcc-13.patch
+++ b/patches/023_virtualbox-7.0.6-gcc-13.patch
@@ -2,8 +2,8 @@ Add a few missing includes.
 
 Bug: https://bugs.gentoo.org/892852
 
---- 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
+--- a/src/libs/dxvk-2.3.1/src/util/util_matrix.cpp
++++ b/src/libs/dxvk-2.3.1/src/util/util_matrix.cpp
 @@ -1,3 +1,4 @@
 +#include <cstdint>
  #include "util_matrix.h"
@@ -16,8 +16,8 @@ Bug: https://bugs.gentoo.org/892852
 -}
 \ No newline at end of file
 +}
---- 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
+--- a/src/libs/dxvk-2.3.1/src/util/util_vector.h
++++ b/src/libs/dxvk-2.3.1/src/util/util_vector.h
 @@ -1,6 +1,7 @@
  #pragma once
  

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     3d495c946683be0b5bc501b660e83729007a3457
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:06:30 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:06:30 2024 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=3d495c94

Add patch to fix linking with mold

Bug: https://bugs.gentoo.org/925347
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 patches/027_virtualbox-7.1.0-link-with-mold.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/patches/027_virtualbox-7.1.0-link-with-mold.patch b/patches/027_virtualbox-7.1.0-link-with-mold.patch
new file mode 100644
index 0000000..3fbba09
--- /dev/null
+++ b/patches/027_virtualbox-7.1.0-link-with-mold.patch
@@ -0,0 +1,15 @@
+Add missing transitive dependency to fix linking with mold.
+
+https://bugs.gentoo.org/925347
+
+--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
+@@ -1669,7 +1669,7 @@
+ # The Qt modules we're using.
+ # (The include directory and lib/framework for each module will be added by the Qt unit.)
+ #
+-UICommon_QT_MODULES = Core Gui Widgets Help StateMachine
++UICommon_QT_MODULES = Core Gui Widgets Help PrintSupport StateMachine
+ ifdef VBOX_WITH_SCREENSAVER_CONTROL
+  UICommon_QT_MODULES.linux    += DBus
+  UICommon_QT_MODULES.linux    += Xml

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     fa605defe5e2aa575a2f47e2dc9985a2326a1c2e
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 16:06:51 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 16:06:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=fa605def

Add patch to use system dita-ot to build the docs

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../028_virtualbox-7.1.0-use-system-dita-ot.patch  | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch b/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch
new file mode 100644
index 0000000..e693543
--- /dev/null
+++ b/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch
@@ -0,0 +1,31 @@
+Starting with branch 7.1, upstream use dita-ot to build the manual.
+
+They seem to use an unbundled copy.
+
+Patch the Makefile to use dita-ot installed in the system.
+
+--- a/doc/manual/Makefile.kmk
++++ b/doc/manual/Makefile.kmk
+@@ -135,21 +135,9 @@
+  # @param 2    Parameters for the invoker.
+  #
+  VBOX_DITA_RUN_DOST = $(REDIRECT_EXT) \
+- 	-E 'ANT_HOME=$(VBOX_DITA_OT_PATH)' \
+- 	-E 'DITA_DIR=$(VBOX_DITA_OT_PATH)' \
+- 	-E 'JAVA_HOME=$(VBOX_JAVA17PLUS_HOME)' \
+- 	-E 'CLASSPATH=$(VBOX_DITA_CLASSPATH)' \
+  	$1 \
+  	-- \
+- 	"$(VBOX_JAVA17PLUS_HOME)/bin/java" \
+- 	"-Djava.awt.headless=true" \
+- 	"-Dsun.io.useCanonCaches=true" \
+- 	"-Dant.home=$(VBOX_DITA_OT_PATH)" \
+- 	"-Ddita.dir=$(VBOX_DITA_OT_PATH)" \
+- 	org.apache.tools.ant.launch.Launcher \
+- 	-cp "$(VBOX_DITA_CLASSPATH)" \
+- 	-buildfile "$(VBOX_DITA_OT_PATH)/build.xml" \
+- 	-main "org.dita.dost.invoker.Main" \
++ 	dita \
+  	--args.grammar.cache=yes \
+  	--verbose \
+  	$(if-expr defined(VBOX_DITA_DEBUG),"--clean.temp=no" "--debug",) \

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     f456eedd8ca5278573684f3601df933811f1ce82
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 15:44:34 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 15:44:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=f456eedd

Add C23 patch

Bug: https://bugs.gentoo.org/946955
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 patches/029_virtualbox-7.1.4_C23.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/patches/029_virtualbox-7.1.4_C23.patch b/patches/029_virtualbox-7.1.4_C23.patch
new file mode 100644
index 0000000..2ff466e
--- /dev/null
+++ b/patches/029_virtualbox-7.1.4_C23.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/946955
+
+--- a/include/iprt/types.h
++++ b/include/iprt/types.h
+@@ -281,8 +281,7 @@
+      typedef _Bool bool;
+ #   endif
+ #  else
+-#   undef bool /* see above netbsd explanation */
+-typedef _Bool bool;
++#   include <stdbool.h>
+ #  endif
+ # else
+ #  if RT_MSC_PREREQ(RT_MSC_VER_VC120)

[gentoo-commits] proj/virtualbox-patches:branch-7.1 commit in: patches/

[Viorel Munteanu]

commit:     d6d82e4561d30aca443dc301b7779c7b67b78588
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 16:26:27 2025 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 16:38:31 2025 +0000
URL:        https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=d6d82e45

Fix too big PXE NetBiosBinary

Bug: https://bugs.gentoo.org/947372
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 ...e-keep-size.patch => 024_virtualbox-7.0.22-ipxe-small-size.patch} | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/patches/024_virtualbox-7.0.8-mtune-keep-size.patch b/patches/024_virtualbox-7.0.22-ipxe-small-size.patch
similarity index 77%
rename from patches/024_virtualbox-7.0.8-mtune-keep-size.patch
rename to patches/024_virtualbox-7.0.22-ipxe-small-size.patch
index e37d9d6..1b5f11f 100644
--- a/patches/024_virtualbox-7.0.8-mtune-keep-size.patch
+++ b/patches/024_virtualbox-7.0.22-ipxe-small-size.patch
@@ -1,13 +1,16 @@
 Force -mtune=i386.  Random -mtune can lead to iPxeBiosBin.rom getting too
 large (larger than 56k).  This can happen because we support custom CFLAGS.
 
+Also disable -funroll-loops, see bug https://bugs.gentoo.org/947372
+
 --- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
 +++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
-@@ -125,6 +125,7 @@
+@@ -125,6 +125,8 @@
  	-ffreestanding \
  	-ffunction-sections \
  	-march=i386 \
 +	-mtune=i386 \
++	-fno-unroll-loops \
  	-fomit-frame-pointer \
  	-fstrength-reduce \
  	-falign-jumps=1 \