From c45fc409c14f2e4ccb1aacd0b8af36dbba399666 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Wed, 14 May 2014 14:39:26 +0200
Subject: [PATCH] Update eLinux patch to match the snapshot
This also updates the snapshot shasum.
Change-Id: I4c76585d3285d33d5af5369dbb56b52f2434ef82
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
.../chromium/0022-Adjust-gyp-defines-for-eLinux.patch | 9 ---------
src/3rdparty | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
index f478727e1..5be896da0 100644
--- a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
+++ b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
@@ -75,15 +75,6 @@ diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 1451afb..2a2c8bd 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
-@@ -5,7 +5,7 @@
- {
- 'variables': {
- 'conditions': [
-- ['sysroot!=""', {
-+ ['sysroot!="" and qt_os!="embedded_linux"', {
- 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
- }, {
- 'pkg-config': 'pkg-config'
@@ -506,6 +506,8 @@
{
'target_name': 'libpci',
diff --git a/src/3rdparty b/src/3rdparty
index 2d4f83984..a462a800b 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 2d4f839849d8de907d3addd09a0682a53bf47c6a
+Subproject commit a462a800bdf84baf6eca4fcc583684582d5419ce
--
GitLab