Bug 161475

Summary: webkit-gtk 2.13.90 fails to configure on darwin without wayland
Product: WebKit Reporter: Jeremy Huddleston Sequoia <jeremyhu>
Component: WebKitGTKAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: bugs-noreply, commit-queue
Priority: P2    
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
0001-GTK-Fix-configuration-without-wayland-support.patch
cgarcia: review+, cgarcia: commit-queue-
0001-GTK-Fix-configuration-without-wayland-support.patch (review comments addressed) none

Description Jeremy Huddleston Sequoia 2016-08-31 22:48:13 PDT
--->  Configuring webkit2-gtk-devel
Executing:  cd "/opt/local/var/macports/build/_Users_jeremy_src_macports_trunk_dports_www_webkit2-gtk-devel/webkit2-gtk-devel/work/build" && /opt/local/bin/cmake -DCMAKE_INSTALL_PREFIX=/opt/local -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COLOR_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_INSTALL_RPATH=/opt/local/lib -DCMAKE_INSTALL_NAME_DIR=/opt/local/lib -DCMAKE_SYSTEM_PREFIX_PATH="/opt/local;/usr" -DCMAKE_MODULE_PATH=/opt/local/share/cmake/Modules -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev -DPORT=GTK -DUSE_SYSTEM_MALLOC=ON -DENABLE_INTROSPECTION=ON -DENABLE_MINIBROWSER=OFF -DENABLE_VIDEO=ON -DENABLE_GTKDOC=OFF -DENABLE_QUARTZ_TARGET=OFF -DENABLE_X11_TARGET=ON -DENABLE_OPENGL=ON -DENABLE_PLUGIN_PROCESS_GTK2=ON -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" -DCMAKE_OSX_SYSROOT="/" ../webkitgtk-2.13.90 
...
-- Enabled features:
--  ENABLE_ACCELERATED_2D_CANVAS .......... OFF
--  ENABLE_CREDENTIAL_STORAGE               ON
--  ENABLE_DRAG_SUPPORT ................... ON
--  ENABLE_GEOLOCATION                      ON
--  ENABLE_GLES2 .......................... OFF
--  ENABLE_GTKDOC                           OFF
--  ENABLE_ICONDATABASE ................... ON
--  ENABLE_INTROSPECTION                    ON
--  ENABLE_JIT ............................ ON
--  ENABLE_MEMORY_SAMPLER                   OFF
--  ENABLE_MINIBROWSER .................... OFF
--  ENABLE_OPENGL                           ON
--  ENABLE_PLUGIN_PROCESS_GTK2 ............ ON
--  ENABLE_QUARTZ_TARGET                    OFF
--  ENABLE_SAMPLING_PROFILER .............. ON
--  ENABLE_SPELLCHECK                       ON
--  ENABLE_TOUCH_EVENTS ................... ON
--  ENABLE_VIDEO                            ON
--  ENABLE_WAYLAND_TARGET ................. OFF
--  ENABLE_WEB_AUDIO                        ON
--  ENABLE_X11_TARGET ..................... ON
--  USE_LIBHYPHEN                           ON
--  USE_LIBNOTIFY ......................... ON
--  USE_SYSTEM_MALLOC                       ON
-- Configuring done
CMake Error at Source/cmake/WebKitMacros.cmake:225 (add_library):
  Cannot find source file:

    /opt/local/var/macports/build/_Users_jeremy_src_macports_trunk_dports_www_webkit2-gtk-devel/webkit2-gtk-devel/work/build/DerivedSources/webkit2gtk/WebKit2WaylandClientProtocol.c

  Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
  .hxx .in .txx
Call Stack (most recent call first):
  Source/WebKit2/CMakeLists.txt:853 (WEBKIT_FRAMEWORK)

---

It looks like you're missing a bunch of 'if (ENABLE_WAYLAND_TARGET)' around appropriate places in Source/WebKit2/PlatformGTK.cmake
Comment 1 Jeremy Huddleston Sequoia 2016-08-31 23:32:26 PDT
Created attachment 287603 [details]
0001-GTK-Fix-configuration-without-wayland-support.patch
Comment 2 Carlos Garcia Campos 2016-08-31 23:36:57 PDT
Comment on attachment 287603 [details]
0001-GTK-Fix-configuration-without-wayland-support.patch

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

Thanks

> Source/WebKit2/ChangeLog:8
> +
> +        * PlatformGTK.cmake:

Please, explain the problem here, you can just copy the description from the bug report.

> Source/WebKit2/PlatformGTK.cmake:383
> +list(APPEND WebKit2_DERIVED_SOURCES

This is not correctly indented.
Comment 3 Jeremy Huddleston Sequoia 2016-08-31 23:38:52 PDT
Ok, thanks for the feedback.

It's late and I need to wake up early tomorrow, so I'll cleanup the patch and resubmit tomorrow.
Comment 4 Jeremy Huddleston Sequoia 2016-09-01 09:52:08 PDT
Created attachment 287624 [details]
0001-GTK-Fix-configuration-without-wayland-support.patch (review comments addressed)
Comment 5 WebKit Commit Bot 2016-09-01 10:33:52 PDT
Comment on attachment 287624 [details]
0001-GTK-Fix-configuration-without-wayland-support.patch (review comments addressed)

Clearing flags on attachment: 287624

Committed r205294: <http://trac.webkit.org/changeset/205294>
Comment 6 WebKit Commit Bot 2016-09-01 10:33:56 PDT
All reviewed patches have been landed.  Closing bug.