summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Bachmann <manuel.bachmann@open.eurogiciel.org>2014-08-18 16:39:29 +0200
committerManuel Bachmann <manuel.bachmann@open.eurogiciel.org>2014-08-18 16:39:29 +0200
commitc2676b75a9f770dccd9b1e6f00b657f78e5c74dc (patch)
tree983eaee2574b25660f4811168ae09ea698154c1e
parent0ed9f927f23d9d06e550641fc14c3bb45db4d537 (diff)
downloadchromium-sandbox/mbachmann/chromium-blink.tar.gz
chromium-sandbox/mbachmann/chromium-blink.tar.bz2
chromium-sandbox/mbachmann/chromium-blink.zip
packaging: fix component search pathssandbox/mbachmann/chromium-blink
When using GBS in "nested" mode like we do, various paths are not correct. Fix them by adding "..\.." at the beginning. This fixes the case where we enable component building ("component=shared_library") in Chromium. Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
-rw-r--r--packaging/0002-fix_component_paths.patch46
-rw-r--r--packaging/chromium-blink.spec2
2 files changed, 48 insertions, 0 deletions
diff --git a/packaging/0002-fix_component_paths.patch b/packaging/0002-fix_component_paths.patch
new file mode 100644
index 000000000000..4817cc257e03
--- /dev/null
+++ b/packaging/0002-fix_component_paths.patch
@@ -0,0 +1,46 @@
+--- Source/web/web.gyp
++++ Source/web/web.gyp
+@@ -83,26 +83,26 @@
+ '../core/core.gyp:webcore_testing',
+ '../modules/modules.gyp:modules_testing',
+ '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
+- '<(DEPTH)/base/base.gyp:test_support_base',
+- '<(DEPTH)/testing/gmock.gyp:gmock',
+- '<(DEPTH)/testing/gtest.gyp:gtest',
+- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+- '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
+- '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
+- '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+- '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
+- '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
+- '<(DEPTH)/third_party/ots/ots.gyp:ots',
+- '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+- '<(DEPTH)/url/url.gyp:url_lib',
+- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+- '<(libjpeg_gyp_path):libjpeg',
++ '../../<(DEPTH)/base/base.gyp:test_support_base',
++ '../../<(DEPTH)/testing/gmock.gyp:gmock',
++ '../../<(DEPTH)/testing/gtest.gyp:gtest',
++ '../../<(DEPTH)/third_party/icu/icu.gyp:icuuc',
++ '../../<(DEPTH)/third_party/icu/icu.gyp:icui18n',
++ '../../<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
++ '../../<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
++ '../../<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
++ '../../<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
++ '../../<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
++ '../../<(DEPTH)/third_party/ots/ots.gyp:ots',
++ '../../<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
++ '../../<(DEPTH)/url/url.gyp:url_lib',
++ '../../<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
++ '../../<(libjpeg_gyp_path):libjpeg',
+ # We must not add webkit_support here because of cyclic dependency.
+ ],
+ 'export_dependent_settings': [
+- '<(DEPTH)/url/url.gyp:url_lib',
+- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
++ '../../<(DEPTH)/url/url.gyp:url_lib',
++ '../../<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ ],
+ 'sources': [
+ # Compile Blink unittest files into blink_web.dll in component build mode
diff --git a/packaging/chromium-blink.spec b/packaging/chromium-blink.spec
index 2d6c14757213..7ea9217a6558 100644
--- a/packaging/chromium-blink.spec
+++ b/packaging/chromium-blink.spec
@@ -10,6 +10,7 @@ Url: https://chromium.googlesource.com/chromium
Source0: %name-%version.tar.xz
Source1: %name.manifest
Patch1: 0001-fix_various_paths.patch
+Patch2: 0002-fix_component_paths.patch
%description
Web Engine, originally a fork of WebKit. (PATCHED BY CHROMIUM)
@@ -19,6 +20,7 @@ Web Engine, originally a fork of WebKit. (PATCHED BY CHROMIUM)
cp %{SOURCE1} .
%patch1
+%patch2
%build