[153817] trunk/dports/www/webkit2-gtk

[jeremyhu at macports.org]

Revision: 153817
          https://trac.macports.org/changeset/153817
Author:   jeremyhu at macports.org
Date:     2016-10-12 02:33:18 -0700 (Wed, 12 Oct 2016)
Log Message:
-----------
webkit2-gtk: Fixup bad merge conflict resolution

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/Portfile

Removed Paths:
-------------
    trunk/dports/www/webkit2-gtk/files/PR-162261.patch
    trunk/dports/www/webkit2-gtk/files/PR-162302.patch

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-10-12 09:24:18 UTC (rev 153816)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-10-12 09:33:18 UTC (rev 153817)
@@ -72,15 +72,11 @@
 # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
 # PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
 # PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
-# PR-162261.patch: https://bugs.webkit.org/show_bug.cgi?id=162261
-# PR-162302.patch: https://bugs.webkit.org/show_bug.cgi?id=162302
 patchfiles-append \
     PR-152650-2.patch \
     PR-153138.patch \
     PR-157554.patch \
-    PR-157574.patch \
-    PR-162261.patch \
-    PR-162302.patch
+    PR-157574.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}

Deleted: trunk/dports/www/webkit2-gtk/files/PR-162261.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-162261.patch	2016-10-12 09:24:18 UTC (rev 153816)
+++ trunk/dports/www/webkit2-gtk/files/PR-162261.patch	2016-10-12 09:33:18 UTC (rev 153817)
@@ -1,24 +0,0 @@
-diff --git a/Source/WebCore/platform/PlatformPasteboard.h b/Source/WebCore/platform/PlatformPasteboard.h
-index 695bc0e..1bfdfa4 100644
---- Source/WebCore/platform/PlatformPasteboard.h
-+++ Source/WebCore/platform/PlatformPasteboard.h
-@@ -26,6 +26,7 @@
- #ifndef PlatformPasteboard_h
- #define PlatformPasteboard_h
- 
-+#include <functional>
- #include <wtf/Forward.h>
- #include <wtf/RefCounted.h>
- #include <wtf/RetainPtr.h>
-diff --git a/Source/WebCore/platform/gtk/PasteboardHelper.h b/Source/WebCore/platform/gtk/PasteboardHelper.h
-index b15fbef..3f3c8da 100644
---- Source/WebCore/platform/gtk/PasteboardHelper.h
-+++ Source/WebCore/platform/gtk/PasteboardHelper.h
-@@ -26,6 +26,7 @@
- #define PasteboardHelper_h
- 
- #include "GRefPtrGtk.h"
-+#include <functional>
- #include <wtf/Noncopyable.h>
- #include <wtf/Vector.h>
- #include <wtf/glib/GRefPtr.h>

Deleted: trunk/dports/www/webkit2-gtk/files/PR-162302.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-162302.patch	2016-10-12 09:24:18 UTC (rev 153816)
+++ trunk/dports/www/webkit2-gtk/files/PR-162302.patch	2016-10-12 09:33:18 UTC (rev 153817)
@@ -1,12 +0,0 @@
-diff --git a/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-index 4fed6e9..c58d835 100644
---- Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-+++ Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
-@@ -33,6 +33,7 @@
- #include "RenderThemeGadget.h"
- #include "ScrollView.h"
- #include "Scrollbar.h"
-+#include <cstdlib>
- #include <gtk/gtk.h>
- 
- namespace WebCore {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161012/a39c8b6c/attachment-0002.html>