Changeset 142724 in webkit


Ignore:
Timestamp:
Feb 12, 2013 10:30:42 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Remove the GLib unicode backend
​https://bugs.webkit.org/show_bug.cgi?id=109627

Patch by Martin Robinson <​mrobinson@igalia.com> on 2013-02-12
Reviewed by Benjamin Poulain.

.:

Remove references to the GLib unicode backend from configuration.

  • Source/autotools/FindDependencies.m4:
  • Source/autotools/ReadCommandLineArguments.m4:
  • Source/autotools/SetupAutoconfHeader.m4:
  • Source/autotools/SetupAutomake.m4:

Source/WebCore:

Remove references to the GLib unicode backend from WebCore.

  • GNUmakefile.list.am: Update the source list.
  • platform/text/gtk/TextBreakIteratorGtk.cpp: Removed.
  • platform/text/gtk/TextCodecGtk.cpp: Removed.
  • platform/text/gtk/TextCodecGtk.h: Removed.

Source/WTF:

Remove references to the GLib unicode backend from WTF.

  • GNUmakefile.list.am: Remove GLib unicode files from the source list.
  • wtf/unicode/glib/UnicodeGLib.cpp: Removed.
  • wtf/unicode/glib/UnicodeGLib.h: Removed.
Location:
trunk
Files:
5 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r142664 r142724  
     12013-02-12  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the GLib unicode backend
     4        https://bugs.webkit.org/show_bug.cgi?id=109627
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Remove references to the GLib unicode backend from configuration.
     9
     10        * Source/autotools/FindDependencies.m4:
     11        * Source/autotools/ReadCommandLineArguments.m4:
     12        * Source/autotools/SetupAutoconfHeader.m4:
     13        * Source/autotools/SetupAutomake.m4:
     14
    1152013-02-12  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    216

  • trunk/Source/WTF/ChangeLog

    r142718 r142724  
     12013-02-12  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the GLib unicode backend
     4        https://bugs.webkit.org/show_bug.cgi?id=109627
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Remove references to the GLib unicode backend from WTF.
     9
     10        * GNUmakefile.list.am: Remove GLib unicode files from the source list.
     11        * wtf/unicode/glib/UnicodeGLib.cpp: Removed.
     12        * wtf/unicode/glib/UnicodeGLib.h: Removed.
     13
    1142013-02-12  Takeshi Yoshino  <tyoshino@google.com>
    215

  • trunk/Source/WTF/GNUmakefile.list.am

    r141800 r142724  
    262262    Source/WTF/wtf/unicode/Unicode.h \
    263263    Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h \
    264     Source/WTF/wtf/unicode/glib/UnicodeGLib.h \
    265     Source/WTF/wtf/unicode/glib/UnicodeGLib.cpp \
    266264    Source/WTF/wtf/unicode/icu/CollatorICU.cpp \
    267265    Source/WTF/wtf/unicode/icu/UnicodeIcu.h \

  • trunk/Source/WebCore/ChangeLog

    r142721 r142724  
     12013-02-12  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the GLib unicode backend
     4        https://bugs.webkit.org/show_bug.cgi?id=109627
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Remove references to the GLib unicode backend from WebCore.
     9
     10        * GNUmakefile.list.am: Update the source list.
     11        * platform/text/gtk/TextBreakIteratorGtk.cpp: Removed.
     12        * platform/text/gtk/TextCodecGtk.cpp: Removed.
     13        * platform/text/gtk/TextCodecGtk.h: Removed.
     14
    1152013-02-12  Chris Fleizach  <cfleizach@apple.com>
    216

  • trunk/Source/WebCore/GNUmakefile.list.am

    r142698 r142724  
    59785978        Source/WebCore/platform/text/enchant/TextCheckerEnchant.h \
    59795979        Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp \
     5980        Source/WebCore/platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp \
    59805981        Source/WebCore/platform/text/BidiContext.cpp \
    59815982        Source/WebCore/platform/text/BidiContext.h \
    … …  
    60086009        Source/WebCore/platform/text/TextBoundaries.h \
    60096010        Source/WebCore/platform/text/TextBreakIterator.cpp \
     6011        Source/WebCore/platform/text/TextBreakIteratorICU.cpp \
     6012        Source/WebCore/platform/text/TextBreakIteratorInternalICU.h \
    60106013        Source/WebCore/platform/text/TextBreakIterator.h \
    60116014        Source/WebCore/platform/text/TextCheckerClient.h \
    … …  
    60226025        Source/WebCore/platform/text/TextCodecUTF8.cpp \
    60236026        Source/WebCore/platform/text/TextCodecUTF8.h \
     6027        Source/WebCore/platform/text/TextCodecICU.cpp \
     6028        Source/WebCore/platform/text/TextCodecICU.h \
    60246029        Source/WebCore/platform/text/TextDirection.h \
    60256030        Source/WebCore/platform/text/TextEncoding.cpp \
    … …  
    62636268        Source/WebCore/platform/graphics/OpenGLShims.h
    62646269endif # END USE_GLES2
    6265 
    6266 # ----
    6267 # icu unicode backend
    6268 # ----
    6269 if USE_ICU_UNICODE
    6270 webcore_sources += \
    6271         Source/WebCore/platform/text/TextCodecICU.cpp \
    6272         Source/WebCore/platform/text/TextCodecICU.h \
    6273         Source/WebCore/platform/text/TextBreakIteratorICU.cpp \
    6274         Source/WebCore/platform/text/TextBreakIteratorInternalICU.h \
    6275         Source/WebCore/platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
    6276 endif
    6277 
    6278 # ----
    6279 # glib unicode backend
    6280 # ----
    6281 if USE_GLIB_UNICODE
    6282 webcore_sources += \
    6283         Source/WebCore/platform/text/gtk/TextCodecGtk.cpp \
    6284         Source/WebCore/platform/text/gtk/TextCodecGtk.h \
    6285         Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
    6286 endif
    62876270
    62886271if USE_GSTREAMER

  • trunk/Source/autotools/FindDependencies.m4

    r142284 r142724  
    107107GLIB_GSETTINGS
    108108
    109 if test "$with_unicode_backend" = "icu"; then
    110     # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up).
    111     case "$host" in
    112         *-*-darwin*)
    113             UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
    114             UNICODE_LIBS="-licucore"
    115             ;;
    116         *-*-mingw*)
    117             UNICODE_CFLAGS=""
    118             UNICODE_LIBS="-licui18n -licuuc"
    119             ;;
    120         *)
    121             AC_PATH_PROG(icu_config, icu-config, no)
    122             if test "$icu_config" = "no"; then
    123                 AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
    124             fi
    125 
    126             # We don't use --cflags as this gives us a lot of things that we don't necessarily want,
    127             # like debugging and optimization flags. See man (1) icu-config for more info.
    128             UNICODE_CFLAGS=`$icu_config --cppflags`
    129             UNICODE_LIBS=`$icu_config --ldflags-libsonly`
    130             ;;
    131     esac
    132 fi
    133 
    134 if test "$with_unicode_backend" = "glib"; then
    135     PKG_CHECK_MODULES([UNICODE], [glib-2.0 pango >= pango_required_version])
    136 fi
     109# TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up).
     110case "$host" in
     111    *-*-darwin*)
     112        UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
     113        UNICODE_LIBS="-licucore"
     114        ;;
     115    *-*-mingw*)
     116        UNICODE_CFLAGS=""
     117        UNICODE_LIBS="-licui18n -licuuc"
     118        ;;
     119    *)
     120        AC_PATH_PROG(icu_config, icu-config, no)
     121        if test "$icu_config" = "no"; then
     122            AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
     123        fi
     124
     125        # We don't use --cflags as this gives us a lot of things that we don't necessarily want,
     126        # like debugging and optimization flags. See man (1) icu-config for more info.
     127        UNICODE_CFLAGS=`$icu_config --cppflags`
     128        UNICODE_LIBS=`$icu_config --ldflags-libsonly`
     129        ;;
     130esac
    137131
    138132AC_SUBST([UNICODE_CFLAGS])

  • trunk/Source/autotools/ReadCommandLineArguments.m4

    r142634 r142724  
    5858AC_MSG_RESULT([$with_target])
    5959
    60 AC_MSG_CHECKING([which Unicode backend to use])
    61 AC_ARG_WITH(unicode_backend,
    62     AC_HELP_STRING([--with-unicode-backend=@<:@icu/glib@:>@],
    63         [Select Unicode backend (WARNING: the glib-based backend is slow, and incomplete) [default=icu]]),
    64     [
    65         case "$with_unicodebackend" in
    66             icu|glib) ;;
    67             *) AC_MSG_ERROR([Invalid Unicode backend: must be icu or glib.]) ;;
    68          esac
    69     ],
    70     [with_unicode_backend="icu"])
    71 AC_MSG_RESULT([$with_unicode_backend])
    72 
    7360AC_MSG_CHECKING([whether to enable spellcheck support])
    7461AC_ARG_ENABLE([spellcheck],

  • trunk/Source/autotools/SetupAutoconfHeader.m4

    r142634 r142724  
    55AC_DEFINE([WTF_USE_SOUP], [1], [ ])
    66AC_DEFINE([WTF_USE_WEBP], [1], [ ])
     7AC_DEFINE([WTF_USE_ICU_UNICODE], [1], [ ])
    78AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name])
    89
    … …  
    4748    AC_DEFINE([MOZ_X11], [1], [ ])
    4849    AC_DEFINE([WTF_PLATFORM_X11], [1], [Define if target is X11])
    49 fi
    50 
    51 if test "$with_unicode_backend" = "icu"; then
    52     AC_DEFINE([WTF_USE_ICU_UNICODE], [1], [ ])
    53 else
    54     AC_DEFINE([WTF_USE_GLIB_UNICODE], [1], [ ])
    5550fi
    5651

  • trunk/Source/autotools/SetupAutomake.m4

    r142634 r142724  
    2727AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
    2828AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
    29 
    30 # Unicode backend conditionals.
    31 AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
    32 AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
    3329
    3430# GStreamer feature conditionals.
Note: See TracChangeset for help on using the changeset viewer.