Diff
Modified: trunk/Source/WebKit2/ChangeLog (96120 => 96121)
--- trunk/Source/WebKit2/ChangeLog 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-27 16:40:03 UTC (rev 96121)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Rename WebKit2 GTK+ API main header as webkit2.h
+ https://bugs.webkit.org/show_bug.cgi?id=65178
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Add webkit2.h.
+ * UIProcess/API/gtk/WebKitWebView.h:
+ * UIProcess/API/gtk/webkit2.h: Renamed from Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h.
+ * webkit2gtk.pc.in: Use webkitgtk-<api-version> as include dir.
+
2011-09-27 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Fix build of WebKit2 unit-tests after r96108
Modified: trunk/Source/WebKit2/GNUmakefile.am (96120 => 96121)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-27 16:40:03 UTC (rev 96121)
@@ -65,10 +65,13 @@
$(WebKit2)/UIProcess/API/C/WKProtectionSpace.h \
$(WebKit2)/UIProcess/API/C/WKProtectionSpaceTypes.h \
$(WebKit2)/UIProcess/API/C/WKResourceCacheManager.h \
- $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h \
+ $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
+
+libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
+libwebkit2gtkinclude_HEADERS = \
$(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \
$(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
- $(WebKit2)/UIProcess/API/gtk/webkit/webkit.h
+ $(WebKit2)/UIProcess/API/gtk/webkit2.h
webkit2_built_sources += \
DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
@@ -454,7 +457,7 @@
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h \
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h \
- Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h \
+ Source/WebKit2/UIProcess/API/gtk/webkit2.h \
Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp \
Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h \
Source/WebKit2/UIProcess/Authentication/AuthenticationDecisionListener.cpp \
@@ -849,6 +852,7 @@
-I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
-I$(top_builddir)/DerivedSources/WebKit2 \
-I$(top_builddir)/DerivedSources/WebKit2/include \
+ -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \
-I$(top_builddir)/DerivedSources/WebKit2/include/_javascript_Core \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
@@ -874,7 +878,7 @@
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
- $(prefix)/include/webkit2-@WEBKITGTK_API_VERSION@/WebKit2
+ $(libwebkit2gtkincludedir)/WebKit2
# For the Gtk port we want to use XP_UNIX both in X11 and Mac
if !TARGET_WIN32
@@ -923,9 +927,16 @@
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
$(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) gtk
- $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup
+ $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup
+
BUILT_SOURCES += generate-webkit2-forwarding-headers
+$(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2: $(libwebkit2gtkinclude_HEADERS)
+ $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/include/webkit2gtk \
+ && ln -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
+
+BUILT_SOURCES += $(GENSOURCES_WEBKIT2)/include/webkit2gtk/webkit2
+
vpath %.messages.in = \
$(WebKit2)/PluginProcess \
$(WebKit2)/Shared/Plugins \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (96120 => 96121)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-27 16:40:03 UTC (rev 96121)
@@ -23,7 +23,7 @@
#ifndef WebKitWebView_h
#define WebKitWebView_h
-#include <WebKit2/WebKitWebViewBase.h>
+#include <webkit2/WebKitWebViewBase.h>
G_BEGIN_DECLS
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h (96120 => 96121)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h 2011-09-27 16:40:03 UTC (rev 96121)
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __WEBKIT_H__
-#define __WEBKIT_H__
-
-#include <WebKit2/WebKit2.h>
-#include <WebKit2/WebKitWebViewBase.h>
-#include <WebKit2/WebKitWebView.h>
-
-#endif /* __WEBKIT_H__ */
Copied: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h (from rev 96120, trunk/Source/WebKit2/UIProcess/API/gtk/webkit/webkit.h) (0 => 96121)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2011-09-27 16:40:03 UTC (rev 96121)
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __WEBKIT2_H__
+#define __WEBKIT2_H__
+
+#include <webkit2/WebKitWebViewBase.h>
+#include <webkit2/WebKitWebView.h>
+
+#endif /* __WEBKIT2_H__ */
Modified: trunk/Source/WebKit2/webkit2gtk.pc.in (96120 => 96121)
--- trunk/Source/WebKit2/webkit2gtk.pc.in 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Source/WebKit2/webkit2gtk.pc.in 2011-09-27 16:40:03 UTC (rev 96121)
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit2-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@ -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@/webkit2
Modified: trunk/Tools/ChangeLog (96120 => 96121)
--- trunk/Tools/ChangeLog 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Tools/ChangeLog 2011-09-27 16:40:03 UTC (rev 96121)
@@ -1,3 +1,13 @@
+2011-09-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Rename WebKit2 GTK+ API main header as webkit2.h
+ https://bugs.webkit.org/show_bug.cgi?id=65178
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+ * GtkLauncher/main.c: Include <webkit2/webkit2.h>.
+
2011-09-27 Csaba Osztrogonác <o...@webkit.org>
[Qt][WK2] Buildfix after r96108.
Modified: trunk/Tools/GNUmakefile.am (96120 => 96121)
--- trunk/Tools/GNUmakefile.am 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Tools/GNUmakefile.am 2011-09-27 16:40:03 UTC (rev 96121)
@@ -57,6 +57,7 @@
-I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
-I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \
-I$(srcdir)/Source/WebKit/gtk \
+ -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \
-I$(top_builddir)/Source/WebKit/gtk \
-I$(top_builddir)/DerivedSources \
$(global_cppflags) \
Modified: trunk/Tools/GtkLauncher/main.c (96120 => 96121)
--- trunk/Tools/GtkLauncher/main.c 2011-09-27 16:38:19 UTC (rev 96120)
+++ trunk/Tools/GtkLauncher/main.c 2011-09-27 16:40:03 UTC (rev 96121)
@@ -29,7 +29,11 @@
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
+#ifdef WEBKIT2
+#include <webkit2/webkit2.h>
+#else
#include <webkit/webkit.h>
+#endif
static gint windowCount = 0;
