Changeset 155534 in webkit


Ignore:
Timestamp:
Sep 11, 2013 9:25:19 AM (11 years ago)
Author:
mario@webkit.org
Message:

[GTK] Remove Gail dependency from build system for GTK3
https://bugs.webkit.org/show_bug.cgi?id=119673

Reviewed by Gustavo Noronha Silva.

.:

  • Source/autotools/FindDependencies.m4: Don't look for GAIL at all.
  • Source/autotools/Versions.m4: Removed any reference to GAIL.
  • Source/cmake/FindGAIL3.cmake: Removed.
  • Source/cmake/OptionsGTK.cmake: Don't look for the GAIL package.

Source/WebCore:

  • GNUmakefile.am: Removed GAIL_CFLAGS.
  • PlatformGTK.cmake: Removed GAIL3_INCLUDE_DIRS and GAIL3_LIBRARIES.

Source/WebKit/gtk:

  • GNUmakefile.am: Removed GAIL_CFLAGS and GAIL_LIBS.

Source/WebKit2:

  • GNUmakefile.am: Removed GAIL_LIBS.

Tools:

  • EWSTools/ubuntu-ews-packages: Removed libgail-dev package.
  • Scripts/webkitpy/port/gtk.py:

(GtkPort.setup_environ_for_server): Do not load the 'gail' module anymore.

  • TestWebKitAPI/GNUmakefile.am: Removed GAIL_LIBS.
