jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

- Fix file "fixes_for_qt5.13.patch" - macro QT_VERSION_CHECK is not available for Qt < 5.13.

Browse Source 
Substitute the equivalent (qtmajor << 16 + qtminor << 8).

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=480
This commit is contained in:
Larry Finger 2019-04-05 16:15:43 +00:00 committed by Git OBS Bridge
parent 606a5f1184
commit 6b9b49ab29
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fixes_for_qt5.13.patch
View File

@ -6,7 +6,7 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h
/* GL_ARB_pixel_buffer_object*/ /* GL_ARB_pixel_buffer_object*/
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
/* apears to be defined on mac */ /* apears to be defined on mac */
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -22,7 +22,7 @@ Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -38,7 +38,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
#include <stddef.h> #include <stddef.h>
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -54,7 +54,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
#include <stddef.h> #include <stddef.h>
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -70,7 +70,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
#include <stddef.h> #include <stddef.h>
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -86,7 +86,7 @@ Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -102,7 +102,7 @@ Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -118,7 +118,7 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50D00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -134,7 +134,7 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < 0x50d00
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
+#else +#else
+typedef long int GLsizeiptr; +typedef long int GLsizeiptr;
@ -142,4 +142,3 @@ Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h
/* prototype these functions for opengl_stub/getprocaddress.c */ /* prototype these functions for opengl_stub/getprocaddress.c */
extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids);

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 5 16:11:40 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Fix file "fixes_for_qt5.13.patch" - macro QT_VERSION_CHECK is not available for Qt < 5.13.
Substitute the equivalent (qtmajor << 16 + qtminor << 8).
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 31 21:02:36 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net> Sun Mar 31 21:02:36 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>