diff --git a/SOURCES/build-icu-big-endian.patch b/SOURCES/build-icu-big-endian.patch index 68fbea1..0be2d3c 100644 --- a/SOURCES/build-icu-big-endian.patch +++ b/SOURCES/build-icu-big-endian.patch @@ -1,12 +1,12 @@ -diff -up mozilla-aurora/build/autoconf/icu.m4.icu-endian mozilla-aurora/build/autoconf/icu.m4 ---- mozilla-aurora/build/autoconf/icu.m4.icu-endian 2016-12-09 09:11:01.227317790 +0100 -+++ mozilla-aurora/build/autoconf/icu.m4 2016-12-09 09:18:40.608712247 +0100 -@@ -78,7 +78,7 @@ if test -n "$USE_ICU"; then +diff -up firefox-61.0/build/autoconf/icu.m4.icu firefox-61.0/build/autoconf/icu.m4 +--- firefox-61.0/build/autoconf/icu.m4.icu 2018-06-20 09:03:17.957565445 +0200 ++++ firefox-61.0/build/autoconf/icu.m4 2018-06-20 09:08:28.159403451 +0200 +@@ -77,7 +77,7 @@ if test -n "$USE_ICU"; then # TODO: the l is actually endian-dependent # We could make this set as 'l' or 'b' for little or big, respectively, # but we'd need to check in a big-endian version of the file. - ICU_DATA_FILE="icudt${version}l.dat" + ICU_DATA_FILE="icudt${version}b.dat" + fi - dnl We won't build ICU data as a separate file when building - dnl JS standalone so that embedders don't have to deal with it. + AC_SUBST(MOZ_ICU_VERSION) diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 44804e6..2ad8ef7 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.22.4 +Version: 2.23.1 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -20,57 +20,76 @@ Patch0: user-agent-branding.patch # https://bugs.webkit.org/show_bug.cgi?id=158785 Patch1: fedora-crypto-policy.patch # https://bugs.webkit.org/show_bug.cgi?id=132333 -Patch2: cloop-big-endians.patch +# Patch doesn't apply on 2.23.1, but keep around. +#Patch2: cloop-big-endians.patch +# Explicitly specify python2 over python +Patch3: python2.patch +# https://bugs.webkit.org/show_bug.cgi?id=191923 +# Add missing cmake files for 2.23.1 +Patch4: webkit-2231-bug-191923-files.patch +# https://bugs.webkit.org/show_bug.cgi?id=188862 +# Disable the JIT and enable C_LOOP on ARM CPUs without Thumb2 support. +Patch5: webkit-2231-bug-188862.patch -BuildRequires: at-spi2-core-devel BuildRequires: bison -BuildRequires: brotli-devel -BuildRequires: cairo-devel +BuildRequires: bubblewrap BuildRequires: cmake -BuildRequires: enchant-devel BuildRequires: flex -BuildRequires: fontconfig-devel -BuildRequires: freetype-devel -BuildRequires: geoclue2-devel +BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: glib2-devel -BuildRequires: gnutls-devel -BuildRequires: gobject-introspection-devel +BuildRequires: git BuildRequires: gperf -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel -BuildRequires: gstreamer1-plugins-bad-free-devel -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel BuildRequires: gtk-doc -BuildRequires: harfbuzz-devel BuildRequires: hyphen-devel -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel -BuildRequires: libnotify-devel -BuildRequires: libpng-devel -BuildRequires: libsecret-devel -BuildRequires: libsoup-devel -BuildRequires: libwebp-devel -BuildRequires: libxslt-devel -BuildRequires: libXt-devel -BuildRequires: libwayland-client-devel -BuildRequires: libwayland-egl-devel -BuildRequires: libwayland-server-devel -BuildRequires: mesa-libEGL-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLES-devel -BuildRequires: pcre-devel +BuildRequires: libatomic +BuildRequires: ninja-build BuildRequires: perl-File-Copy-Recursive BuildRequires: perl-JSON-PP BuildRequires: perl-Switch +BuildRequires: python2 BuildRequires: ruby BuildRequires: rubygems -BuildRequires: sqlite-devel -BuildRequires: upower-devel -BuildRequires: woff2-devel - +BuildRequires: xdg-dbus-proxy + +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(enchant-2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(geoclue-2.0) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libseccomp) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libwoff2dec) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(xt) + +Requires: bubblewrap Requires: geoclue2 +Requires: xdg-dbus-proxy # Obsolete libwebkit2gtk from the webkitgtk3 package Obsoletes: libwebkit2gtk < 2.5.0 @@ -150,10 +169,7 @@ Provides: webkitgtk4-plugin-process-gtk2 = %{version}-%{release} Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}. %prep -%setup -q -n webkitgtk-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n webkitgtk-%{version} -S git # Remove bundled libraries rm -rf Source/ThirdParty/gtest/ @@ -176,30 +192,34 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"PowerEL\\"\' - -sed '/if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "6.0.0")/,+2d' -i CMakeLists.txt -sed 's/-std=c++14/-std=c++11/' -i Source/cmake/WebKitCompilerFlags.cmake - +%if 0%{?fedora} +%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' +%endif mkdir -p %{_target_platform} pushd %{_target_platform} %cmake3 \ + -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_GTKDOC=ON \ -DENABLE_MINIBROWSER=ON \ -%ifarch s390x %{power64} +%ifarch s390x %{power64} %{ix86} %{arm} -DENABLE_JIT=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ +%endif +%ifarch s390x %{power64} -DUSE_SYSTEM_MALLOC=ON \ %endif .. popd -make %{?_smp_mflags} -C %{_target_platform} +# Show the build time in the status +export NINJA_STATUS="[%f/%t][%e] " +%ninja_build -C %{_target_platform} %install -%make_install -C %{_target_platform} +%ninja_install -C %{_target_platform} %find_lang WebKit2GTK-4.0 @@ -215,7 +235,6 @@ make %{?_smp_mflags} -C %{_target_platform} %add_to_license_files Source/WebCore/LICENSE-LGPL-2 %add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 %add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE -%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE %add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE %add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE %add_to_license_files Source/WTF/icu/LICENSE @@ -233,8 +252,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib %{_libdir}/webkit2gtk-4.0/ %{_libexecdir}/webkit2gtk-4.0/ -%{_bindir}/WebKitWebDriver +%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2 +%{_bindir}/WebKitWebDriver %files devel %{_libexecdir}/webkit2gtk-4.0/MiniBrowser @@ -273,36 +293,86 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Tue Nov 27 2018 Eike Rathke - 2.23.1-1 +- Update to 2.23.1 + * Thu Nov 22 2018 Tomáš Popela - 2.22.4-1 - Update to 2.22.4 +* Thu Nov 01 2018 Tomas Popela - 2.22.3-2 +- Switch to using pkgconfig build requires +- Switch to enchant-2 +- Resolves: rhbz#1631486 + * Mon Oct 29 2018 Tomas Popela - 2.22.3-1 - Update to 2.22.3 -* Fri Oct 19 2018 Tomas Popela - 2.22.2-2 +* Fri Oct 19 2018 Tomas Popela - 2.22.2-3 - Fix WebProcess crash while printing - Resolves: rhbz#1639754 +* Tue Sep 25 2018 Tomas Popela - 2.22.2-2 +- Switch to Ninja: + -7 minutes on the x86_64 + -11 minutes on ppc64le + -13 minutes on i686 + -13 minutes on s390x + -10 minutes on armv7hl + -19 minutes on aarch64 + * Sun Sep 23 2018 Tomas Popela - 2.22.2-1 - Update to 2.22.2 * Thu Sep 20 2018 Tomas Popela - 2.22.1-1 - Update to 2.22.1 -* Tue Sep 04 2018 Tomas Popela - 2.22.0-1 +* Fri Sep 07 2018 Kalev Lember - 2.22.0-3 +- Rebuilt against fixed atk (#1626575) + +* Fri Sep 07 2018 Kalev Lember - 2.22.0-2 +- Rebuilt for GNOME 3.30.0 megaupdate + +* Mon Sep 03 2018 Tomas Popela - 2.22.0-1 - Update to 2.22.0 -* Tue Aug 14 2018 Tomas Popela - 2.20.5-1 -- Update to 2.20.5 +* Thu Aug 30 2018 Tomas Popela - 2.21.92-2 +- Update the JSC build fix patch + +* Wed Aug 29 2018 Tomas Popela - 2.21.92-1 +- Update to 2.21.92 + +* Thu Aug 16 2018 Tomas Popela - 2.21.91-1 +- Update to 2.21.91 + +* Fri Jul 20 2018 Tomas Popela - 2.21.5-1 +- Update to 2.21.5 + +* Mon Jul 16 2018 Tomas Popela - 2.21.4-4 +- Fix the broken build due to python2 changes + +* Sat Jul 14 2018 Fedora Release Engineering - 2.21.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 10 2018 Pete Walter - 2.21.4-2 +- Rebuild for ICU 62 + +* Tue Jun 12 2018 Tomas Popela - 2.21.4-1 +- Update to 2.21.4 + +* Mon May 28 2018 Tomas Popela - 2.21.3-1 +- Update to 2.21.3 + +* Thu May 24 2018 Tomas Popela - 2.21.2-2 +- Explicitly specify python2 over python and add python2 to BR -* Mon Aug 06 2018 Tomas Popela - 2.20.4-1 -- Update to 2.20.4 +* Mon May 21 2018 Tomas Popela - 2.21.2-1 +- Update to 2.21.2 -* Mon Jun 11 2018 Tomas Popela - 2.20.3-1 -- Update to 2.20.3 +* Mon Apr 30 2018 Pete Walter - 2.21.1-2 +- Rebuild for ICU 61.1 -* Wed May 09 2018 Tomas Popela - 2.20.2-1 -- Update to 2.20.2 +* Wed Apr 18 2018 Tomas Popela - 2.21.1-1 +- Update to 2.21.1 * Tue Apr 10 2018 Tomas Popela - 2.20.1-1 - Update to 2.20.1