From d8f99a303ef869fc0fe7b88ac93e8a6b47dd0a75 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 4 Aug 2012 18:11:57 +0000
Subject: Update to 1.8.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17020 df743ca5-7f9a-e211-a948-0013205c9059
---
 www/webkit-gtk2/Makefile                                    |  5 ++---
 www/webkit-gtk2/distinfo                                    |  4 ++--
 www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h | 11 +++++++++++
 www/webkit-gtk2/files/patch-configure                       |  4 ++--
 www/webkit-gtk3/Makefile                                    |  4 ++--
 www/webkit-gtk3/distinfo                                    |  4 ++--
 www/webkit-gtk3/files/patch-Source_WebCore_editing_Editor.h | 11 +++++++++++
 7 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
 create mode 100644 www/webkit-gtk3/files/patch-Source_WebCore_editing_Editor.h

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index c6ac5caa4..54b3decfc 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.87 2012/05/22 17:09:57 kwm Exp $
+#   $MCom$
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTVERSION=	1.8.2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index c56ca5531..8d7861411 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.8.1.tar.xz) = 9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28
-SIZE (webkit-1.8.1.tar.xz) = 7949924
+SHA256 (webkit-1.8.2.tar.xz) = 0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6
+SIZE (webkit-1.8.2.tar.xz) = 8016692
diff --git a/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h b/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
new file mode 100644
index 000000000..61bbe6586
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
@@ -0,0 +1,11 @@
+--- ./Source/WebCore/editing/Editor.h.orig	2012-08-04 16:33:45.000000000 +0200
++++ ./Source/WebCore/editing/Editor.h	2012-08-04 16:34:06.000000000 +0200
+@@ -385,7 +385,7 @@
+     void deviceScaleFactorChanged();
+ 
+ private:
+-    virtual void willDetachPage() OVERRIDE;
++    virtual void willDetachPage();
+ 
+     OwnPtr<DeleteButtonController> m_deleteButtonController;
+     RefPtr<CompositeEditCommand> m_lastEditCommand;
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
index 60b18be03..6cb7fa58b 100644
--- a/www/webkit-gtk2/files/patch-configure
+++ b/www/webkit-gtk2/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2012-05-16 12:57:04.000000000 +0200
-+++ configure	2012-05-16 14:00:03.000000000 +0200
+--- configure.orig	2012-08-04 12:19:43.000000000 +0200
++++ configure	2012-08-04 13:15:32.000000000 +0200
 @@ -17704,7 +17704,7 @@
  fi
  case $host in
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index a479d8678..33fae82e1 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.27 2012/05/22 17:09:57 kwm Exp $
+#   $MCom: ports/www/webkit-gtk3/Makefile,v 1.28 2012/07/13 18:32:14 kwm Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index c56ca5531..8d7861411 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkit-1.8.1.tar.xz) = 9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28
-SIZE (webkit-1.8.1.tar.xz) = 7949924
+SHA256 (webkit-1.8.2.tar.xz) = 0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6
+SIZE (webkit-1.8.2.tar.xz) = 8016692
diff --git a/www/webkit-gtk3/files/patch-Source_WebCore_editing_Editor.h b/www/webkit-gtk3/files/patch-Source_WebCore_editing_Editor.h
new file mode 100644
index 000000000..61bbe6586
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-Source_WebCore_editing_Editor.h
@@ -0,0 +1,11 @@
+--- ./Source/WebCore/editing/Editor.h.orig	2012-08-04 16:33:45.000000000 +0200
++++ ./Source/WebCore/editing/Editor.h	2012-08-04 16:34:06.000000000 +0200
+@@ -385,7 +385,7 @@
+     void deviceScaleFactorChanged();
+ 
+ private:
+-    virtual void willDetachPage() OVERRIDE;
++    virtual void willDetachPage();
+ 
+     OwnPtr<DeleteButtonController> m_deleteButtonController;
+     RefPtr<CompositeEditCommand> m_lastEditCommand;
-- 
cgit v1.2.3