Changeset 41579 in webkit


Ignore:
Timestamp:
Mar 11, 2009 4:52:44 AM (15 years ago)
Author:
jmalonzo@webkit.org
Message:

2009-03-11 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Holger Freyther

[GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
​https://bugs.webkit.org/show_bug.cgi?id=2260

pangoft2 is also used in directfb builds so use it for all targets

  • configure.ac:

2009-03-11 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Holger Freyther

[GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
​https://bugs.webkit.org/show_bug.cgi?id=2260

Add missing stdio.h include to get the build going

  • plugins/gtk/PluginPackageGtk.cpp:

2009-03-11 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Holger Freyther.

[GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
​https://bugs.webkit.org/show_bug.cgi?id=2260

Add plugin support only for X11 builds

  • DumpRenderTree/gtk/DumpRenderTree.cpp: (setDefaultsToConsistentStateValuesForTesting):
  • GNUmakefile.am:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r41428 r41579  
     12009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
     2
     3        Reviewed by Holger Freyther
     4
     5        [GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
     6        https://bugs.webkit.org/show_bug.cgi?id=2260
     7
     8        pangoft2 is also used in directfb builds so use it for all targets
     9
     10        * configure.ac:
     11
    1122009-03-02  Xan Lopez  <xan@gnome.org>
    213

  • trunk/WebCore/ChangeLog

    r41578 r41579  
     12009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
     2
     3        Reviewed by Holger Freyther.
     4
     5        [GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
     6        https://bugs.webkit.org/show_bug.cgi?id=2260
     7
     8        Add missing stdio.h include to get the build going
     9
     10        * plugins/gtk/PluginPackageGtk.cpp:
     11
    1122009-03-10  Justin Garcia  <justin.garcia@apple.com>
    213

  • trunk/WebCore/plugins/gtk/PluginPackageGtk.cpp

    r38184 r41579  
    3030#include "PluginPackage.h"
    3131
     32#include <stdio.h>
     33
    3234#include "CString.h"
    3335#include "MIMETypeRegistry.h"

  • trunk/WebKitTools/ChangeLog

    r41522 r41579  
     12009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
     2
     3        Reviewed by Holger Freyther.
     4
     5        [GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
     6        https://bugs.webkit.org/show_bug.cgi?id=2260
     7
     8        Add plugin support only for X11 builds
     9
     10        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     11        (setDefaultsToConsistentStateValuesForTesting):
     12        * GNUmakefile.am:
     13
    1142009-03-08  Holger Hans Peter Freyther  <zecke@selfish.org>
    215

  • trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r41522 r41579  
    301301                 "minimum-font-size", 1,
    302302                 NULL);
    303 
     303#if PLATFORM(X11)
    304304    webkit_web_settings_add_extra_plugin_directory(webView, TEST_PLUGIN_DIR);
     305#endif
    305306}
    306307

  • trunk/WebKitTools/GNUmakefile.am

    r41138 r41579  
    22        Programs/GtkLauncher \
    33        Programs/DumpRenderTree
    4 
    5 noinst_LTLIBRARIES += \
    6         TestNetscapePlugin/libtestnetscapeplugin.la
    74
    85# GtkLauncher
    … …  
    2926
    3027# DumpRenderTree
    31 Programs_DumpRenderTree_CPPFLAGS = \
     28dumprendertree_cppflags := \
    3229        -I$(srcdir)/WebKitTools/DumpRenderTree \
    3330        -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
    3431        -I$(srcdir)/WebKit/gtk \
    3532        -I$(top_builddir)/WebKit/gtk \
    36         -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
    3733        $(global_cppflags) \
    3834        $(javascriptcore_cppflags)
     35
     36Programs_DumpRenderTree_CPPFLAGS = $(dumprendertree_cppflags)
    3937
    4038Programs_DumpRenderTree_SOURCES = \
    … …  
    7876        $(GTK_LIBS)
    7977
    80 # TestNetscapePlugin
     78# clean target
     79CLEANFILES += \
     80        Programs/GtkLauncher \
     81        Programs/DumpRenderTree
     82
     83
     84if TARGET_X11
     85
     86# Build TestNetscapePlugin only for X11
     87# since we don't support plugins for non-X11 builds at the moment.
     88noinst_LTLIBRARIES += \
     89        TestNetscapePlugin/libtestnetscapeplugin.la
     90
     91dumprendertree_cppflags += \
     92        -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\"
     93
    8194TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
    8295        -I$(srcdir)/WebKitTools/DumpRenderTree \
    … …  
    105118        -module
    106119
    107 # clean target
    108 CLEANFILES += \
    109         Programs/GtkLauncher \
    110         Programs/DumpRenderTree \
    111         TestNetscapePlugin/libtestnetscapeplugin.la
     120CLEANFILES += TestNetscapePlugin/libtestnetscapeplugin.la
     121endif

  • trunk/configure.ac

    r41330 r41579  
    204204AC_SUBST(LIBXML_LIBS)
    205205
    206 PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
     206PKG_CHECK_MODULES(PANGO,
     207                  [pango >= $PANGO_REQUIRED_VERSION
     208                   pangoft2])
    207209AC_SUBST(PANGO_CFLAGS)
    208210AC_SUBST(PANGO_LIBS)
    … …  
    542544   PKG_CHECK_MODULES([FREETYPE],
    543545                     [cairo-ft
    544                      pangoft2
    545546                     fontconfig >= $FONTCONFIG_REQUIRED_VERSION
    546547                     freetype2 >= $FREETYPE2_REQUIRED_VERSION])
Note: See TracChangeset for help on using the changeset viewer.