Title: [171848] trunk
- Revision
- 171848
- Author
- [email protected]
- Date
- 2014-07-31 06:18:24 -0700 (Thu, 31 Jul 2014)
Log Message
Unreviewed. Fix GTK+ make distcheck.
Source/WebKit2:
* Shared/InteractionInformationAtPosition.h: Only include
WebCore/SelectionRect.h for IOS.
Tools:
* gtk/make-dist.py:
(ensure_version_if_possible): Use 4.0 instead of 3.0 as binary
version to find the pkg-config file.
* gtk/manifest.txt: Add missing resource to the tarball.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171847 => 171848)
--- trunk/Source/WebKit2/ChangeLog 2014-07-31 12:27:14 UTC (rev 171847)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-31 13:18:24 UTC (rev 171848)
@@ -1,5 +1,12 @@
2014-07-31 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix GTK+ make distcheck.
+
+ * Shared/InteractionInformationAtPosition.h: Only include
+ WebCore/SelectionRect.h for IOS.
+
+2014-07-31 Carlos Garcia Campos <[email protected]>
+
[GTK] Bump binary version for 2.6
https://bugs.webkit.org/show_bug.cgi?id=133724
Modified: trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h (171847 => 171848)
--- trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-07-31 12:27:14 UTC (rev 171847)
+++ trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2014-07-31 13:18:24 UTC (rev 171848)
@@ -29,9 +29,12 @@
#include "ArgumentCoders.h"
#include "ShareableBitmap.h"
#include <WebCore/IntPoint.h>
-#include <WebCore/SelectionRect.h>
#include <wtf/text/WTFString.h>
+#if PLATFORM(IOS)
+#include <WebCore/SelectionRect.h>
+#endif
+
namespace WebKit {
#if PLATFORM(IOS)
Modified: trunk/Tools/ChangeLog (171847 => 171848)
--- trunk/Tools/ChangeLog 2014-07-31 12:27:14 UTC (rev 171847)
+++ trunk/Tools/ChangeLog 2014-07-31 13:18:24 UTC (rev 171848)
@@ -1,5 +1,14 @@
2014-07-31 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix GTK+ make distcheck.
+
+ * gtk/make-dist.py:
+ (ensure_version_if_possible): Use 4.0 instead of 3.0 as binary
+ version to find the pkg-config file.
+ * gtk/manifest.txt: Add missing resource to the tarball.
+
+2014-07-31 Carlos Garcia Campos <[email protected]>
+
[GTK] make distcheck is building from sources dir instead of dist dir
https://bugs.webkit.org/show_bug.cgi?id=135457
Modified: trunk/Tools/gtk/make-dist.py (171847 => 171848)
--- trunk/Tools/gtk/make-dist.py 2014-07-31 12:27:14 UTC (rev 171847)
+++ trunk/Tools/gtk/make-dist.py 2014-07-31 13:18:24 UTC (rev 171848)
@@ -294,7 +294,7 @@
if arguments.version is not None:
return
- pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-3.0.pc")
+ pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit2/webkit2gtk-4.0.pc")
if os.path.isfile(pkgconfig_file):
p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
version = p.communicate()[0]
Modified: trunk/Tools/gtk/manifest.txt (171847 => 171848)
--- trunk/Tools/gtk/manifest.txt 2014-07-31 12:27:14 UTC (rev 171847)
+++ trunk/Tools/gtk/manifest.txt 2014-07-31 13:18:24 UTC (rev 171848)
@@ -75,6 +75,7 @@
file Source/WebCore/Resources/missingImage.png
file Source/WebCore/Resources/[email protected]
file Source/WebCore/Resources/panIcon.png
+file Source/WebCore/Resources/plugIns.js
file Source/WebCore/Resources/textAreaResizeCorner.png
file Source/WebCore/Resources/[email protected]
file Source/WebCore/Resources/urlIcon.png
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
