Bug 130183

Summary: [EFL] Fix the !ENABLE(BATTERY_STATUS) build
Product: WebKit Reporter: Dániel Bátyai <dbatyai.u-szeged>
Component: WebKit Misc.Assignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: bunhere, commit-queue, gyuyoung.kim, gyuyoung.kim, rakuco, sergio, webkit-ews
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Proposed patch
none
Proposed patch none

Description Dániel Bátyai 2014-03-13 01:30:46 PDT
In file included from WebKit/Tools/MiniBrowser/efl/main.c:27:0:
WebKit/WebKitBuild/Dependencies/Root/include/elementary-1/Elementary.h:77:20: fatal error: E_DBus.h: No such file or directory
compilation terminated.
Comment 1 Dániel Bátyai 2014-03-13 01:31:45 PDT
Created attachment 226582 [details]
Proposed patch
Comment 2 Ryuan Choi 2014-03-13 03:13:23 PDT
Comment on attachment 226582 [details]
Proposed patch

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

> Source/cmake/OptionsEfl.cmake:168
> -if (ENABLE_BATTERY_STATUS)
> -    find_package(DBus REQUIRED)
> -    find_package(E_DBus 1.7 COMPONENTS EUKit)
> -endif ()
> +find_package(DBus REQUIRED)
> +find_package(E_DBus 1.7 COMPONENTS EUKit)

If we are trying to build on EFL 1.8 or latest version without BATTERY_STATUS and E_Dbus, we will have errors like below.

CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
E_DBUS_EUKIT_LIBRARIES
    linked by target "WebCore" in directory /home/ryuan/workspace/project/webkit/efl-webkit/Source/WebCore
E_DBUS_LIBRARIES
    linked by target "WebCore" in directory /home/ryuan/workspace/project/webkit/efl-webkit/Source/WebCor

Because EFL 1.8, 1.9 and later does not require E_Dbus, it should be also fine.
Comment 3 Dániel Bátyai 2014-03-14 05:37:14 PDT
Created attachment 226693 [details]
Proposed patch
Comment 4 WebKit Commit Bot 2014-04-01 09:19:05 PDT
Comment on attachment 226693 [details]
Proposed patch

Clearing flags on attachment: 226693

Committed r166592: <http://trac.webkit.org/changeset/166592>
Comment 5 WebKit Commit Bot 2014-04-01 09:19:10 PDT
All reviewed patches have been landed.  Closing bug.