tpopela pushed to webkitgtk4 (f21). "Update to 2.6.6"

[notifications at fedoraproject.org]

>From f8473e902eac426269eab302bb845e118d45c31b Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela at redhat.com>
Date: Tue, 7 Apr 2015 11:29:44 +0200
Subject: Update to 2.6.6


diff --git a/.gitignore b/.gitignore
index da43e43..4c162f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /webkitgtk-2.6.3.tar.xz
 /webkitgtk-2.6.4.tar.xz
 /webkitgtk-2.6.5.tar.xz
+/webkitgtk-2.6.6.tar.xz
diff --git a/sources b/sources
index 807968e..c9b7a61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44addb5ccdace97642cb7656382293bb  webkitgtk-2.6.5.tar.xz
+3c8c2ec4e4070aae12e96a9e25f83edc  webkitgtk-2.6.6.tar.xz
diff --git a/webkitgtk-2.6.5-ax-child-changed.patch b/webkitgtk-2.6.5-ax-child-changed.patch
deleted file mode 100644
index 6a9de60..0000000
--- a/webkitgtk-2.6.5-ax-child-changed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp	
-+++ a/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp	
-@@ -80,6 +80,14 @@ void AXObjectCache::attachWrapper(AccessibilityObject* obj)
-     if (obj->accessibilityIsIgnoredByDefault())
-         return;
- 
-+    // Don't emit the signal if the object being added is not -- or not yet -- rendered,
-+    // which can occur in nested iframes. In these instances we don't want to ignore the
-+    // child. But if an assistive technology is listening, AT-SPI2 will attempt to create
-+    // and cache the state set for the child upon emission of the signal. If the object
-+    // has not yet been rendered, this will result in a crash.
-+    if (!obj->renderer())
-+        return;
-+
-     // Don't emit the signal for objects whose parents won't be exposed directly.
-     AccessibilityObject* coreParent = obj->parentObjectUnignored();
-     if (!coreParent || coreParent->accessibilityIsIgnoredByDefault())
diff --git a/webkitgtk-2.6.5-late-certificate-verification.patch b/webkitgtk-2.6.5-late-certificate-verification.patch
deleted file mode 100644
index 6aa0437..0000000
--- a/webkitgtk-2.6.5-late-certificate-verification.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
-+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
-@@ -331,5 +331,5 @@
- }
- 
--static void gotHeadersCallback(SoupMessage* message, gpointer data)
-+static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data)
- {
-     ResourceHandle* handle = static_cast<ResourceHandle*>(data);
-@@ -337,8 +337,13 @@
-         return;
- 
--    if (handleUnignoredTLSErrors(handle, message)) {
-+    if (handleUnignoredTLSErrors(handle, message))
-         handle->cancel();
--        return;
--    }
-+}
-+
-+static void gotHeadersCallback(SoupMessage* message, gpointer data)
-+{
-+    ResourceHandle* handle = static_cast<ResourceHandle*>(data);
-+    if (!handle || handle->cancelledOrClientless())
-+        return;
- 
-     ResourceHandleInternal* d = handle->getInternal();
-@@ -935,4 +940,5 @@
-         soup_message_headers_set_content_length(soupMessage->request_headers, 0);
- 
-+    g_signal_connect(d->m_soupMessage.get(), "notify::tls-errors", G_CALLBACK(tlsErrorsChangedCallback), handle);
-     g_signal_connect(d->m_soupMessage.get(), "got-headers", G_CALLBACK(gotHeadersCallback), handle);
-     g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index 6d34294..db9dadf 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -9,8 +9,8 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.6.5
-Release:        3%{?dist}
+Version:        2.6.6
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
@@ -21,10 +21,6 @@ Patch0:         webkit-1.1.14-nspluginwrapper.patch
 Patch1:         webkitgtk-2.6.4-disable-codec-installer.patch
 Patch2:         webkitgtk-2.5.90-cloop_fix.patch
 Patch3:         webkitgtk-2.5.2-commit_align.patch
-# https://bugs.webkit.org/show_bug.cgi?id=142309
-Patch4:         webkitgtk-2.6.5-ax-child-changed.patch
-# http://seclists.org/oss-sec/2015/q1/871
-Patch5:         webkitgtk-2.6.5-late-certificate-verification.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -98,8 +94,6 @@ This package contains developer documentation for %{name}.
 %ifarch %{power64} aarch64 ppc
 %patch3 -p1 -b .commit_align
 %endif
-%patch4 -p1 -b .ax_child_changed
-%patch5 -p1 -b .late_certificate_verification
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/leveldb/
@@ -192,6 +186,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Tue Apr 07 2015 Tomas Popela <tpopela at redhat.com> - 2.6.6-1
+- Update to 2.6.6
+
 * Tue Mar 17 2015 Michael Catanzaro <mcatanzaro at gnome.org> - 2.6.5-3
 - Add patch for late certificate verification
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/webkitgtk4.git/commit/?h=f21&id=f8473e902eac426269eab302bb845e118d45c31b