rpm/webkit2gtk3
SHA256
1
0
Fork 0
forked from pool/webkit2gtk3
Code Pull Requests Activity

Accepting request 583759 from GNOME:Next

Browse Source 
Push GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/583759
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2018-03-09 10:13:55 +00:00 committed by Git OBS Bridge
parent bbdf73e9ea
commit 3f6bfd64e8
9 changed files with 2136 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
webkit2gtk3-fix-wayland-crash.patch
View File

@ -1,76 +0,0 @@
Index: webkitgtk-2.18.6/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
===================================================================
--- webkitgtk-2.18.6.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2017-09-02 11:15:50.000000000 +0200
+++ webkitgtk-2.18.6/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2018-03-02 17:38:44.892586127 +0100
@@ -40,7 +40,9 @@
#if USE(OPENGL_ES_2)
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
+#include <WebCore/Extensions3DOpenGLES.h>
#else
+#include <WebCore/Extensions3DOpenGL.h>
#include <WebCore/OpenGLShims.h>
#endif
@@ -374,11 +376,12 @@
bool WaylandCompositor::initializeEGL()
{
+ const char* extensions = eglQueryString(PlatformDisplay::sharedDisplay().eglDisplay(), EGL_EXTENSIONS);
+
if (PlatformDisplay::sharedDisplay().eglCheckVersion(1, 5)) {
eglCreateImage = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(eglGetProcAddress("eglCreateImage"));
eglDestroyImage = reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroyImage"));
} else {
- const char* extensions = eglQueryString(PlatformDisplay::sharedDisplay().eglDisplay(), EGL_EXTENSIONS);
if (GLContext::isExtensionSupported(extensions, "EGL_KHR_image_base")) {
eglCreateImage = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(eglGetProcAddress("eglCreateImageKHR"));
eglDestroyImage = reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroyImageKHR"));
@@ -389,22 +392,13 @@
return false;
}
- glImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
- if (!glImageTargetTexture2D) {
- WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture2D.");
- return false;
- }
-
- eglQueryWaylandBuffer = reinterpret_cast<PFNEGLQUERYWAYLANDBUFFERWL>(eglGetProcAddress("eglQueryWaylandBufferWL"));
- if (!eglQueryWaylandBuffer) {
- WTFLogAlways("WaylandCompositor requires eglQueryWaylandBuffer.");
- return false;
- }
-
+ if (GLContext::isExtensionSupported(extensions, "EGL_WL_bind_wayland_display")) {
eglBindWaylandDisplay = reinterpret_cast<PFNEGLBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglBindWaylandDisplayWL"));
eglUnbindWaylandDisplay = reinterpret_cast<PFNEGLUNBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglUnbindWaylandDisplayWL"));
- if (!eglBindWaylandDisplay || !eglUnbindWaylandDisplay) {
- WTFLogAlways("WaylandCompositor requires eglBindWaylandDisplayWL and eglUnbindWaylandDisplayWL.");
+ eglQueryWaylandBuffer = reinterpret_cast<PFNEGLQUERYWAYLANDBUFFERWL>(eglGetProcAddress("eglQueryWaylandBufferWL"));
+ }
+ if (!eglBindWaylandDisplay || !eglUnbindWaylandDisplay || !eglQueryWaylandBuffer) {
+ WTFLogAlways("WaylandCompositor requires eglBindWaylandDisplayWL, eglUnbindWaylandDisplayWL and eglQueryWaylandBuffer.");
return false;
}
@@ -415,6 +409,19 @@
if (!m_eglContext->makeContextCurrent())
return false;
+#if USE(OPENGL_ES_2)
+ std::unique_ptr<Extensions3DOpenGLES> glExtensions = std::make_unique<Extensions3DOpenGLES>(nullptr, false);
+#else
+ std::unique_ptr<Extensions3DOpenGL> glExtensions = std::make_unique<Extensions3DOpenGL>(nullptr, GLContext::current()->version() >= 320);
+#endif
+ if (glExtensions->supports("GL_OES_EGL_image") || glExtensions->supports("GL_OES_EGL_image_external"))
+ glImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
+
+ if (!glImageTargetTexture2D) {
+ WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture2D.");
+ return false;
+ }
+
return true;
}

13
webkit2gtk3-no-return-in-nonvoid.patch
View File

@ -1,13 +0,0 @@
Index: webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
===================================================================
--- webkitgtk-2.17.92.orig/Source/WebCore/crypto/CryptoKey.cpp
+++ webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> Alg
case KeyAlgorithmClass::Raw:
return downcast<RawKeyAlgorithm>(*algorithm).dictionary();
}
+
+ RELEASE_ASSERT_NOT_REACHED();
}
auto CryptoKey::usages() const -> Vector<CryptoKeyUsage>

