From ff4363be986e8f3830b33ad059015f6eb284046c Mon Sep 17 00:00:00 2001
From: Ladislav Hagara
Date: Sun, 10 Oct 2010 05:20:53 +0200
Subject: webkitgtk 1.2.5, SECURITY_PATCH=2, #15882 (cherry picked from commit
 78ff475a4a4ad7abcb5bd8e24f6b43005f629e67)

---
 http/webkitgtk/DETAILS | 6 +++---
 http/webkitgtk/HISTORY | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 6facb1223f..27f4164827 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -6,11 +6,11 @@ if [[ $WEBKITGTK_NIGHT == "y" ]]; then
      SOURCE_HASH=sha512:ebdd3309af6d4e6725e781bf6fb788f56e3c992ebcde8a6bd75c75db29803dd0a5f52c6b47338378b5622fa6763943081b247ea3df4265990ea9752e0c5a1a66
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
-         VERSION=1.2.4
-  SECURITY_PATCH=1
+         VERSION=1.2.5
+  SECURITY_PATCH=2
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:b0c05f5592b3a87d50f7b13e59fc2e139c17f0bfc29c60675b6892240e62e91726eef0c03e1f9b64e986b249ced8caff11729c28e1213f90e47014837a614d3e
+     SOURCE_HASH=sha512:70f66b0253b79db0c2b5b8c8b71b70b374926f957b0ab79424993d4ae122602e6f0363c6750cba0655efd67a3ae5e89b5af2231897377c66a5d56bd8a97e695c
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 9fee456f0d..41b970f051 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-10-10 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.2.5, SECURITY_PATCH=2, #15882
+
 2010-09-26 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated devel to version 1.3.4
 
-- 
cgit v1.2.3