Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (141125 => 141126)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-01-29 17:50:53 UTC (rev 141126)
@@ -1,3 +1,15 @@
+2013-01-29 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [GTK] Missing build flags when building with Harfbuzz
+ https://bugs.webkit.org/show_bug.cgi?id=108174
+
+ Reviewed by Martin Robinson.
+
+ Add FREETYPE_CFLAGS and FREETYPE_LIBS to makefiles so -lharfbuzz
+ parameter will be added to linking lines when needed.
+
+ * GNUmakefile.am: Added FREETYPE_CFLAGS and FREETYPE_LIBS.
+
2013-01-28 Huang Dongsung <luxte...@company100.net>
[TexMap] Enable debug borders and repaint counter via Settings.
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (141125 => 141126)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -438,6 +438,7 @@
$(global_cppflags) \
$(global_cflags) \
$(_javascript_core_cppflags) \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS) \
@@ -447,6 +448,7 @@
webkit_tests_ldadd = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS)
Modified: trunk/Source/WebKit2/ChangeLog (141125 => 141126)
--- trunk/Source/WebKit2/ChangeLog 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-29 17:50:53 UTC (rev 141126)
@@ -1,3 +1,16 @@
+2013-01-29 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [GTK] Missing build flags when building with Harfbuzz
+ https://bugs.webkit.org/show_bug.cgi?id=108174
+
+ Reviewed by Martin Robinson.
+
+ Add FREETYPE_CFLAGS and FREETYPE_LIBS to makefiles so -lharfbuzz
+ parameter will be added to linking lines when needed.
+
+ * GNUmakefile.am: Added FREETYPE_CFLAGS and FREETYPE_LIBS.
+ * UIProcess/API/gtk/tests/GNUmakefile.am: Ditto.
+
2013-01-29 Grzegorz Czajkowski <g.czajkow...@samsung.com>
[EFL] Unified text checker implementation.
Modified: trunk/Source/WebKit2/GNUmakefile.am (141125 => 141126)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -445,6 +445,7 @@
Programs_WebKitWebProcess_CFLAGS = \
$(global_cflags) \
$(CAIRO_CFLAGS) \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(GTK_UNIX_PRINTING_CFLAGS) \
@@ -457,6 +458,7 @@
Programs_WebKitWebProcess_LDADD = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(GTK_UNIX_PRINTING_LIBS) \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (141125 => 141126)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -46,6 +46,7 @@
-I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \
-I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
$(global_cppflags) \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS)
@@ -54,6 +55,7 @@
Libraries/libWebKit2APITestCore.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GEOCLUE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
Modified: trunk/Tools/ChangeLog (141125 => 141126)
--- trunk/Tools/ChangeLog 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Tools/ChangeLog 2013-01-29 17:50:53 UTC (rev 141126)
@@ -1,3 +1,17 @@
+2013-01-29 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [GTK] Missing build flags when building with Harfbuzz
+ https://bugs.webkit.org/show_bug.cgi?id=108174
+
+ Reviewed by Martin Robinson.
+
+ Add FREETYPE_CFLAGS and FREETYPE_LIBS to makefiles so -lharfbuzz
+ parameter will be added to linking lines when needed.
+
+ * GNUmakefile.am: Added FREETYPE_CFLAGS and FREETYPE_LIBS.
+ * MiniBrowser/gtk/GNUmakefile.am: Ditto.
+ * TestWebKitAPI/GNUmakefile.am: Ditto.
+
2013-01-29 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Implement resources API using injected bundle
Modified: trunk/Tools/GNUmakefile.am (141125 => 141126)
--- trunk/Tools/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Tools/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -26,6 +26,7 @@
-ansi \
-fno-strict-aliasing \
$(global_cflags) \
+ $(FREETYPE_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(GSTREAMER_CFLAGS)
@@ -33,6 +34,7 @@
Programs_GtkLauncher_LDADD = \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS) \
Modified: trunk/Tools/MiniBrowser/gtk/GNUmakefile.am (141125 => 141126)
--- trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Tools/MiniBrowser/gtk/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -12,6 +12,7 @@
-DWEBKIT_INJECTED_BUNDLE_PATH=\"${shell pwd}/$(top_builddir)/.libs\" \
$(global_cppflags) \
$(_javascript_core_cppflags) \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS)
@@ -34,6 +35,7 @@
Programs_MiniBrowser_LDADD = \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(LIBSOUP_LIBS)
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (141125 => 141126)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-01-29 17:44:35 UTC (rev 141125)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-01-29 17:50:53 UTC (rev 141126)
@@ -73,6 +73,7 @@
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS)
@@ -82,6 +83,7 @@
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(LIBSOUP_LIBS)
@@ -104,6 +106,7 @@
Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
-I$(top_builddir)/DerivedSources/WebKit2/include \
+ $(FREETYPE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS)
@@ -113,6 +116,7 @@
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
$(LIBSOUP_LIBS)
