From 26b7fee65a3c23a9c2447d549668f373bfa76bae Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 1 Jul 2014 17:36:38 +0200
Subject: qtwebengine: Add 2 more patches to fix do_configure and fix QA
 warning

* otherwise moc generated files have the same basename and do_configure fails with:
  core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
  |   javascript_dialog_controller: javascript_dialog_controller.cpp
  | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
  ...

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...ild-time-only-dependency-on-x11-libraries.patch | 137 ---------------------
 1 file changed, 137 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch

(limited to 'recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch')

diff --git a/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch b/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch
deleted file mode 100644
index 7ee38d0c..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-Drop-build-time-only-dependency-on-x11-libraries.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From f5c8e973f0a246691b71c256361bfa82619ee2ef Mon Sep 17 00:00:00 2001
-From: Simon Busch <morphis@gravedo.de>
-Date: Fri, 20 Jun 2014 09:05:12 +0200
-Subject: [PATCH 1/2] Drop build time only dependency on x11 libraries
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
----
- src/3rdparty/chromium/build/linux/system.gyp | 114 ---------------------------
- 1 file changed, 114 deletions(-)
-
-diff --git a/src/3rdparty/chromium/build/linux/system.gyp b/src/3rdparty/chromium/build/linux/system.gyp
-index 9911317..85016b8 100644
---- a/src/3rdparty/chromium/build/linux/system.gyp
-+++ b/src/3rdparty/chromium/build/linux/system.gyp
-@@ -786,119 +786,5 @@
-         }],
-       ],
-     },
--    {
--      'target_name': 'x11',
--      'type': 'none',
--      'toolsets': ['host', 'target'],
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags x11)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l x11 xi)',
--            ],
--          },
--        }, {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(pkg-config --cflags x11)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
--            ],
--            'libraries': [
--              '<!@(pkg-config --libs-only-l x11 xi)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xext',
--      'type': 'none',
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xext)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xext)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xfixes',
--      'type': 'none',
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xfixes)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xfixes)',
--            ],
--          },
--        }],
--      ],
--    },
--    {
--      'target_name': 'xrandr',
--      'type': 'none',
--      'toolsets': ['host', 'target'],
--      'conditions': [
--        ['_toolset=="target"', {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(<(pkg-config) --cflags xrandr)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
--            ],
--            'libraries': [
--              '<!@(<(pkg-config) --libs-only-l xrandr)',
--            ],
--          },
--        }, {
--          'direct_dependent_settings': {
--            'cflags': [
--              '<!@(pkg-config --cflags xrandr)',
--            ],
--          },
--          'link_settings': {
--            'ldflags': [
--              '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
--            ],
--            'libraries': [
--              '<!@(pkg-config --libs-only-l xrandr)',
--            ],
--          },
--        }],
--      ],
--    },
-   ],
- }
--- 
-1.9.1
-
-- 
cgit v1.2.3-54-g00ecf