Bug 60887 - [Qt][Wk2][Symbian] Fix build after r86560
Summary: [Qt][Wk2][Symbian] Fix build after r86560
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Siddharth Mathur
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2011-05-16 08:09 PDT by Siddharth Mathur
Modified: 2011-05-16 10:27 PDT (History)
1 user (show)

See Also:


Attachments
build fix for Symbian buildbot (1.91 KB, patch)
2011-05-16 08:11 PDT, Siddharth Mathur
no flags Details | Formatted Diff | Diff
try 2: build fix for Symbian buildbot (4.99 KB, patch)
2011-05-16 10:17 PDT, Siddharth Mathur
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Siddharth Mathur 2011-05-16 08:09:09 PDT
In Bug 55875, we started using USE(UNIX_DOMAIN_SOCKETS) to guard Qt-Unix and Gtk code which uses code dependent on Unix domain socket IPC. 
r86560 (http://trac.webkit.org/changeset/86560) should have guarded ArgumentDecoder.cpp and ArgumentEncoder.cpp too, otherwise Qt-Symbian build breaks.
Comment 1 Siddharth Mathur 2011-05-16 08:11:38 PDT
Created attachment 93644 [details]
build fix for Symbian buildbot

Fixes build failure: http://build.webkit.sed.hu/builders/Qt%20Symbian%20ARMv5%20Release/builds/1044/steps/compile%20Source/logs/stdio
Comment 2 Csaba Osztrogonác 2011-05-16 08:19:42 PDT
Comment on attachment 93644 [details]
build fix for Symbian buildbot

View in context: https://bugs.webkit.org/attachment.cgi?id=93644&action=review

> Source/WebKit2/ChangeLog:10
> +        (CoreIPC::ArgumentDecoder::~ArgumentDecoder): guard Unix and Gtk code with HAVE(UNIX_DOMAIN_SOCKETS)
> +        * Platform/CoreIPC/ArgumentEncoder.cpp:

r=me with change HAVE to USE.
Please fix it before landing.
Comment 3 Csaba Osztrogonác 2011-05-16 08:26:50 PDT
Landed in http://trac.webkit.org/changeset/86574
Comment 4 Siddharth Mathur 2011-05-16 10:13:13 PDT
Build still busted, re-opening
Comment 5 Siddharth Mathur 2011-05-16 10:17:55 PDT
Created attachment 93663 [details]
try 2: build fix for Symbian buildbot

Balazs had moved some of key QT||GTK defines to UNIX_DOMAIN_SOCKET guards, so I was caught off guard. My bad. 
My intention was to land Symbian parts in separate Bug 55875 (Shared Memory) and Bug 55877 (Core IPC and Process launching) 

In any case, here is a somewhat hacky middle ground to keep Symbian bot green until I re-baseline the Core IPC patch in Bug 55877 and get it landed.
Comment 6 Csaba Osztrogonác 2011-05-16 10:23:21 PDT
Comment on attachment 93663 [details]
try 2: build fix for Symbian buildbot

It is a little bit ugly workaround, but rs=me until the real fix landed.
Comment 7 Csaba Osztrogonác 2011-05-16 10:27:49 PDT
I landed it manually after I removed the unnecessarz trailing whitespaces: http://trac.webkit.org/changeset/86585