From owner-svn-ports-head@freebsd.org Wed Jan 23 14:55:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC3FF14AA956; Wed, 23 Jan 2019 14:55:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 513A076391; Wed, 23 Jan 2019 14:55:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 414EA1A481; Wed, 23 Jan 2019 14:55:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0NEt32G021554; Wed, 23 Jan 2019 14:55:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0NEt3kY021553; Wed, 23 Jan 2019 14:55:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201901231455.x0NEt3kY021553@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 23 Jan 2019 14:55:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491042 - head/www/firefox/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/www/firefox/files X-SVN-Commit-Revision: 491042 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 513A076391 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2019 14:55:03 -0000 Author: jbeich Date: Wed Jan 23 14:55:02 2019 New Revision: 491042 URL: https://svnweb.freebsd.org/changeset/ports/491042 Log: www/firefox: unbreak WAYLAND=off build after r490910 In file included from ../.build/gfx/webrender_bindings/Unified_cpp_webrender_bindings0.cpp:20: gfx/webrender_bindings/RenderCompositor.cpp:35:47: error: use of undeclared identifier 'RenderCompositorEGL'; did you mean 'RenderCompositorOGL'? UniquePtr eglCompositor = RenderCompositorEGL::Create(aWidget); ^~~~~~~~~~~~~~~~~~~ RenderCompositorOGL ../.build/dist/include/mozilla/webrender/RenderCompositorOGL.h:16:7: note: 'RenderCompositorOGL' declared here class RenderCompositorOGL : public RenderCompositor { ^ In file included from ../.build/gfx/webrender_bindings/Unified_cpp_webrender_bindings0.cpp:20: gfx/webrender_bindings/RenderCompositor.cpp:35:75: error: rvalue reference to type 'RefPtr<...>' cannot bind to lvalue of type 'RefPtr<...>' UniquePtr eglCompositor = RenderCompositorEGL::Create(aWidget); ^~~~~~~ ../.build/dist/include/mozilla/webrender/RenderCompositorOGL.h:19:42: note: passing argument to parameter 'aWidget' here RefPtr&& aWidget); ^ PR: 233791 Reported by: many Modified: head/www/firefox/files/patch-bug1514156 (contents, props changed) Modified: head/www/firefox/files/patch-bug1514156 ============================================================================== --- head/www/firefox/files/patch-bug1514156 Wed Jan 23 14:40:53 2019 (r491041) +++ head/www/firefox/files/patch-bug1514156 Wed Jan 23 14:55:02 2019 (r491042) @@ -98,7 +98,7 @@ index 051482fbabbf..a58268096a89 100644 } #endif + -+#ifdef MOZ_WIDGET_GTK ++#ifdef MOZ_WAYLAND + UniquePtr eglCompositor = RenderCompositorEGL::Create(aWidget); + if (eglCompositor) { + return eglCompositor; @@ -371,13 +371,15 @@ diff --git widget/gtk/CompositorWidgetParent.cpp widge index ae49ec9174bc..b4031883d3a8 100644 --- widget/gtk/CompositorWidgetParent.cpp +++ widget/gtk/CompositorWidgetParent.cpp -@@ -40,5 +40,11 @@ mozilla::ipc::IPCResult CompositorWidgetParent::RecvNotifyClientSizeChanged( +@@ -40,5 +40,13 @@ mozilla::ipc::IPCResult CompositorWidgetParent::RecvNotifyClientSizeChanged( return IPC_OK(); } +mozilla::ipc::IPCResult CompositorWidgetParent::RecvRequestsUpdatingEGLSurface() +{ ++#ifdef MOZ_WAYLAND + RequestsUpdatingEGLSurface(); ++#endif + return IPC_OK(); +} + @@ -400,13 +402,16 @@ diff --git widget/gtk/GtkCompositorWidget.cpp widget/g index bc21d6c4d05e..f787e8c23797 100644 --- widget/gtk/GtkCompositorWidget.cpp +++ widget/gtk/GtkCompositorWidget.cpp -@@ -17,7 +17,8 @@ namespace widget { +@@ -17,7 +17,11 @@ namespace widget { GtkCompositorWidget::GtkCompositorWidget( const GtkCompositorWidgetInitData& aInitData, const layers::CompositorOptions& aOptions, nsWindow* aWindow) - : CompositorWidget(aOptions), mWidget(aWindow) { -+ : CompositorWidget(aOptions), mWidget(aWindow), -+ mWaylandRequestsUpdatingEGLSurface(false) { ++ : CompositorWidget(aOptions), mWidget(aWindow) ++#ifdef MOZ_WAYLAND ++ , mWaylandRequestsUpdatingEGLSurface(false) ++#endif ++ { // If we have a nsWindow, then grab the already existing display connection // If we don't, then use the init data to connect to the display if (aWindow) { @@ -444,7 +449,7 @@ index fd0c71426c18..75e156dffb02 100644 // CompositorWidgetDelegate Overrides PlatformCompositorWidgetDelegate* AsPlatformSpecificDelegate() override { -@@ -62,11 +66,16 @@ class GtkCompositorWidget : public CompositorWidget, +@@ -62,11 +66,18 @@ class GtkCompositorWidget : public CompositorWidget, void NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize) override; @@ -457,7 +462,9 @@ index fd0c71426c18..75e156dffb02 100644 private: LayoutDeviceIntSize mClientSize; ++#ifdef MOZ_WAYLAND + bool mWaylandRequestsUpdatingEGLSurface; ++#endif Display* mXDisplay; Window mXWindow;