Commit 888b8c1d authored by mario@webkit.org's avatar mario@webkit.org

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155534 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3f64f459
2013-09-11 Mario Sanchez Prada <mario.prada@samsung.com>
[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.
2013-09-11 Patrick Gansterer <paroga@webkit.org>
[CMake] Split out generic Windows files into its own file
......
2013-09-11 Mario Sanchez Prada <mario.prada@samsung.com>
[GTK] Remove Gail dependency from build system for GTK3
https://bugs.webkit.org/show_bug.cgi?id=119673
Reviewed by Gustavo Noronha Silva.
* GNUmakefile.am: Removed GAIL_CFLAGS.
* PlatformGTK.cmake: Removed GAIL3_INCLUDE_DIRS and GAIL3_LIBRARIES.
2013-09-11 Andreas Kling <akling@apple.com>
Remove Widget::widgetPositionsUpdated().
......@@ -577,7 +577,6 @@ libWebCoreGtk_la_CPPFLAGS = \
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GAIL_CFLAGS) \
$(GAMEPAD_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
......
......@@ -252,7 +252,6 @@ list(APPEND WebCore_LIBRARIES
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
${GAIL3_LIBRARIES}
${GTK3_LIBRARIES}
${LIBSOUP_LIBRARIES}
${ZLIB_LIBRARIES}
......@@ -274,7 +273,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
${GAIL3_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
......
2013-09-11 Mario Sanchez Prada <mario.prada@samsung.com>
[GTK] Remove Gail dependency from build system for GTK3
https://bugs.webkit.org/show_bug.cgi?id=119673
Reviewed by Gustavo Noronha Silva.
* GNUmakefile.am: Removed GAIL_CFLAGS and GAIL_LIBS.
2013-09-10 Mario Sanchez Prada <mario.prada@samsung.com>
[GTK] Reimplement atk_text_get_text_*_offset for LINE boundaries
......
......@@ -58,7 +58,6 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GAIL_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
......@@ -109,7 +108,6 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBA
$(COVERAGE_LDFLAGS) \
$(ENCHANT_LIBS) \
$(FREETYPE_LIBS) \
$(GAIL_LIBS) \
$(GAMEPAD_LIBS) \
$(GEOCLUE_LIBS) \
$(GLIB_LIBS) \
......
2013-09-11 Mario Sanchez Prada <mario.prada@samsung.com>
[GTK] Remove Gail dependency from build system for GTK3
https://bugs.webkit.org/show_bug.cgi?id=119673
Reviewed by Gustavo Noronha Silva.
* GNUmakefile.am: Removed GAIL_LIBS.
2013-09-11 Alberto Garcia <berto@igalia.com>
[WK2] [GTK] LayerTreeHostGtk: don't set m_isValid to false if glContext() returns null
......
......@@ -229,7 +229,6 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
$(COVERAGE_LDFLAGS) \
$(ENCHANT_LIBS) \
$(FREETYPE_LIBS) \
$(GAIL_LIBS) \
$(GAMEPAD_LIBS) \
$(GEOCLUE_LIBS) \
$(GLIB_LIBS) \
......
......@@ -74,8 +74,6 @@ case "$with_gtk" in
WEBKITGTK_API_MINOR_VERSION=0
WEBKITGTK_API_VERSION=1.0
WEBKITGTK_PC_NAME=webkit
GAIL_PC_NAME=gail
GAIL_REQUIRED_VERSION=gail2_required_version
;;
3.0) GTK_REQUIRED_VERSION=gtk3_required_version
GTK_API_VERSION=3.0
......@@ -83,8 +81,6 @@ case "$with_gtk" in
WEBKITGTK_API_MINOR_VERSION=0
WEBKITGTK_API_VERSION=3.0
WEBKITGTK_PC_NAME=webkitgtk
GAIL_PC_NAME=gail-3.0
GAIL_REQUIRED_VERSION=gail3_required_version
;;
esac
AC_SUBST([WEBKITGTK_API_MAJOR_VERSION])
......@@ -154,10 +150,6 @@ if test "$enable_spellcheck" = "yes"; then
AC_SUBST(ENCHANT_LIBS)
fi
PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION)
AC_SUBST(GAIL_CFLAGS)
AC_SUBST(GAIL_LIBS)
# Check for target-specific dependencies.
if test "$with_target" = "directfb"; then
PKG_CHECK_MODULES(CAIRO, cairo-directfb >= cairo_required_version)
......@@ -497,7 +489,7 @@ if test "$enable_webkit2" = "yes"; then
fi
# Make sure we have GTK+ 2.x to build the plugin process.
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= gtk2_required_version gail >= gail2_required_version)
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= gtk2_required_version)
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
......
......@@ -16,9 +16,7 @@ m4_define([libjavascriptcoregtk_version], [15:0:15])
m4_define([libwebkit2gtk_version], [27:0:2])
m4_define([gtk2_required_version], [2.24.10])
m4_define([gail2_required_version], [1.8])
m4_define([gtk3_required_version], [3.6.0])
m4_define([gail3_required_version], [3.0])
m4_define([atspi2_required_version], [2.5.3])
m4_define([cairo_required_version], [1.10])
......
# - Try to find GAIL 3.
# Once done, this will define
#
# GAIL3_FOUND - system has GAIL 3
# GAIL3_INCLUDE_DIRS - the GAIL 3 include directories
# GAIL3_LIBRARIES - link these to use GAIL 3
#
# Copyright (C) 2013 Igalia S.L.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
pkg_check_modules(GAIL3 gail-3.0)
set(VERSION_OK TRUE)
if (GAIL3_VERSION)
if (GAIL3_FIND_VERSION_EXACT)
if (NOT("${GAIL3_FIND_VERSION}" VERSION_EQUAL "${GAIL3_VERSION}"))
set(VERSION_OK FALSE)
endif ()
else ()
if ("${GAIL3_VERSION}" VERSION_LESS "${GAIL3_FIND_VERSION}")
set(VERSION_OK FALSE)
endif ()
endif ()
endif ()
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GAIL3 DEFAULT_MSG GAIL3_INCLUDE_DIRS GAIL3_LIBRARIES VERSION_OK)
......@@ -105,7 +105,6 @@ find_package(Freetype 2.4.2 REQUIRED)
find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread gmodule)
find_package(GTK3 3.6.0 REQUIRED)
find_package(GDK3 3.6.0 REQUIRED)
find_package(GAIL3 3.0 REQUIRED)
find_package(HarfBuzz 0.9.2 REQUIRED)
find_package(ICU REQUIRED)
find_package(JPEG REQUIRED)
......
2013-09-11 Mario Sanchez Prada <mario.prada@samsung.com>
[GTK] Remove Gail dependency from build system for GTK3
https://bugs.webkit.org/show_bug.cgi?id=119673
Reviewed by Gustavo Noronha Silva.
* 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.
2013-09-11 Gabor Abraham <abrhm@inf.u-szeged.hu>
Performance tester bots should report the number of failing tests
......
......@@ -56,6 +56,5 @@ libxt-dev
autotools-dev
libgstreamer-plugins-base0.10-dev
libenchant-dev
libgail-dev
gtk-doc-tools
libgeoclue-dev
......@@ -86,7 +86,6 @@ class GtkPort(Port):
def setup_environ_for_server(self, server_name=None):
environment = super(GtkPort, self).setup_environ_for_server(server_name)
environment['GTK_MODULES'] = 'gail'
environment['GSETTINGS_BACKEND'] = 'memory'
environment['LIBOVERLAY_SCROLLBAR'] = '0'
environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('Libraries', 'libTestRunnerInjectedBundle.la')
......
......@@ -143,7 +143,6 @@ Programs_TestWebKitAPI_TestWebCore_LDADD = \
$(FREETYPE_LIBS) \
$(GAMEPAD_LIBS) \
$(GEOCLUE_LIBS) \
$(GAIL_LIBS) \
$(GLIB_LIBS) \
$(GSTREAMER_LIBS) \
$(GTK_LIBS) \
......
......@@ -49,8 +49,6 @@ function installDependenciesWithApt {
libatk1.0-dev \
libenchant-dev \
libfaad-dev \
libgail-3-dev \
libgail-dev \
libgeoclue-dev \
libgirepository1.0-dev \
libgl1-mesa-dev \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment