diff --git a/.gitignore b/.gitignore index db2900e..9dfacce 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /webkitgtk-2.7.4.tar.xz /webkitgtk-2.7.90.tar.xz /webkitgtk-2.7.91.tar.xz +/webkitgtk-2.7.92.tar.xz diff --git a/sources b/sources index 69840bc..5fbe635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f4dd7b3a3a098a3c8220b49c656a41c webkitgtk-2.7.91.tar.xz +d93e2db02d192c24ab673cf0c1752133 webkitgtk-2.7.92.tar.xz diff --git a/webkitgtk-2.7.91-ax-child-changed.patch b/webkitgtk-2.7.91-ax-child-changed.patch deleted file mode 100644 index 6a9de60..0000000 --- a/webkitgtk-2.7.91-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.7.91-webview-webcontext-ref.patch b/webkitgtk-2.7.91-webview-webcontext-ref.patch deleted file mode 100644 index ecd268b..0000000 --- a/webkitgtk-2.7.91-webview-webcontext-ref.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp -+++ a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp -@@ -170,7 +170,6 @@ struct _WebKitWebViewPrivate { - g_main_loop_quit(modalLoop.get()); - } - -- WebKitWebContext* context; - WebKitWebView* relatedView; - CString title; - CString customTextEncoding; -@@ -185,6 +184,7 @@ struct _WebKitWebViewPrivate { - GRefPtr backForwardList; - GRefPtr settings; - GRefPtr userContentManager; -+ GRefPtr context; - GRefPtr windowProperties; - - GRefPtr modalLoop; -@@ -448,7 +448,7 @@ static void webkitWebViewRequestFavicon(WebKitWebView* webView) - - WebKitWebViewPrivate* priv = webView->priv; - priv->faviconCancellable = adoptGRef(g_cancellable_new()); -- WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context); -+ WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context.get()); - webkit_favicon_database_get_favicon(database, priv->activeURI.data(), priv->faviconCancellable.get(), gotFaviconCallback, webView); - } - -@@ -510,7 +510,7 @@ static void webkitWebViewWatchForChangesInFavicon(WebKitWebView* webView) - if (priv->faviconChangedHandlerID) - return; - -- WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context); -+ WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context.get()); - priv->faviconChangedHandlerID = g_signal_connect(database, "favicon-changed", G_CALLBACK(faviconChangedCallback), webView); - } - -@@ -518,7 +518,7 @@ static void webkitWebViewDisconnectFaviconDatabaseSignalHandlers(WebKitWebView* - { - WebKitWebViewPrivate* priv = webView->priv; - if (priv->faviconChangedHandlerID) -- g_signal_handler_disconnect(webkit_web_context_get_favicon_database(priv->context), priv->faviconChangedHandlerID); -+ g_signal_handler_disconnect(webkit_web_context_get_favicon_database(priv->context.get()), priv->faviconChangedHandlerID); - priv->faviconChangedHandlerID = 0; - } - -@@ -639,7 +639,7 @@ static void webkitWebViewConstructed(GObject* object) - if (!priv->settings) - priv->settings = adoptGRef(webkit_settings_new()); - -- webkitWebContextCreatePageForWebView(priv->context, webView, priv->userContentManager.get(), priv->relatedView); -+ webkitWebContextCreatePageForWebView(priv->context.get(), webView, priv->userContentManager.get(), priv->relatedView); - - priv->loadObserver = std::make_unique(webView); - getPage(webView)->pageLoadState().addObserver(*priv->loadObserver); -@@ -706,7 +706,7 @@ static void webkitWebViewGetProperty(GObject* object, guint propId, GValue* valu - - switch (propId) { - case PROP_WEB_CONTEXT: -- g_value_set_object(value, webView->priv->context); -+ g_value_set_object(value, webView->priv->context.get()); - break; - case PROP_SETTINGS: - g_value_set_object(value, webkit_web_view_get_settings(webView)); -@@ -756,7 +756,7 @@ static void webkitWebViewDispose(GObject* object) - webView->priv->loadObserver.reset(); - } - -- webkitWebContextWebViewDestroyed(webView->priv->context, webView); -+ webkitWebContextWebViewDestroyed(webView->priv->context.get(), webView); - - G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object); - } -@@ -1811,7 +1811,7 @@ void webkitWebViewLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent) - priv->mainResource = 0; - priv->waitingForMainResource = false; - } else if (loadEvent == WEBKIT_LOAD_COMMITTED) { -- WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context); -+ WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context.get()); - GUniquePtr faviconURI(webkit_favicon_database_get_favicon_uri(database, priv->activeURI.data())); - webkitWebViewUpdateFaviconURI(webView, faviconURI.get()); - -@@ -1843,7 +1843,7 @@ void webkitWebViewLoadFailedWithTLSErrors(WebKitWebView* webView, const char* fa - { - webkitWebViewCancelAuthenticationRequest(webView); - -- WebKitTLSErrorsPolicy tlsErrorsPolicy = webkit_web_context_get_tls_errors_policy(webView->priv->context); -+ WebKitTLSErrorsPolicy tlsErrorsPolicy = webkit_web_context_get_tls_errors_policy(webView->priv->context.get()); - if (tlsErrorsPolicy == WEBKIT_TLS_ERRORS_POLICY_FAIL) { - gboolean returnValue; - g_signal_emit(webView, signals[LOAD_FAILED_WITH_TLS_ERRORS], 0, failingURI, certificate, tlsErrors, &returnValue); -@@ -2247,7 +2247,7 @@ WebKitWebContext* webkit_web_view_get_context(WebKitWebView *webView) - { - g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0); - -- return webView->priv->context; -+ return webView->priv->context.get(); - } - - /** -@@ -3381,7 +3381,7 @@ WebKitDownload* webkit_web_view_download_uri(WebKitWebView* webView, const char* - g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0); - g_return_val_if_fail(uri, 0); - -- WebKitDownload* download = webkitWebContextStartDownload(webView->priv->context, uri, getPage(webView)); -+ WebKitDownload* download = webkitWebContextStartDownload(webView->priv->context.get(), uri, getPage(webView)); - webkitDownloadSetWebView(download, webView); - - return download; diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 47dd644..aafb721 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -8,8 +8,8 @@ %global _hardened_build 1 Name: webkitgtk4 -Version: 2.7.91 -Release: 3%{?dist} +Version: 2.7.92 +Release: 1%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -21,12 +21,8 @@ Patch0: webkitgtk-2.7.4-nspluginwrapper.patch Patch1: webkitgtk-2.7.90-user-agent-branding.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=142225 -Patch4: webkitgtk-2.7.91-webview-webcontext-ref.patch # https://bugs.webkit.org/show_bug.cgi?id=142333 -Patch5: webkitgtk-2.7.91-matrix-multiplication.patch -# https://bugs.webkit.org/show_bug.cgi?id=142309 -Patch6: webkitgtk-2.7.91-ax-child-changed.patch +Patch4: webkitgtk-2.7.91-matrix-multiplication.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -103,9 +99,7 @@ This package contains developer documentation for %{name}. %ifarch %{power64} aarch64 ppc %patch3 -p1 -b .commit_align %endif -%patch4 -p1 -b .webview_webcontext_ref -%patch5 -p1 -b .matrix_multiplication -%patch6 -p1 -b .ax_child_changed +%patch4 -p1 -b .matrix_multiplication # Remove bundled libraries rm -rf Source/ThirdParty/leveldb/ @@ -131,10 +125,6 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x ppc %{power64} aarch64 -%global optflags %{optflags} -DENABLE_YARR_JIT=0 -%endif - %if 0%{?fedora} %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' %endif @@ -147,6 +137,7 @@ pushd %{_target_platform} -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_GTKDOC=ON \ + -DENABLE_MINIBROWSER=ON \ %ifarch s390 aarch64 -DUSE_LD_GOLD=OFF \ %endif @@ -157,7 +148,7 @@ pushd %{_target_platform} .. popd -make -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} %install %make_install -C %{_target_platform} @@ -212,6 +203,11 @@ make -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Tue Mar 17 2015 Tomas Popela - 2.7.92-1 +- Update to 2.7.92 +- Re-enable parallel build +- Compile and ship MiniBrowser + * Mon Mar 16 2015 Michael Catanzaro 2.7.91-3 - Add a couple patches to fix more crashes