Reviewed by Antonio Gomes.
[EFL] Cleanup glib support (make it optional)
https://bugs.webkit.org/show_bug.cgi?id=42480
Fixing support for compiling EFL port without glib.
* cmake/FindGthread.cmake: Added.
* cmake/OptionsEfl.cmake:
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Cleanup glib support (make it optional)
https://bugs.webkit.org/show_bug.cgi?id=42480
Remove gobject/GRefPtr.cpp if not using soup/glib.
* wtf/CMakeListsEfl.txt:
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Cleanup glib support (make it optional)
https://bugs.webkit.org/show_bug.cgi?id=42480
No new tests, no new features added.
Just add flags and directories for glib if necessary.
Put some ifdefs on glib calls.
* CMakeListsEfl.txt:
* platform/graphics/cairo/FontPlatformDataCairo.cpp:
(WebCore::FontPlatformData::FontPlatformData):
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Cleanup glib support (make it optional)
https://bugs.webkit.org/show_bug.cgi?id=42480
Just add glib flags and directories if necessary.
* CMakeListsEfl.txt:
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Cleanup glib support (make it optional)
https://bugs.webkit.org/show_bug.cgi?id=42480
Put some ifdefs on glib calls.
* ewk/ewk_main.cpp:
(ewk_init):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@64005
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Cleanup glib support (make it optional)
+ https://bugs.webkit.org/show_bug.cgi?id=42480
+
+ Fixing support for compiling EFL port without glib.
+
+ * cmake/FindGthread.cmake: Added.
+ * cmake/OptionsEfl.cmake:
+
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
+2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Cleanup glib support (make it optional)
+ https://bugs.webkit.org/show_bug.cgi?id=42480
+
+ Remove gobject/GRefPtr.cpp if not using soup/glib.
+
+ * wtf/CMakeListsEfl.txt:
+
2010-07-23 Patrick Gansterer <paroga@paroga.com>
Reviewed by Adam Roben.
LIST(APPEND WTF_SOURCES
efl/MainThreadEfl.cpp
- gobject/GOwnPtr.cpp
- gobject/GRefPtr.cpp
-
ThreadIdentifierDataPthreads.cpp
ThreadingPthreads.cpp
unicode/icu/CollatorICU.cpp
)
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND WTF_SOURCES
+ gobject/GOwnPtr.cpp
+ gobject/GRefPtr.cpp
+ )
+ENDIF ()
+
LIST(APPEND WTF_LIBRARIES
pthread
${ICU_LIBRARIES}
${EFLDEPS_LIBRARIES}
${EVAS_LIBRARIES}
${Freetype_LIBRARIES}
- ${GDK_LIBRARIES}
- ${Glib_LIBRARIES}
- ${GTK_LIBRARIES}
${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${Freetype_INCLUDE_DIRS}
- ${GDK_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
- ${GTK_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
)
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND WebCore_LIBRARIES
+ ${GDK_LIBRARIES}
+ ${Glib_LIBRARIES}
+ )
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${GDK_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
+ )
+ENDIF ()
+
IF (WTF_USE_SOUP)
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${LIBSOUP24_INCLUDE_DIRS}
+2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Cleanup glib support (make it optional)
+ https://bugs.webkit.org/show_bug.cgi?id=42480
+
+ No new tests, no new features added.
+ Just add flags and directories for glib if necessary.
+ Put some ifdefs on glib calls.
+
+ * CMakeListsEfl.txt:
+ * platform/graphics/cairo/FontPlatformDataCairo.cpp:
+ (WebCore::FontPlatformData::FontPlatformData):
+
2010-07-23 James Robinson <jamesr@chromium.org>
Reviewed by Dimitri Glazkov.
#include <dlfcn.h>
#include <errno.h>
#include <fnmatch.h>
+#if ENABLE(GLIB_SUPPORT)
#include <glib.h> // TODO: remove me after following TODO is solved.
+#endif
#include <limits.h>
#include <stdio.h>
#include <sys/stat.h>
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
+#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
#include <gdk/gdk.h>
+#endif
namespace WebCore {
cairo_matrix_init_scale(&fontMatrix, fontDescription.computedPixelSize(), fontDescription.computedPixelSize());
cairo_matrix_init_identity(&ctm);
+#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
if (GdkScreen* screen = gdk_screen_get_default())
options = gdk_screen_get_font_options(screen);
+#endif
// gdk_screen_get_font_options() returns NULL if no default options are
// set, so we always have to check.
static const cairo_font_options_t* defaultOptions = cairo_font_options_create();
const cairo_font_options_t* options = NULL;
+#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
if (GdkScreen* screen = gdk_screen_get_default())
options = gdk_screen_get_font_options(screen);
+#endif
// gdk_screen_get_font_options() returns NULL if no default options are
// set, so we always have to check.
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
- ${Gdk_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIRS}
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
${Freetype_LIBRARIES}
- ${Gdk_LIBRARIES}
- ${Glib_LIBRARIES}
- ${Gtk_LIBRARIES}
${LIBXML2_LIBRARIES}
${Pango_LIBRARIES}
${SQLITE_LIBRARIES}
)
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
+ ${Gdk_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
+ )
+ LIST(APPEND WebKit_LIBRARIES
+ ${Glib_LIBRARIES}
+ ${Gdk_LIBRARIES}
+ )
+ENDIF ()
+
IF (WTF_USE_SOUP)
LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${LIBSOUP24_INCLUDE_DIRS})
LIST(APPEND WebKit_LIBRARIES ${LIBSOUP24_LIBRARIES})
${EDJE_LIBRARIES}
${EFLDEPS_LIBRARIES}
${EVAS_LIBRARIES}
- ${Gdk_LIBRARIES}
- ${Glib_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
${EVAS_LDFLAGS}
)
+IF (ENABLE_GLIB_SUPPORT)
+ LIST(APPEND EWebLauncher_LIBRARIES
+ ${Gdk_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${GTHREAD_LIBRARIES}
+ )
+ENDIF ()
+
IF (WTF_USE_SOUP)
LIST(APPEND EWebLauncher_LIBRARIES ${LIBSOUP24_LIBRARIES})
LIST(APPEND EWebLauncher_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
+2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Cleanup glib support (make it optional)
+ https://bugs.webkit.org/show_bug.cgi?id=42480
+
+ Just add glib flags and directories if necessary.
+
+ * CMakeListsEfl.txt:
+
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
+2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Cleanup glib support (make it optional)
+ https://bugs.webkit.org/show_bug.cgi?id=42480
+
+ Put some ifdefs on glib calls.
+
+ * ewk/ewk_main.cpp:
+ (ewk_init):
+
2010-07-23 Rafael Antognolli <antognolli@profusion.mobi>
Reviewed by Antonio Gomes.
#include <Eina.h>
#include <eina_safety_checks.h>
-#include <glib.h>
#ifdef WTF_USE_SOUP
+#include <glib.h>
#include <libsoup/soup.h>
#endif
#include <wtf/text/CString.h>
#include <Evas.h>
#include <stdlib.h>
-#ifdef ENABLE_GLIB_SUPPORT
+#if ENABLE(GLIB_SUPPORT)
#include <glib-object.h>
#include <glib.h>
goto error_edje;
}
-#ifdef ENABLE_GLIB_SUPPORT
+#if ENABLE(GLIB_SUPPORT)
g_type_init();
if (!g_thread_supported())
--- /dev/null
+# Find include and libraries for GTHREAD library
+# GTHREAD_INCLUDE Directories to include to use GTHREAD
+# GTHREAD_INCLUDE-I Directories to include to use GTHREAD (with -I)
+# GTHREAD_LIBRARIES Libraries to link against to use GTHREAD
+# GTHREAD_FOUND GTHREAD was found
+
+IF (UNIX)
+ INCLUDE (UsePkgConfig)
+ PKGCONFIG (gthread-2.0 GTHREAD_include_dir GTHREAD_link_dir GTHREAD_libraries GTHREAD_include)
+ IF (GTHREAD_include AND GTHREAD_libraries)
+ SET (GTHREAD_FOUND TRUE)
+ EXEC_PROGRAM ("echo"
+ ARGS "${GTHREAD_include} | sed 's/[[:blank:]]*-I/;/g'"
+ OUTPUT_VARIABLE GTHREAD_INCLUDE
+ )
+ SET (GTHREAD_INCLUDE-I ${GTHREAD_include})
+ SET (GTHREAD_LIBRARIES ${GTHREAD_libraries})
+ ELSE (GTHREAD_include AND GTHREAD_libraries)
+ SET (GTHREAD_FOUND FALSE)
+ ENDIF (GTHREAD_include AND GTHREAD_libraries)
+ENDIF (UNIX)
FIND_PACKAGE(Cairo 1.6 REQUIRED)
FIND_PACKAGE(EFL REQUIRED)
FIND_PACKAGE(Freetype 9.0 REQUIRED)
-FIND_PACKAGE(GDK 2.10 REQUIRED)
-FIND_PACKAGE(Glib REQUIRED)
FIND_PACKAGE(Sqlite REQUIRED)
FIND_PACKAGE(LibXml2 2.6 REQUIRED)
FIND_PACKAGE(LibXslt 1.1.7 REQUIRED)
ADD_DEFINITIONS(-DWTF_USE_CURL=1)
ENDIF ()
+IF (ENABLE_GLIB_SUPPORT)
+ FIND_PACKAGE(GDK 2.10 REQUIRED)
+ FIND_PACKAGE(Glib REQUIRED)
+ FIND_PACKAGE(Gthread REQUIRED)
+ENDIF ()
+
SET(CPACK_SOURCE_GENERATOR TBZ2)
git://git.webkit.org / WebKit-https.git / commitdiff