Location:
trunk
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r155521 r155534  
     12013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
     2
     3        [GTK] Remove Gail dependency from build system for GTK3
     4        https://bugs.webkit.org/show_bug.cgi?id=119673
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/autotools/FindDependencies.m4: Don't look for GAIL at all.
     9        * Source/autotools/Versions.m4: Removed any reference to GAIL.
     10        * Source/cmake/FindGAIL3.cmake: Removed.
     11        * Source/cmake/OptionsGTK.cmake: Don't look for the GAIL package.
     12
    1132013-09-11  Patrick Gansterer  <paroga@webkit.org>
    214
  • trunk/Source/WebCore/ChangeLog

    r155530 r155534  
     12013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
     2
     3        [GTK] Remove Gail dependency from build system for GTK3
     4        https://bugs.webkit.org/show_bug.cgi?id=119673
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Removed GAIL_CFLAGS.
     9        * PlatformGTK.cmake: Removed GAIL3_INCLUDE_DIRS and GAIL3_LIBRARIES.
     10
    1112013-09-11  Andreas Kling  <akling@apple.com>
    212
  • trunk/Source/WebCore/GNUmakefile.am

    r155155 r155534  
    578578        $(ENCHANT_CFLAGS) \
    579579        $(FREETYPE_CFLAGS) \
    580         $(GAIL_CFLAGS) \
    581580        $(GAMEPAD_CFLAGS) \
    582581        $(GEOCLUE_CFLAGS) \
  • trunk/Source/WebCore/PlatformGTK.cmake

    r155108 r155534  
    253253    ${GLIB_GOBJECT_LIBRARIES}
    254254    ${GLIB_GMODULE_LIBRARIES}
    255     ${GAIL3_LIBRARIES}
    256255    ${GTK3_LIBRARIES}
    257256    ${LIBSOUP_LIBRARIES}
     
    275274    ${LIBXSLT_INCLUDE_DIR}
    276275    ${SQLITE_INCLUDE_DIR}
    277     ${GAIL3_INCLUDE_DIRS}
    278276    ${GLIB_INCLUDE_DIRS}
    279277    ${GTK3_INCLUDE_DIRS}
  • trunk/Source/WebKit/gtk/ChangeLog

    r155516 r155534  
     12013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
     2
     3        [GTK] Remove Gail dependency from build system for GTK3
     4        https://bugs.webkit.org/show_bug.cgi?id=119673
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Removed GAIL_CFLAGS and GAIL_LIBS.
     9
    1102013-09-10  Mario Sanchez Prada  <mario.prada@samsung.com>
    211
  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r154830 r155534  
    5959        $(ENCHANT_CFLAGS) \
    6060        $(FREETYPE_CFLAGS) \
    61         $(GAIL_CFLAGS) \
    6261        $(GEOCLUE_CFLAGS) \
    6362        $(GLIB_CFLAGS) \
     
    110109        $(ENCHANT_LIBS) \
    111110        $(FREETYPE_LIBS) \
    112         $(GAIL_LIBS) \
    113111        $(GAMEPAD_LIBS) \
    114112        $(GEOCLUE_LIBS) \
  • trunk/Source/WebKit2/ChangeLog

    r155533 r155534  
     12013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
     2
     3        [GTK] Remove Gail dependency from build system for GTK3
     4        https://bugs.webkit.org/show_bug.cgi?id=119673
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Removed GAIL_LIBS.
     9
    1102013-09-11  Alberto Garcia  <berto@igalia.com>
    211
  • trunk/Source/WebKit2/GNUmakefile.am

    r154830 r155534  
    230230        $(ENCHANT_LIBS) \
    231231        $(FREETYPE_LIBS) \
    232         $(GAIL_LIBS) \
    233232        $(GAMEPAD_LIBS) \
    234233        $(GEOCLUE_LIBS) \
  • trunk/Source/autotools/FindDependencies.m4

    r155032 r155534  
    7575        WEBKITGTK_API_VERSION=1.0
    7676        WEBKITGTK_PC_NAME=webkit
    77         GAIL_PC_NAME=gail
    78         GAIL_REQUIRED_VERSION=gail2_required_version
    7977        ;;
    8078    3.0) GTK_REQUIRED_VERSION=gtk3_required_version
     
    8482        WEBKITGTK_API_VERSION=3.0
    8583        WEBKITGTK_PC_NAME=webkitgtk
    86         GAIL_PC_NAME=gail-3.0
    87         GAIL_REQUIRED_VERSION=gail3_required_version
    8884        ;;
    8985esac
     
    155151fi
    156152
    157 PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
    158 AC_SUBST(GAIL_CFLAGS)
    159 AC_SUBST(GAIL_LIBS)
    160 
    161153# Check for target-specific dependencies.
    162154if test "$with_target" = "directfb"; then
     
    498490
    499491    # Make sure we have GTK+ 2.x to build the plugin process.
    500     PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= gtk2_required_version gail >= gail2_required_version)
     492    PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= gtk2_required_version)
    501493    AC_SUBST(GTK2_CFLAGS)
    502494    AC_SUBST(GTK2_LIBS)
  • trunk/Source/autotools/Versions.m4

    r153924 r155534  
    1717
    1818m4_define([gtk2_required_version], [2.24.10])
    19 m4_define([gail2_required_version], [1.8])
    2019m4_define([gtk3_required_version], [3.6.0])
    21 m4_define([gail3_required_version], [3.0])
    2220
    2321m4_define([atspi2_required_version], [2.5.3])
  • trunk/Source/cmake/OptionsGTK.cmake

    r154071 r155534  
    106106find_package(GTK3 3.6.0 REQUIRED)
    107107find_package(GDK3 3.6.0 REQUIRED)
    108 find_package(GAIL3 3.0 REQUIRED)
    109108find_package(HarfBuzz 0.9.2 REQUIRED)
    110109find_package(ICU REQUIRED)
  • trunk/Tools/ChangeLog

    r155523 r155534  
     12013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
     2
     3        [GTK] Remove Gail dependency from build system for GTK3
     4        https://bugs.webkit.org/show_bug.cgi?id=119673
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * EWSTools/ubuntu-ews-packages: Removed libgail-dev package.
     9        * Scripts/webkitpy/port/gtk.py:
     10        (GtkPort.setup_environ_for_server): Do not load the 'gail' module anymore.
     11        * TestWebKitAPI/GNUmakefile.am: Removed GAIL_LIBS.
     12
    1132013-09-11  Gabor Abraham  <abrhm@inf.u-szeged.hu>
    214
  • trunk/Tools/EWSTools/ubuntu-ews-packages

    r69705 r155534  
    5757libgstreamer-plugins-base0.10-dev
    5858libenchant-dev
    59 libgail-dev
    6059gtk-doc-tools
    6160libgeoclue-dev
  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r155373 r155534  
    8787    def setup_environ_for_server(self, server_name=None):
    8888        environment = super(GtkPort, self).setup_environ_for_server(server_name)
    89         environment['GTK_MODULES'] = 'gail'
    9089        environment['GSETTINGS_BACKEND'] = 'memory'
    9190        environment['LIBOVERLAY_SCROLLBAR'] = '0'
  • trunk/Tools/TestWebKitAPI/GNUmakefile.am

    r155151 r155534  
    144144        $(GAMEPAD_LIBS) \
    145145        $(GEOCLUE_LIBS) \
    146         $(GAIL_LIBS) \
    147146        $(GLIB_LIBS) \
    148147        $(GSTREAMER_LIBS) \
  • trunk/Tools/gtk/install-dependencies

    r154807 r155534  
    5050        libenchant-dev \
    5151        libfaad-dev \
    52         libgail-3-dev \
    53         libgail-dev \
    5452        libgeoclue-dev \
    5553        libgirepository1.0-dev \
Note: See TracChangeset for help on using the changeset viewer.