From 6b9b49ab29eef9cda5fbeef6242257af970240f7dae0c1c9fbd87e35b2216f6c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 5 Apr 2019 16:15:43 +0000 Subject: [PATCH] - 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). OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=480 --- fixes_for_qt5.13.patch | 19 +++++++++---------- virtualbox.changes | 6 ++++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 36dbcea..5fccd27 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -6,7 +6,7 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC /* apears to be defined on mac */ -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +typedef long int GLsizeiptr; @@ -22,7 +22,7 @@ Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h #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) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 #define GL_VERSION_1_5 1 #include -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50D00 typedef ptrdiff_t GLsizeiptr; +#else +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 typedef ptrdiff_t GLintptr; -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) ++#if QT_VERSION < 0x50d00 typedef ptrdiff_t GLsizeiptr; +#else +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 */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); - diff --git a/virtualbox.changes b/virtualbox.changes index cb2464b..5c56c4d 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 5 16:11:40 UTC 2019 - Larry Finger + +- 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