2010-09-03 Lucas De Marchi <lucas.demarchi@profusion.mobi>
authordemarchi@webkit.org <demarchi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Sep 2010 17:07:32 +0000 (17:07 +0000)
committerdemarchi@webkit.org <demarchi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Sep 2010 17:07:32 +0000 (17:07 +0000)
        Reviewed by Martin Robinson.

        [EFL] Regression (66531) Build break with Glib Support
        https://bugs.webkit.org/show_bug.cgi?id=45011

        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
        since when glib is enabled, EFL port needs it, too.

        * CMakeListsEfl.txt: Include gobject directory to find new header
        file.
        * GNUmakefile.am: Ditto.
        * wtf/CMakeListsEfl.txt: Ditto.
        * wtf/Platform.h: Include header if port is EFL and glib support is
        enabled.
        * wtf/gtk/GtkTypedefs.h: Removed.
        * wtf/gobject/GTypedefs.h: Added. Sections specific to GTK are now
        guarded by PLATFORM(GTK).
2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>

        Reviewed by Martin Robinson.

        [EFL] Regression (66531) Build break with Glib Support
        https://bugs.webkit.org/show_bug.cgi?id=45011

        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
        since when glib is enabled, EFL port needs it, too.

        * CMakeListsEfl.txt: Include gobject directory to find new header
        file.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@66738 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/CMakeListsEfl.txt
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
JavaScriptCore/wtf/CMakeListsEfl.txt
JavaScriptCore/wtf/Platform.h
JavaScriptCore/wtf/gobject/GTypedefs.h [moved from JavaScriptCore/wtf/gtk/GtkTypedefs.h with 98% similarity]
WebKit/efl/CMakeListsEfl.txt
WebKit/efl/ChangeLog

index 7897ea5..90ee22b 100644 (file)
@@ -8,6 +8,12 @@ LIST(APPEND JavaScriptCore_LIBRARIES
     ${ICU_I18N_LIBRARIES}
 )
 
+IF (ENABLE_GLIB_SUPPORT)
+  LIST(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+    ${JAVASCRIPTCORE_DIR}/wtf/gobject
+  )
+ENDIF ()
+
 LIST(APPEND JavaScriptCore_LINK_FLAGS
     ${ECORE_LDFLAGS}
 )
index 9ac7ca9..c5bfa38 100644 (file)
@@ -1,3 +1,23 @@
+2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Martin Robinson.
+
+        [EFL] Regression (66531) Build break with Glib Support
+        https://bugs.webkit.org/show_bug.cgi?id=45011
+
+        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
+        since when glib is enabled, EFL port needs it, too.
+
+        * CMakeListsEfl.txt: Include gobject directory to find new header
+        file.
+        * GNUmakefile.am: Ditto.
+        * wtf/CMakeListsEfl.txt: Ditto.
+        * wtf/Platform.h: Include header if port is EFL and glib support is
+        enabled.
+        * wtf/gtk/GtkTypedefs.h: Removed.
+        * wtf/gobject/GTypedefs.h: Added. Sections specific to GTK are now
+        guarded by PLATFORM(GTK).
+
 2010-09-03  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Reviewed by Simon Hausmann.
index b4c658e..8359870 100644 (file)
@@ -442,7 +442,7 @@ javascriptcore_sources += \
        JavaScriptCore/wtf/gobject/GOwnPtr.h \
        JavaScriptCore/wtf/gobject/GRefPtr.cpp \
        JavaScriptCore/wtf/gobject/GRefPtr.h \
-       JavaScriptCore/wtf/gtk/GtkTypedefs.h \
+       JavaScriptCore/wtf/gobject/GTypedefs.h \
        JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
        JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
        JavaScriptCore/wtf/HashCountedSet.h \
index 3cd3c8e..6a714ae 100644 (file)
@@ -14,6 +14,10 @@ IF (ENABLE_GLIB_SUPPORT)
     gobject/GOwnPtr.cpp
     gobject/GRefPtr.cpp
   )
+
+  LIST(APPEND WTF_INCLUDE_DIRECTORIES
+       ${JAVASCRIPTCORE_DIR}/wtf/gobject
+  )
 ENDIF ()
 
 LIST(APPEND WTF_LIBRARIES
index de00741..4975f53 100644 (file)
@@ -1117,8 +1117,8 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define ENABLE_BRANCH_COMPACTION 1
 #endif
 
-#if PLATFORM(GTK)
-#include "GtkTypedefs.h"
+#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#include "GTypedefs.h"
 #endif
 
 #endif /* WTF_Platform_h */
similarity index 98%
rename from JavaScriptCore/wtf/gtk/GtkTypedefs.h
rename to JavaScriptCore/wtf/gobject/GTypedefs.h
index ee96f84..ff9283e 100644 (file)
@@ -36,7 +36,6 @@ typedef unsigned long gulong;
 typedef unsigned short gushort;
 typedef void* gpointer;
 
-typedef struct _cairo_surface cairo_surface_t;
 typedef struct _GCond GCond;
 typedef struct _GDir GDir;
 typedef struct _GdkAtom* GdkAtom;
@@ -51,6 +50,14 @@ typedef struct _GHashTable GHashTable;
 typedef struct _GList GList;
 typedef struct _GMutex GMutex;
 typedef struct _GPatternSpec GPatternSpec;
+typedef struct _GVariant GVariant;
+typedef union _GdkEvent GdkEvent;
+
+#if PLATFORM(CAIRO)
+typedef struct _cairo_surface cairo_surface_t;
+#endif
+
+#if PLATFORM(GTK)
 typedef struct _GtkAction GtkAction;
 typedef struct _GtkAdjustment GtkAdjustment;
 typedef struct _GtkBorder GtkBorder;
@@ -65,8 +72,6 @@ typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkTargetList GtkTargetList;
 typedef struct _GtkThemeParts GtkThemeParts;
 typedef struct _GtkWidget GtkWidget;
-typedef struct _GVariant GVariant;
-typedef union _GdkEvent GdkEvent;
 
 #ifdef GTK_API_VERSION_2
 typedef struct _GdkRectangle GdkRectangle;
@@ -77,4 +82,5 @@ typedef cairo_rectangle_int_t GdkRectangle;
 
 #endif
 
+#endif
 #endif /* GtkTypedefs_h */
index 6c65aa5..0203865 100644 (file)
@@ -70,6 +70,7 @@ IF (ENABLE_GLIB_SUPPORT)
   LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     ${Gdk_INCLUDE_DIRS}
     ${Glib_INCLUDE_DIRS}
+    ${JAVASCRIPTCORE_DIR}/wtf/gobject
   )
   LIST(APPEND WebKit_LIBRARIES
     ${Glib_LIBRARIES}
index 565cc5a..eaeec58 100644 (file)
@@ -1,5 +1,18 @@
 2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 
+        Reviewed by Martin Robinson.
+
+        [EFL] Regression (66531) Build break with Glib Support
+        https://bugs.webkit.org/show_bug.cgi?id=45011
+
+        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
+        since when glib is enabled, EFL port needs it, too.
+
+        * CMakeListsEfl.txt: Include gobject directory to find new header
+        file.
+
+2010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
         Reviewed by Antonio Gomes.
 
         [EFL] Install default theme