diff --git a/UserManual.pdf b/UserManual.pdf index 139dd60..cec9df6 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4050a3fd73d8c25d7f02cdaf8c0ad3e3ef10100f4d9d2d5ef1203498d8b7f33 -size 4330514 +oid sha256:30c3e77c5148d46f9f5c8b281ba3322f2348aed35a0db354802ba60ca2f26b24 +size 4335316 diff --git a/VirtualBox-6.0.6-patched.tar.bz2 b/VirtualBox-6.0.6-patched.tar.bz2 deleted file mode 100644 index 169f6df..0000000 --- a/VirtualBox-6.0.6-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6816256900ca78222c6f103efa231dc0c2ca8f8670720b4da50bb4e7493c50c9 -size 118577509 diff --git a/VirtualBox-6.0.8-patched.tar.bz2 b/VirtualBox-6.0.8-patched.tar.bz2 new file mode 100644 index 0000000..52192ad --- /dev/null +++ b/VirtualBox-6.0.8-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdba6c705fdca590b213d2bc456f8876280022ec82a3280ee49e4c553a9eb381 +size 118703619 diff --git a/fix_LTO_builds.patch b/fix_LTO_builds.patch new file mode 100644 index 0000000..419f68e --- /dev/null +++ b/fix_LTO_builds.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-6.0.6/Config.kmk +=================================================================== +--- VirtualBox-6.0.6.orig/Config.kmk ++++ VirtualBox-6.0.6/Config.kmk +@@ -21,6 +21,8 @@ + # Marker. + VBOX_ROOT_CONFIG_KMK_INCLUDED = 1 + ++# Turn off mangling for Link Time Option ++IPRT_IGNORE_TEST_MANGLING = 1 + + # + # kBuild stuff diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 90944e1..6fa5eaa 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +Index: VirtualBox-6.0.6/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +--- VirtualBox-6.0.6.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.0.6/include/VBox/VBoxGL2D.h @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,108 +11,131 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h #endif #ifndef GL_READ_ONLY -Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h +Index: VirtualBox-6.0.6/include/VBox/HostServices/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/include/VBox/HostServices/glext.h -+++ VirtualBox-6.0.4/include/VBox/HostServices/glext.h -@@ -3395,7 +3395,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/include/VBox/HostServices/glext.h ++++ VirtualBox-6.0.6/include/VBox/HostServices/glext.h +@@ -3395,7 +3395,10 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -@@ -465,7 +465,8 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +@@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; +#include ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -@@ -614,7 +614,7 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -@@ -465,7 +465,7 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -@@ -3708,7 +3708,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -@@ -6194,7 +6194,7 @@ typedef char GLchar; +--- VirtualBox-6.0.6.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +@@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h -@@ -3717,7 +3717,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h +@@ -3717,7 +3717,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h +Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/chromium.h -+++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h -@@ -499,7 +499,7 @@ PROC WINAPI wglGetProcAddress_prox( LPCS +--- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/chromium.h ++++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h +@@ -506,7 +506,11 @@ PROC WINAPI wglGetProcAddress_prox( LPCS #ifndef GL_VERSION_1_5 typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif /* prototype these functions for opengl_stub/getprocaddress.c */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); diff --git a/virtualbox.changes b/virtualbox.changes index b97a82b..e3c2c1e 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Thu May 16 17:50:44 UTC 2019 - Larry Finger + +- Version bump to 6.0.8 (released May 13 2019 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + +Core: fix saved state resume failures (bugs #18265 and #18331) +User interface: show full file location in New Medium window. +User interface: fix mouse click pass-through problems in multi-screen virtual machines (6.0.6 regression, bug #18567) +Graphics: fixed a crash when powering off a VM without graphics controller (bug #18570) +API: partial fix for dealing with VM config conflicting with other VMs related to medium UUIDs, now correctly flags VM as inaccessible (bug #17908) +Linux hosts: fix kernel module build breakage in non-default build set-ups (bug #18620, thank you Ambroz Bizjak) +Linux hosts: fix kernel module build breakage in debug build set-ups (bug #18621, thank you Ambroz Bizjak) +Windows guests: notice file size increases in shared folders which were missed in certain cases +Linux guests: make shared folders work with Linux 3.16.35 +Linux guests: fix incorrectly read-only shared folders (bug #18345) + +------------------------------------------------------------------- +Wed May 15 22:08:58 UTC 2019 - Larry Finger + +- Modify "fixes_for_qt13.1" for i586 builds qith Qt 5.13 + +------------------------------------------------------------------- +Tue Apr 30 22:50:12 UTC 2019 - Larry Finger + +- Limit all architectures to a maxium of 2 jobs. Without this restriction, 32-bit builds run + out of memory, and 64-bit builds get strange crashes. + +------------------------------------------------------------------- +Mon Apr 29 17:21:00 UTC 2019 - Larry Finger + +- LTO builds still failing. Reset flag to nil. + +- Changed the way that the spec file limits the 32-bit builds to 2 threads. boo#1133492. + If enough memory were allocated so that the full number of workers were allowed, the job would never be scheduled. + ------------------------------------------------------------------- Fri Apr 26 10:28:40 UTC 2019 - mvetter@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index e92e109..2306a52 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -38,11 +38,16 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile # Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp %global __provides_exclude ^libE?GL.so.1.*$ +# With 32-bit builds, the job limit cannot be larger than 2, otherwise the build runs out of memory. +# For 64-bit builds, no memory limit is reached when more jobs are run, but the builds crash with strange errors. +# For the above reasons, limit the number of jobs to 2. +%define _smp_mflags -j2 + %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir /usr/lib/udev/rules.d Name: virtualbox # ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!! -Version: 6.0.6 +Version: 6.0.8 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0-or-later @@ -438,7 +443,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch128 -p1 %patch129 -p1 -%if %{qt5ver} >= 51300 +%if %{qt5ver} >= 51300 %patch131 -p1 %endif %patch999 -p1 @@ -470,6 +475,7 @@ echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk # %build +# Disable LTO - Link Time Optimization %define _lto_cflags %{nil} #ensure we don't ever use them rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*} @@ -494,8 +500,7 @@ source ./env.sh # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui echo "build basic parts" -# To keep memory requirements within bounds, limit make to 2 jobs - %{_bindir}/kmk -j2 \ + %{_bindir}/kmk %_smp_mflags \ VBOX_GCC_WERR= \ KBUILD_VERBOSE=2 \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \