From 5a7612655114c1f0439c62f8ce3db10716e185a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 13 Jul 2019 18:25:17 +0200 Subject: [PATCH] - qt5 now defines GLsizeiptr - rel 4 --- VirtualBox.spec | 4 +++- qt5-gl.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 qt5-gl.patch diff --git a/VirtualBox.spec b/VirtualBox.spec index 3d32213..cfdd337 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,7 +42,7 @@ exit 1 %define qtver 5.6.0 -%define rel 3 +%define rel 4 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -83,6 +83,7 @@ Patch13: %{pname}-no-scrextend.patch Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch +Patch17: qt5-gl.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -561,6 +562,7 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep %patch14 -p0 %patch15 -p0 %patch16 -p0 +%patch17 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in diff --git a/qt5-gl.patch b/qt5-gl.patch new file mode 100644 index 0000000..d548008 --- /dev/null +++ b/qt5-gl.patch @@ -0,0 +1,11 @@ +--- VirtualBox-6.0.8/include/VBox/VBoxGL2D.h~ 2019-05-13 15:23:12.000000000 +0200 ++++ VirtualBox-6.0.8/include/VBox/VBoxGL2D.h 2019-07-13 17:31:31.183251092 +0200 +@@ -111,7 +111,7 @@ + typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); + + /* GL_ARB_pixel_buffer_object*/ +-#ifndef Q_WS_MAC ++#if 0 + /* apears to be defined on mac */ + typedef ptrdiff_t GLsizeiptr; + #endif -- 2.43.0