1878
webkit2gtk3-python3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

153
webkit2gtk3.changes
View File

@ -1,3 +1,154 @@
-------------------------------------------------------------------
Tue Mar 6 21:49:48 UTC 2018 - mgorse@suse.com
- Add webkit2gtk3-python3.patch: port to python 3 (bsc#1079812,
webkit#156674).
- Add conditional to optionally require python3, rather than
python2 + python-xml, and adjust %build to use python3.
-------------------------------------------------------------------
Tue Mar 6 10:36:32 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.19.92:
+ Ensure DNS prefetching cannot be re-enabled if disabled by
settings.
+ Fix seek sometimes not working.
+ Fix rendering of emojis that were using the wrong scale factor
in some cases.
+ Fix rendering of combining enclosed keycap.
+ Fix rendering scale of some layers in HiDPI.
+ Fix a crash in Wayland when closing the web view.
+ Fix crashes upower crashes when running inside a chroot or on
systems with broken dbus/upower.
+ Fix memory leaks in GStreamer media backend when using
GStreamer 1.14.
+ Fix the build with Enchant 2.x.
+ Fix several crashes and rendering issues.
+ Updated translations.
- Replace pkgconfig(enchant) with enchant-devel BuildRequires:
Allow webkit2gtk3 to build with whatever enchant is available in
target distro.
-------------------------------------------------------------------
Mon Mar 5 16:40:57 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Mon Mar 5 02:19:51 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.19.91:
+ Add ENABLE_ADDRESS_SANITIZER to make it easier to build with
asan support.
+ Fix a crash a under Wayland when using mesa software
rasterization.
+ Make fullscreen video work again.
+ Fix handling of missing GStreamer elements.
+ Fix rendering when webm video is played twice.
+ Fix kinetic scrolling sometimes jumping around.
+ Fix build with ICU configured without collation support.
+ Fix several crashes and rendering issues.
+ Updated translations.
- Do a minor spec cleanup.
-------------------------------------------------------------------
Mon Mar 5 02:19:50 UTC 2018 - dimstar@opensuse.org
- Update to version 2.19.90:
+ WebSockets use system proxy settings now (requires libsoup
2.61.90).
+ Show the context menu on long-press gesture.
+ Add support for Shift + mouse scroll to scroll horizontally.
+ Fix zoom gesture to actually zoom instead of changing the page
scale.
+ Implement support for Graphics ARIA roles.
+ Make sleep inhibitors work under Flatpak.
+ Add get element CSS value command to WebDriver.
+ Fix a crash aftter a swipe gesture.
+ Fix several crashes and rendering issues.
- Drop webkit2gtk3-fix-wayland-crash.patch: fixed upstream.
-------------------------------------------------------------------
Mon Mar 5 02:19:06 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.19.6:
+ Fix crashes due to duplicated symbols in libjavascriptcoregtk
and libwebkit2gtk.
+ Fix parsing of timeout values in WebDriver.
+ Implement get timeouts command in WebDriver.
+ Fix deadlock in GStreamer video sink during shutdown when
accelerated compositing is disabled.
+ Fix several crashes and rendering issues.
-------------------------------------------------------------------
Mon Mar 5 02:19:05 UTC 2018 - zaitor@opensuse.org
- Update to version 2.19.5:
+ This is a follow up release to export
webkit_dom_dom_window_webkit_message_handlers_post_message()
symbol that was hidden in 2.19.4 by mistake.
- Changes from version 2.19.4:
+ Add web process API to detect when form is submitted via
JavaScript.
+ Add new API to replace
webkit_form_submission_request_get_text_fields() that is now
deprecated.
+ Add WebKitWebView::web-process-terminated signal and deprecate
web-process-crashed.
+ Fix rendering issues when editing text areas.
+ Use FastMalloc based GstAllocator for GStreamer.
+ Fix several crashes and rendering issues.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 5 02:19:04 UTC 2018 - dimstar@opensuse.org
- Apply -DUSE_SYSTEM_MALLOC=ON unconditionally in all builds
(bmalloc seems to be exhausting memory on run time).
-------------------------------------------------------------------
Mon Mar 5 02:19:03 UTC 2018 - dimstar@opensuse.org
- Update to version 2.19.3:
+ Fix web process crash at startup in bmalloc.
+ Fix several memory leaks in GStreamer media backend.
+ WebKitWebDriver process no longer links to
libjavascriptcoregtk.
- Fix several crashes and rendering issues.
- Changes from version 2.19.2:
+ Add new API to add, retrieve and delete cookies via
WebKitCookieManager.
+ Add functions to WebSettings to convert font sizes between
points and pixels.
+ Ensure cookie operations take effect when they happen before a
web process has been spawned.
+ Automatically adjust font size when GtkSettings:gtk-xft-dpi
changes.
+ Fix several crashes and rendering issues.
-------------------------------------------------------------------
Mon Mar 5 02:19:02 UTC 2018 - dimstar@opensuse.org
- Allow OBS service to verify the tarball signature:
+ Add webkit2gtk3.keyring: Carlos Garcia Campos' public key.
-------------------------------------------------------------------
Mon Mar 5 02:19:01 UTC 2018 - dimstar@opensuse.org
- Update to version 2.19.1:
+ Add initial resource load statistics support.
+ Add API to expose availability of certain editing commands in
WebKitEditorState.
+ Add API to query whether a WebKitNavigationAction is a redirect
or not.
+ Improve complex text rendering.
+ Add support for the "system" CSS font family.
+ Implement low power mode.
+ Fix several crashes and rendering issues.
- Drop webkit2gtk3-no-return-in-nonvoid.patch: fixed upstream.
- Add pkgconfig(libbrotlidec) and pkgconfig(upower-glib)
BuildRequires: new dependencies.
-------------------------------------------------------------------
Fri Mar 2 16:38:52 UTC 2018 - fcrozat@suse.com
@ -17,7 +168,7 @@ Thu Mar 1 14:32:34 UTC 2018 - dimstar@opensuse.org
Tue Jan 30 17:12:00 CET 2018 - ro@suse.de
- even on recent codestreams there is no binutils gold on s390
only on s390x
only on s390x.
-------------------------------------------------------------------
Wed Jan 24 15:46:03 UTC 2018 - bjorn.lie@gmail.com

48
webkit2gtk3.keyring Normal file
View File

@ -0,0 +1,48 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
2LN6whM=
=ZYVq
-----END PGP PUBLIC KEY BLOCK-----

82
webkit2gtk3.spec
View File

@ -25,10 +25,9 @@
%define _jscver 4
%define _pkgconfig_suffix gtk-3.0
%define _name webkitgtk
# gold linker not available on old s390/s390x
%define _gold_linker 1
%if 0%{suse_version} < 1320
%if 0%{?suse_version} < 1320
%ifarch s390 s390x
%define _gold_linker 0
%endif
@ -37,22 +36,22 @@
%define _gold_linker 0
%endif
%endif
%bcond_without python3
Name: webkit2gtk3
Version: 2.18.6
Version: 2.19.92
Release: 0
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0+ AND BSD-3-Clause
License: LGPL-2.0-or-later AND BSD-3-Clause
Group: Development/Libraries/C and C++
Url: https://webkitgtk.org/
Source: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
Source1: baselibs.conf
Source0: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
Source1: http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz.asc
Source98: baselibs.conf
Source99: webkit2gtk3.keyring
# PATCH-FIX-OPENSUSE webkitgtk-typelib-sharelib-link.patch dimstar@opensuse.org -- Fixup the .gir file to contain the full library name for libjavascriptcore.
Patch0: webkitgtk-typelib-sharelib-link.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-no-return-in-nonvoid.patch webkit£318374 dimstar@opensuse.org -- Fix "control reaches end of non-void function"
Patch1: webkit2gtk3-no-return-in-nonvoid.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-fix-wayland-crash.patch webkit#182490 bsc#1079512 fcrozat@suse.com -- Fix crash with wayland
Patch2: webkit2gtk3-fix-wayland-crash.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-python3.patch bsc#1079812 mgorse@suse.com -- port to Python 3.
Patch1: webkit2gtk3-python3.patch
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLESv1_CM-devel
@ -60,6 +59,8 @@ BuildRequires: Mesa-libGLESv2-devel
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: bison >= 2.3
BuildRequires: cmake
BuildRequires: enchant-devel
BuildRequires: gcc-c++ >= 4.9
BuildRequires: gobject-introspection-devel
BuildRequires: gperf >= 3.0.1
BuildRequires: hyphen-devel
@ -67,13 +68,10 @@ BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: perl >= 5.10.0
BuildRequires: pkgconfig
BuildRequires: python >= 2.6.0
BuildRequires: python2-xml
BuildRequires: ruby >= 1.8.7
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(atspi-2) >= 2.5.3
BuildRequires: pkgconfig(cairo) >= 1.10.2
BuildRequires: pkgconfig(enchant)
BuildRequires: pkgconfig(fontconfig) >= 2.8.0
BuildRequires: pkgconfig(freetype2) >= 2.4.2
BuildRequires: pkgconfig(geoclue-2.0) >= 2.1.5
@ -85,20 +83,28 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(harfbuzz) >= 0.9.2
# Currently passing -DUSE_WOFF2=false to cmake
# BuildRequires: pkgconfig(libbrotlidec) >= 1.0.1
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4) >= 2.42.0
BuildRequires: pkgconfig(libsoup-2.4) >= 2.61.90
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0
BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zlib)
%if %{with python3}
BuildRequires: python3
%else
BuildRequires: python >= 2.6.0
BuildRequires: python2-xml
%endif
%if %{_gold_linker}
BuildRequires: binutils-gold
%endif
BuildRequires: gcc-c++ >= 4.9
%if 0%{?is_opensuse}
# We require gtk2 for the Gtk2 plugin wrapper
BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10
@ -251,10 +257,29 @@ invoking a Perl or Python script.
%prep
%setup -q -n webkitgtk-%{version}
%patch0 -p1
%if %{with python3}
%patch1 -p1
%patch2 -p1
%endif
%build
# Here we must muzzle our dog so it doesn't eat all the memory
max_link_jobs="%{?jobs:%{jobs}}"
max_compile_jobs="%{?jobs:%{jobs}}"
echo "Available memory:"
cat /proc/meminfo
echo "System limits:"
ulimit -a
if test -n "$max_link_jobs" -a "$max_link_jobs" -gt 1 ; then
mem_per_process=1300000
max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
max_jobs="$(($max_mem / $mem_per_process))"
test "$max_link_jobs" -gt "$max_jobs" && max_link_jobs="$max_jobs" && echo "Warning: Reducing number of link jobs to $max_jobs because of memory limits"
test "$max_link_jobs" -le 0 && max_link_jobs=1 && echo "Warning: Not linking in parallel at all becuse of memory limits"
fi
%if %{with python3}
export PYTHON=%{_bindir}/python3
%endif
# Use linker flags to reduce memory consumption
%if %{_gold_linker}
%global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /')
@ -265,33 +290,33 @@ invoking a Perl or Python script.
-DCMAKE_BUILD_TYPE=Release \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \
-DUSE_WOFF2=false \
%if %{with python3}
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%endif
%if !0%{?is_opensuse}
-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
%endif
%ifarch armv6hl ppc ppc64 ppc64le s390 s390x
-DENABLE_JIT=OFF \
-DUSE_SYSTEM_MALLOC=ON \
%endif
-DUSE_SYSTEM_MALLOC=ON \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread"
make %{?_smp_mflags}
make -j $max_link_jobs
%install
%cmake_install
%find_lang WebKit2GTK-4.0
%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig
%postun -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig
%post -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
%postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
%files -n libwebkit2gtk%{_wk2sover}
%defattr(-,root,root)
%if 0%{?is_opensuse}
# Exclude Gtk2 plugin support from this package. That goes into plugin-process-gtk2.
%exclude %{_libexecdir}/libwebkit2gtk%{_wk2sover}/WebKitPluginProcess2
@ -304,35 +329,28 @@ make %{?_smp_mflags}
%if 0%{?is_opensuse}
%files plugin-process-gtk2
%defattr(-,root,root)
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/WebKitPluginProcess2
%endif
%files -n webkit2gtk-4_0-injected-bundles
%defattr(-,root,root)
%dir %{_libdir}/webkit2gtk-4.0
%dir %{_libdir}/webkit2gtk-4.0/injected-bundle
%{_libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
%files -n libjavascriptcoregtk%{_sover}
%defattr(-, root, root)
%doc Source/JavaScriptCore/COPYING.LIB
%license Source/JavaScriptCore/COPYING.LIB
%{_libdir}/libjavascriptcoregtk-4.0.so.*
%files -n typelib-1_0-WebKit2-%{_sonameverpkg}
%defattr(-,root,root)
%{_libdir}/girepository-1.0/WebKit2-%{_sonamever}.typelib
%files -n typelib-1_0-WebKit2WebExtension-%{_sonameverpkg}
%defattr(-,root,root)
%{_libdir}/girepository-1.0/WebKit2WebExtension-%{_sonamever}.typelib
%files -n typelib-1_0-JavaScriptCore-%{_sonameverpkg}
%defattr(-,root,root)
%{_libdir}/girepository-1.0/JavaScriptCore-%{_sonamever}.typelib
%files devel
%defattr(-,root,root)
%{_datadir}/gir-1.0/*.gir
%{_includedir}/webkitgtk-4.0/
%{_libdir}/libwebkit2gtk-4.0.so
@ -342,10 +360,8 @@ make %{?_smp_mflags}
%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
%files -n webkit-jsc-%{_jscver}
%defattr(-,root,root)
%{_libexecdir}/libwebkit2gtk%{_wk2sover}/jsc
%files -n %{_pkgname_no_slpp}-lang -f WebKit2GTK-4.0.lang
%defattr(-,root,root)
%changelog

3
webkitgtk-2.18.6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c
size 14829316

3
webkitgtk-2.19.92.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22b79a525376d09e7a6acc8becffabbac1759906592375767216b9b2c0d871e8
size 16618352

6
webkitgtk-2.19.92.tar.xz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCWp5ecAAKCRDz0yLQ7EWC
w4DbAJ9ecbhVfuMn/uk5+3mpvg5njA+ZUQCgjXv18r/cKtIFVlqwD6yfmfGbep8=
=ni5y
-----END PGP SIGNATURE-----