diff options
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qt5-conflicting-typedefs.patch | 70 | ||||
| -rw-r--r-- | gnu/packages/patches/qt5-runpath.patch | 16 |
2 files changed, 9 insertions, 77 deletions
diff --git a/gnu/packages/patches/qt5-conflicting-typedefs.patch b/gnu/packages/patches/qt5-conflicting-typedefs.patch deleted file mode 100644 index 751452c2db..0000000000 --- a/gnu/packages/patches/qt5-conflicting-typedefs.patch +++ /dev/null @@ -1,70 +0,0 @@ -See <https://bugreports.qt.io/browse/QTBUG-45205>. - -diff --git a/qtwebengine/src/core/chromium_gpu_helper.cpp b/qtwebengine/src/core/chromium_gpu_helper.cpp -index c7c97e6..ef574ec 100644 ---- a/qtwebengine/src/core/chromium_gpu_helper.cpp -+++ b/qtwebengine/src/core/chromium_gpu_helper.cpp -@@ -40,13 +40,15 @@ - - #include "chromium_gpu_helper.h" - --#include "content/common/gpu/gpu_channel_manager.h" --#include "content/common/gpu/sync_point_manager.h" --#include "content/gpu/gpu_child_thread.h" -+// Including gpu/command_buffer headers before content/gpu headers makes sure that -+// guards are defined to prevent duplicate definition errors with forward declared -+// GL typedefs cascading through content header includes. - #include "gpu/command_buffer/service/mailbox_manager.h" - #include "gpu/command_buffer/service/texture_manager.h" - --#include <QtGlobal> // We need this for the Q_OS_QNX define. -+#include "content/common/gpu/gpu_channel_manager.h" -+#include "content/common/gpu/sync_point_manager.h" -+#include "content/gpu/gpu_child_thread.h" - - #ifdef Q_OS_QNX - #include "content/common/gpu/stream_texture_qnx.h" -diff --git a/qtwebengine/src/core/gl_surface_qt.cpp b/qtwebengine/src/core/gl_surface_qt.cpp -index 4fe2f21..5a27aa9 100644 ---- a/qtwebengine/src/core/gl_surface_qt.cpp -+++ b/qtwebengine/src/core/gl_surface_qt.cpp -@@ -49,8 +49,6 @@ - #include "base/logging.h" - #include "base/memory/scoped_ptr.h" - #include "content/common/gpu/image_transport_surface.h" --#include "content/common/gpu/gpu_channel_manager.h" --#include "content/common/gpu/gpu_command_buffer_stub.h" - #include "ui/gl/egl_util.h" - #include "ui/gl/gl_context.h" - #include "ui/gl/gl_implementation.h" -@@ -544,7 +542,9 @@ GLSurface::CreateViewGLSurface(gfx::AcceleratedWidget window) - } // namespace gfx - - namespace content { --scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(GpuChannelManager* manager, GpuCommandBufferStub* stub, const gfx::GLSurfaceHandle& handle) -+class GpuCommandBufferStub; -+class GpuChannelManager; -+scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, GpuCommandBufferStub*, const gfx::GLSurfaceHandle&) - { - QT_NOT_USED - return scoped_refptr<gfx::GLSurface>(); -diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h -index 04a3dc3..506cf00 100644 ---- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h -+++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/gles2_cmd_format.h -@@ -20,6 +20,7 @@ - #include "gpu/command_buffer/common/cmd_buffer_common.h" - #include "gpu/command_buffer/common/gles2_cmd_ids.h" - -+#ifndef GL_VERSION_1_5 - // GL types are forward declared to avoid including the GL headers. The problem - // is determining which GL headers to include from code that is common to the - // client and service sides (GLES2 or one of several GL implementations). -@@ -47,6 +48,7 @@ typedef signed long long int GLsizeiptr; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; - #endif -+#endif - - namespace gpu { - namespace gles2 { diff --git a/gnu/packages/patches/qt5-runpath.patch b/gnu/packages/patches/qt5-runpath.patch index a6cbb26ff9..d045d39aaa 100644 --- a/gnu/packages/patches/qt5-runpath.patch +++ b/gnu/packages/patches/qt5-runpath.patch @@ -1,9 +1,11 @@ Allow the use of DT_RUNPATH. This fixes a bug whereby libQt5WebEngineCore.so ends up having an empty RUNPATH. ---- qt-everywhere-opensource-src-5.4.1/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-04-14 10:21:09.330925545 +0200 -+++ qt-everywhere-opensource-src-5.4.1/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-04-14 10:21:38.735106097 +0200 -@@ -4142,19 +4142,6 @@ + +diff -u -r qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/src/3rdparty/chromium/build/common.gypi qt-everywhere-opensource-src-5.5.0/qtwebengine/src/3rdparty/chromium/build/common.gypi +--- qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-06-29 22:09:36.000000000 +0200 ++++ qt-everywhere-opensource-src-5.5.0/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-07-25 15:32:57.999411191 +0200 +@@ -4448,19 +4448,6 @@ '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', ], }], @@ -19,7 +21,7 @@ ends up having an empty RUNPATH. - 'ldflags': [ - '-Wl,--disable-new-dtags', - ], -- }] - ], - }, - }], +- }], + ['gcc_version>=47 and clang==0', { + 'target_conditions': [ + ['_toolset=="target"', { |