Changeset 66738 in webkit


Ignore:
Timestamp:
Sep 3, 2010 10:07:32 AM (14 years ago)
Author:
demarchi@webkit.org
Message:

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 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.
Location:
trunk
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/CMakeListsEfl.txt

    r64105 r66738  
    99)
    1010
     11IF (ENABLE_GLIB_SUPPORT)
     12  LIST(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     13    ${JAVASCRIPTCORE_DIR}/wtf/gobject
     14  )
     15ENDIF ()
     16
    1117LIST(APPEND JavaScriptCore_LINK_FLAGS
    1218    ${ECORE_LDFLAGS}

  • trunk/JavaScriptCore/ChangeLog

    r66729 r66738  
     12010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [EFL] Regression (66531) Build break with Glib Support
     6        https://bugs.webkit.org/show_bug.cgi?id=45011
     7
     8        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
     9        since when glib is enabled, EFL port needs it, too.
     10
     11        * CMakeListsEfl.txt: Include gobject directory to find new header
     12        file.
     13        * GNUmakefile.am: Ditto.
     14        * wtf/CMakeListsEfl.txt: Ditto.
     15        * wtf/Platform.h: Include header if port is EFL and glib support is
     16        enabled.
     17        * wtf/gtk/GtkTypedefs.h: Removed.
     18        * wtf/gobject/GTypedefs.h: Added. Sections specific to GTK are now
     19        guarded by PLATFORM(GTK).
     20
    1212010-09-03  Csaba Osztrogonác  <ossy@webkit.org>
    222

  • trunk/JavaScriptCore/GNUmakefile.am

    r66531 r66738  
    443443        JavaScriptCore/wtf/gobject/GRefPtr.cpp \
    444444        JavaScriptCore/wtf/gobject/GRefPtr.h \
    445         JavaScriptCore/wtf/gtk/GtkTypedefs.h \
     445        JavaScriptCore/wtf/gobject/GTypedefs.h \
    446446        JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
    447447        JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \

  • trunk/JavaScriptCore/wtf/CMakeListsEfl.txt

    r64005 r66738  
    1515    gobject/GRefPtr.cpp
    1616  )
     17
     18  LIST(APPEND WTF_INCLUDE_DIRECTORIES
     19       ${JAVASCRIPTCORE_DIR}/wtf/gobject
     20  )
    1721ENDIF ()
    1822

  • trunk/JavaScriptCore/wtf/Platform.h

    r66531 r66738  
    11181118#endif
    11191119
    1120 #if PLATFORM(GTK)
    1121 #include "GtkTypedefs.h"
     1120#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
     1121#include "GTypedefs.h"
    11221122#endif
    11231123

  • trunk/JavaScriptCore/wtf/gobject/GTypedefs.h

    r66737 r66738  
    3737typedef void* gpointer;
    3838
    39 typedef struct _cairo_surface cairo_surface_t;
    4039typedef struct _GCond GCond;
    4140typedef struct _GDir GDir;
    … …  
    5251typedef struct _GMutex GMutex;
    5352typedef struct _GPatternSpec GPatternSpec;
     53typedef struct _GVariant GVariant;
     54typedef union _GdkEvent GdkEvent;
     55
     56#if PLATFORM(CAIRO)
     57typedef struct _cairo_surface cairo_surface_t;
     58#endif
     59
     60#if PLATFORM(GTK)
    5461typedef struct _GtkAction GtkAction;
    5562typedef struct _GtkAdjustment GtkAdjustment;
    … …  
    6673typedef struct _GtkThemeParts GtkThemeParts;
    6774typedef struct _GtkWidget GtkWidget;
    68 typedef struct _GVariant GVariant;
    69 typedef union _GdkEvent GdkEvent;
    7075
    7176#ifdef GTK_API_VERSION_2
    … …  
    7883#endif
    7984
     85#endif
    8086#endif /* GtkTypedefs_h */

  • trunk/WebKit/efl/CMakeListsEfl.txt

    r66734 r66738  
    7171    ${Gdk_INCLUDE_DIRS}
    7272    ${Glib_INCLUDE_DIRS}
     73    ${JAVASCRIPTCORE_DIR}/wtf/gobject
    7374  )
    7475  LIST(APPEND WebKit_LIBRARIES

  • trunk/WebKit/efl/ChangeLog

    r66734 r66738  
     12010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [EFL] Regression (66531) Build break with Glib Support
     6        https://bugs.webkit.org/show_bug.cgi?id=45011
     7
     8        Move GtkTypedefs.h to GTypedefs.h and let it inside gobject directory
     9        since when glib is enabled, EFL port needs it, too.
     10
     11        * CMakeListsEfl.txt: Include gobject directory to find new header
     12        file.
     13
    1142010-09-03  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
    215
Note: See TracChangeset for help on using the changeset viewer.