- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=476
This commit is contained in:
Larry Finger
Git OBS Bridge
parent
ba6b212140
commit
20daf12697
131
fixes_for_qt5.13.patch
Normal file
131
fixes_for_qt5.13.patch
Normal file
@ -0,0 +1,131 @@
|
||||
Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h
|
||||
+++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h
|
||||
@@ -113,8 +113,10 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
|
||||
/* GL_ARB_pixel_buffer_object*/
|
||||
#ifndef Q_WS_MAC
|
||||
/* apears to be defined on mac */
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_READ_ONLY
|
||||
# define GL_READ_ONLY 0x88B8
|
||||
Index: VirtualBox-6.0.4/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,8 +3395,10 @@ typedef char GLchar; /* native charact
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_ARB_vertex_buffer_object
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
Index: VirtualBox-6.0.4/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,9 @@ GLAPI void APIENTRY glBlendEquation (GLe
|
||||
#ifndef GL_VERSION_1_5
|
||||
#define GL_VERSION_1_5 1
|
||||
#include <stddef.h>
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t 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
|
||||
===================================================================
|
||||
--- 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,9 @@ GLAPI void APIENTRY glBlendEquation (GLe
|
||||
#ifndef GL_VERSION_1_5
|
||||
#define GL_VERSION_1_5 1
|
||||
#include <stddef.h>
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t 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
|
||||
===================================================================
|
||||
--- 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,9 @@ GLAPI void APIENTRY glBlendEquation (GLe
|
||||
#ifndef GL_VERSION_1_5
|
||||
#define GL_VERSION_1_5 1
|
||||
#include <stddef.h>
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t 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
|
||||
===================================================================
|
||||
--- 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,8 +3708,10 @@ typedef char GLchar; /* native charact
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_ARB_vertex_buffer_object
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
Index: VirtualBox-6.0.4/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,8 +6194,10 @@ typedef char GLchar;
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_ARB_vertex_buffer_object
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
Index: VirtualBox-6.0.4/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,8 +3717,10 @@ typedef char GLchar; /* native charact
|
||||
#ifndef GL_VERSION_1_5
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
typedef ptrdiff_t GLintptr;
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef GL_ARB_vertex_buffer_object
|
||||
/* GL types for handling large vertex buffer objects */
|
||||
Index: VirtualBox-6.0.4/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,9 @@ PROC WINAPI wglGetProcAddress_prox( LPCS
|
||||
#ifndef GL_VERSION_1_5
|
||||
|
||||
typedef ptrdiff_t GLintptr;
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
+#endif
|
||||
|
||||
/* prototype these functions for opengl_stub/getprocaddress.c */
|
||||
extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids);
|
||||
@ -1,7 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 27 17:53:11 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added.
|
||||
- Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 20 19:31:19 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user