From 6566f728ab3d14a4908516fb13ad555dbfe04471 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Thu, 11 Dec 2014 15:52:18 +1100
Subject: recipes: upgrade from 5.3.2 to 5.4.0

MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 ...op-build-time-only-dependency-on-x11-libr.patch | 139 ---------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch

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

diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
deleted file mode 100644
index abd351a6..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 0c59430e6b919d4ffec80bfa6b50b9ce9953ac21 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] <chromium> Drop build time only dependency on x11
- libraries
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- 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)',
--            ],
--          },
--        }],
--      ],
--    },
-   ],
- }
--- 
-2.0.0
-
-- 
cgit v1.2.3-54-g00ecf