2009-03-11 Jan Michael Alonzo <jmalonzo@webkit.org>
authorjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2009 11:52:44 +0000 (11:52 +0000)
committerjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2009 11:52:44 +0000 (11:52 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/ChangeLog
WebCore/plugins/gtk/PluginPackageGtk.cpp
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
WebKitTools/GNUmakefile.am
configure.ac

index 1af6e4a..1ec4e60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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-02  Xan Lopez  <xan@gnome.org>
 
         Reviewed by Mark Rowe.
index 0cd149d..1cc9c96 100644 (file)
@@ -1,3 +1,14 @@
+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-10  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Ken Kocienda.
index 997583e..1337c31 100644 (file)
@@ -29,6 +29,8 @@
 #include "config.h"
 #include "PluginPackage.h"
 
+#include <stdio.h>
+
 #include "CString.h"
 #include "MIMETypeRegistry.h"
 #include "NotImplemented.h"
index 86171a8..4cc8607 100644 (file)
@@ -1,3 +1,16 @@
+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:
+
 2009-03-08  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Mark Rowe.
index ac86579..0b1f913 100644 (file)
@@ -300,8 +300,9 @@ static void setDefaultsToConsistentStateValuesForTesting()
                  "default-monospace-font-size", 13,
                  "minimum-font-size", 1,
                  NULL);
-
+#if PLATFORM(X11)
     webkit_web_settings_add_extra_plugin_directory(webView, TEST_PLUGIN_DIR);
+#endif
 }
 
 static void runTest(const string& testPathOrURL)
index 1c1bee3..7e98e73 100644 (file)
@@ -2,9 +2,6 @@ noinst_PROGRAMS += \
        Programs/GtkLauncher \
        Programs/DumpRenderTree
 
-noinst_LTLIBRARIES += \
-       TestNetscapePlugin/libtestnetscapeplugin.la
-
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
        -I$(srcdir)/WebKit/gtk \
@@ -28,15 +25,16 @@ Programs_GtkLauncher_LDADD = \
        $(GTK_LIBS)
 
 # DumpRenderTree
-Programs_DumpRenderTree_CPPFLAGS = \
+dumprendertree_cppflags := \
        -I$(srcdir)/WebKitTools/DumpRenderTree \
        -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
        -I$(srcdir)/WebKit/gtk \
        -I$(top_builddir)/WebKit/gtk \
-       -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
        $(global_cppflags) \
        $(javascriptcore_cppflags)
 
+Programs_DumpRenderTree_CPPFLAGS = $(dumprendertree_cppflags)
+
 Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/AccessibilityController.h \
        WebKitTools/DumpRenderTree/AccessibilityUIElement.h \
@@ -77,7 +75,22 @@ Programs_DumpRenderTree_LDADD = \
        $(CAIRO_LIBS) \
        $(GTK_LIBS)
 
-# TestNetscapePlugin
+# clean target
+CLEANFILES += \
+       Programs/GtkLauncher \
+       Programs/DumpRenderTree
+
+
+if TARGET_X11
+
+# Build TestNetscapePlugin only for X11
+# since we don't support plugins for non-X11 builds at the moment.
+noinst_LTLIBRARIES += \
+       TestNetscapePlugin/libtestnetscapeplugin.la
+
+dumprendertree_cppflags += \
+       -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\"
+
 TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
        -I$(srcdir)/WebKitTools/DumpRenderTree \
        -I$(srcdir)/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/ForwardingHeaders \
@@ -104,8 +117,5 @@ TestNetscapePlugin_libtestnetscapeplugin_la_LDFLAGS = \
        -avoid-version \
        -module
 
-# clean target
-CLEANFILES += \
-       Programs/GtkLauncher \
-       Programs/DumpRenderTree \
-       TestNetscapePlugin/libtestnetscapeplugin.la
+CLEANFILES += TestNetscapePlugin/libtestnetscapeplugin.la
+endif
index bed5560..efb484d 100644 (file)
@@ -203,7 +203,9 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
-PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
+PKG_CHECK_MODULES(PANGO, 
+                  [pango >= $PANGO_REQUIRED_VERSION
+                   pangoft2])
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
 
@@ -541,7 +543,6 @@ if test "$with_font_backend" = "freetype"; then
    else
    PKG_CHECK_MODULES([FREETYPE],
                      [cairo-ft
-                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION])
    fi