From b56b9d9c950ea218a93ad4f9f3bc822b55a40bc5 Mon Sep 17 00:00:00 2001 From: Viorel Date: Wed, 27 Jul 2022 10:31:31 +0300 Subject: Import virtualbox-6.1.12-patches-01.tar.xz from https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz Signed-off-by: Viorel Munteanu --- patches/001_virtualbox-5.0.16-mesa-check.patch | 36 ++++++++++++++++++++++ ...virtualbox-5.2.16-remove-configure-checks.patch | 11 +++++++ ...virtualbox-4.0.2-restore_old_machines_dir.patch | 12 ++++++++ patches/005_virtualbox-4.2.26-asneeded.patch | 11 +++++++ patches/006_virtualbox-4.2.18-vboxwebsrv_fix.patch | 15 +++++++++ ...09-virtualbox-5.1.0-add_missing_gl_header.patch | 12 ++++++++ .../011_virtualbox-6.0.0_beta2-xpcom_const.patch | 29 +++++++++++++++++ ...2_virtualbox-6.1.0-include_opengl_headers.patch | 18 +++++++++++ patches/014_virtualbox-6.0.14-Glsizeiptr.patch | 14 +++++++++ 9 files changed, 158 insertions(+) create mode 100644 patches/001_virtualbox-5.0.16-mesa-check.patch create mode 100644 patches/002_virtualbox-5.2.16-remove-configure-checks.patch create mode 100644 patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch create mode 100644 patches/005_virtualbox-4.2.26-asneeded.patch create mode 100644 patches/006_virtualbox-4.2.18-vboxwebsrv_fix.patch create mode 100644 patches/009-virtualbox-5.1.0-add_missing_gl_header.patch create mode 100644 patches/011_virtualbox-6.0.0_beta2-xpcom_const.patch create mode 100644 patches/012_virtualbox-6.1.0-include_opengl_headers.patch create mode 100644 patches/014_virtualbox-6.0.14-Glsizeiptr.patch diff --git a/patches/001_virtualbox-5.0.16-mesa-check.patch b/patches/001_virtualbox-5.0.16-mesa-check.patch new file mode 100644 index 0000000..67ade14 --- /dev/null +++ b/patches/001_virtualbox-5.0.16-mesa-check.patch @@ -0,0 +1,36 @@ +--- VirtualBox-5.0.16/configure ++++ VirtualBox-5.0.16/configure +@@ -1270,10 +1270,7 @@ + XCloseDisplay(dpy); + } + EOF +- [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"` +- if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then +- log_success "found" +- fi ++ test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs + } + + +@@ -1427,21 +1424,6 @@ + #include + extern "C" int main(void) + { +- Display *dpy; +- int major, minor; +- +- dpy = XOpenDisplay(NULL); +- if (dpy) +- { +- Bool glx_version = glXQueryVersion(dpy, &major, &minor); +- XCloseDisplay(dpy); +- if (glx_version) +- { +- printf("found version %u.%u, OK.\n", major, minor); +- return 0; +- } +- } +- printf("found (inactive), OK.\n"); + return 0; + } + EOF diff --git a/patches/002_virtualbox-5.2.16-remove-configure-checks.patch b/patches/002_virtualbox-5.2.16-remove-configure-checks.patch new file mode 100644 index 0000000..85cdb41 --- /dev/null +++ b/patches/002_virtualbox-5.2.16-remove-configure-checks.patch @@ -0,0 +1,11 @@ +--- VirtualBox-5.2.16/configure ++++ VirtualBox-5.2.16/configure +@@ -2824,7 +2824,7 @@ + check_compiler_h + [ $ONLY_ADDITIONS -eq 0 -a "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + # tools/common/makeself* +- [ $OSE -ge 1 ] && check_makeself ++ ##[ $OSE -ge 1 ] && check_makeself + fi + + [ -n "$SETUP_WINE" ] && setup_wine diff --git a/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch b/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch new file mode 100644 index 0000000..a79cd90 --- /dev/null +++ b/patches/003_virtualbox-4.0.2-restore_old_machines_dir.patch @@ -0,0 +1,12 @@ +--- VirtualBox-4.0.2_OSE/src/VBox/Main/src-server/SystemPropertiesImpl.cpp ++++ VirtualBox-4.0.2_OSE/src/VBox/Main/src-server/SystemPropertiesImpl.cpp +@@ -1035,7 +1035,8 @@ + // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs" + HRESULT rc = getUserHomeDirectory(path); + if (FAILED(rc)) return rc; +- path += RTPATH_SLASH_STR "VirtualBox VMs"; ++ path += RTPATH_SLASH_STR ".VirtualBox"; ++ path += RTPATH_SLASH_STR "Machines"; + } + + if (!RTPathStartsWithRoot(path.c_str())) diff --git a/patches/005_virtualbox-4.2.26-asneeded.patch b/patches/005_virtualbox-4.2.26-asneeded.patch new file mode 100644 index 0000000..4b53d16 --- /dev/null +++ b/patches/005_virtualbox-4.2.26-asneeded.patch @@ -0,0 +1,11 @@ +--- VirtualBox-4.2.26/Config.kmk ++++ VirtualBox-4.2.26/Config.kmk +@@ -4672,7 +4672,7 @@ + TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64 + TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64 + ifeq ($(KBUILD_HOST),linux) +-TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl ++TEMPLATE_VBoxBldProg_LIBS = pthread m rt dl crypt + else ifeq ($(KBUILD_HOST),os2) + TEMPLATE_VBoxBldProg_TOOL = GXX3OMF + TEMPLATE_VBoxBldProg_LIBS = socket iconv diff --git a/patches/006_virtualbox-4.2.18-vboxwebsrv_fix.patch b/patches/006_virtualbox-4.2.18-vboxwebsrv_fix.patch new file mode 100644 index 0000000..c22c4ce --- /dev/null +++ b/patches/006_virtualbox-4.2.18-vboxwebsrv_fix.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/482986 + +Patch by Nenad Peric (nenad.peric@sbb.rs) + +--- VirtualBox-4.2.18/configure ++++ VirtualBox-4.2.18/configure +@@ -2007,7 +2007,7 @@ + else + cnf_append "VBOX_GSOAP_CXX_SOURCES" "" + fi +- cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"`" ++ cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"` z" + gsoap_version=`pkg-config gsoapssl++ --modversion` + log_success "found version $gsoap_version" + return diff --git a/patches/009-virtualbox-5.1.0-add_missing_gl_header.patch b/patches/009-virtualbox-5.1.0-add_missing_gl_header.patch new file mode 100644 index 0000000..71f2adf --- /dev/null +++ b/patches/009-virtualbox-5.1.0-add_missing_gl_header.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/588794 + +--- a/include/VBox/VBoxGL2D.h ++++ b/include/VBox/VBoxGL2D.h +@@ -28,6 +28,7 @@ + #define __VBoxGLSupportInfo_h__ + + #include ++#include + + typedef char GLchar; + diff --git a/patches/011_virtualbox-6.0.0_beta2-xpcom_const.patch b/patches/011_virtualbox-6.0.0_beta2-xpcom_const.patch new file mode 100644 index 0000000..fa20634 --- /dev/null +++ b/patches/011_virtualbox-6.0.0_beta2-xpcom_const.patch @@ -0,0 +1,29 @@ +--- VirtualBox-6.0.0_BETA2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-6.0.0_BETA2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +@@ -55,7 +55,7 @@ + #endif + #include "nspr.h" // PR_fprintf + +-static char *PyTraceback_AsString(PyObject *exc_tb); ++static const char *PyTraceback_AsString(PyObject *exc_tb); + + // The internal helper that actually moves the + // formatted string to the target! +@@ -358,7 +358,7 @@ + */ + #define TRACEBACK_FETCH_ERROR(what) {errMsg = what; goto done;} + +-char *PyTraceback_AsString(PyObject *exc_tb) ++const char *PyTraceback_AsString(PyObject *exc_tb) + { + const char *errMsg = NULL; /* holds a local error message */ + char *result = NULL; /* a valid, allocated result. */ +@@ -438,7 +438,7 @@ + + { // a temp scope so I can use temp locals. + #if PY_MAJOR_VERSION <= 2 +- char *tempResult = PyString_AsString(obResult); ++ const char *tempResult = PyString_AsString(obResult); + #else + /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ + const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); diff --git a/patches/012_virtualbox-6.1.0-include_opengl_headers.patch b/patches/012_virtualbox-6.1.0-include_opengl_headers.patch new file mode 100644 index 0000000..12ecc56 --- /dev/null +++ b/patches/012_virtualbox-6.1.0-include_opengl_headers.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/702990 + +Submitted-by: Bernd Feige + +Index: VirtualBox-6.1.0/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +=================================================================== +--- VirtualBox-6.1.0/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-6.1.0/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +@@ -49,6 +49,9 @@ + #include + #endif + ++#include ++#include ++ + #ifdef VBOX_WITH_VIDEOHWACCEL + #include + #include diff --git a/patches/014_virtualbox-6.0.14-Glsizeiptr.patch b/patches/014_virtualbox-6.0.14-Glsizeiptr.patch new file mode 100644 index 0000000..a011dbf --- /dev/null +++ b/patches/014_virtualbox-6.0.14-Glsizeiptr.patch @@ -0,0 +1,14 @@ +--- a/include/VBox/VBoxGL2D.h 2020-01-25 22:48:54.000000000 +0700 ++++ b/include/VBox/VBoxGL2D.h 2020-01-25 22:57:14.000000000 +0700 +@@ -113,8 +113,8 @@ + + /* GL_ARB_pixel_buffer_object*/ +-#ifndef Q_WS_MAC ++/*#ifndef Q_WS_MAC*/ + /* apears to be defined on mac */ +-typedef ptrdiff_t GLsizeiptr; +-#endif ++/*typedef ptrdiff_t GLsizeiptr;*/ ++/*#endif*/ + + #ifndef GL_READ_ONLY -- cgit v1.2.3-65-gdbad