[chromium-freeworld: 59/148] fix el7 build, snapshot needs to be in if aura is
commit e456f1dcd25b761082a532e0899114b60c028f72
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Nov 4 13:32:06 2016 -0400
fix el7 build, snapshot needs to be in if aura is
chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch | 11 +++++++++++
chromium.spec | 11 +++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
b/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
new file mode 100644
index 0000000..0adb04a
--- /dev/null
+++ b/chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
@@ -0,0 +1,11 @@
+diff -up chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme
chromium-54.0.2840.90/chrome/browser/BUILD.gn
+--- chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme 2016-11-04 09:52:43.712072361
-0400
++++ chromium-54.0.2840.90/chrome/browser/BUILD.gn 2016-11-04 09:53:21.495864624 -0400
+@@ -605,6 +605,7 @@ split_static_library("browser") {
+ "//services/ui/public/cpp/input_devices",
+ "//ui/aura",
+ "//ui/compositor",
++ "//ui/snapshot",
+ "//ui/views/mus",
+ ]
+ }
diff --git a/chromium.spec b/chromium.spec
index 650fe83..e840bb3 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -94,7 +94,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: 54.0.2840.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -155,7 +155,10 @@ Patch26: chromium-54.0.2840.59-i686-ld-memory-tricks.patch
# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function
`content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size
const&, float, cc::SurfaceSequence const&)':
#
/builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214:
undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
Patch27: chromium-54.0.2840.90-setopaque.patch
-
+# /usr/bin/ld.bfd: obj/chrome/browser/libbrowser.a(native_desktop_media_list.o):
undefined reference to symbol
'_ZN2ui31GrabWindowSnapshotAndScaleAsyncEPN4aura6WindowERKN3gfx4RectERKNS3_4SizeE13scoped_refptrIN4base10TaskRunnerEERKNSB_8CallbackIFvRKNS3_5ImageEELNSB_8internal8CopyModeE1EEE'
+# /usr/bin/ld.bfd: note:
'_ZN2ui31GrabWindowSnapshotAndScaleAsyncEPN4aura6WindowERKN3gfx4RectERKNS3_4SizeE13scoped_refptrIN4base10TaskRunnerEERKNSB_8CallbackIFvRKNS3_5ImageEELNSB_8internal8CopyModeE1EEE'
is defined in DSO ./libsnapshot.so so try adding it to the linker command line
+# ./libsnapshot.so: could not read symbols: Invalid operation
+Patch28: chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -534,6 +537,7 @@ members of the Chromium and WebDriver teams.
%patch25 -p1 -b .jpegfix
%patch26 -p1 -b .ldmemory
%patch27 -p1 -b .setopaque
+%patch28 -p1 -b .aurasnapshot
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -1713,6 +1717,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Fri Nov 4 2016 Tom Callaway <spot(a)fedoraproject.org> 54.0.2840.90-3
+- when use_aura is on, chrome/browser needs to link to ui/snapshot
+
* Wed Nov 2 2016 Tom Callaway <spot(a)fedoraproject.org> 54.0.2840.90-2
- export setOpaque in cc_blink