Compare commits

...
Sign in to create a new pull request.

21 commits

Author SHA1 Message Date
Michael Catanzaro
f64a8794e7 Update to 2.46.3 2024-10-30 13:27:13 -05:00
Michael Catanzaro
fd5e96fda4 Update to 2.46.1 2024-09-30 15:49:05 -05:00
Michael Catanzaro
6f82eadef1 Upgrade to 2.46.0 2024-09-17 17:06:51 -05:00
Michael Catanzaro
f7755fbaa0 Add patch to fix WebAssembly 2024-08-15 12:58:12 -05:00
Michael Catanzaro
2f9bbe5bfc Update to 2.44.3 2024-08-13 14:38:23 -05:00
Michael Catanzaro
d9cbee92af Add patch to fix excessive CPU usage 2024-06-08 12:34:42 -05:00
Michael Catanzaro
663e8ac595 Update to 2.44.2 2024-05-16 15:57:52 -05:00
Michael Catanzaro
a359d6c94e Revert "Forgot to commit changes"
This reverts commit 2e5c829a4e.

Oops, there was no need for this commit.

[skip changelog]
2024-04-18 16:43:50 -05:00
Michael Catanzaro
2e5c829a4e Forgot to commit changes
[skip changelog]
2024-04-18 16:42:27 -05:00
Michael Catanzaro
9d4c08bb73 Request 4 GB of RAM per vCPU
The aarch64 builders are running out of memory, so I guess we need to
lower parallelism again.
2024-04-18 16:41:24 -05:00
Michael Catanzaro
7eb2471686 Update to 2.44.1 2024-04-11 13:11:56 -05:00
Michael Catanzaro
456ce80be1 Fix i686 build 2024-03-16 19:45:26 -05:00
Michael Catanzaro
002ce9750d Upgrade to WebKitGTK 2.44.0 2024-03-16 15:07:56 -05:00
Michael Catanzaro
2a6dffb399 Update to WebKitGTK 2.42.5 2024-02-05 13:59:18 -06:00
Michael Catanzaro
4e6f2705ff Update to 2.42.4 2023-12-15 09:19:57 -06:00
Michael Catanzaro
59f34fdb5b Update to 2.42.3 2023-12-05 13:04:40 -06:00
Michael Catanzaro
51fec9a364 Update to 2.42.2
This also removes the unused bundled libavif/libdav1d from the tarball,
which slightly simplifies the license tag.
2023-11-10 11:54:29 -06:00
Michael Catanzaro
9f7c6bc096 Update to 2.40.1 and fix GL dependencies
GLES needs to be available at runtime or we'll crash, #2240428.

It's not needed at runtime because it's only used via libepoxy. And
desktop GL is no longer used at all.

Fixes #2240428
2023-09-27 11:22:03 -05:00
Michael Catanzaro
6e8a4b123f Update to WebKitGTK 2.42.0 2023-09-15 09:21:46 -05:00
Michael Catanzaro
454b1112c3 Update to 2.41.92 2023-09-08 10:09:04 -05:00
Michael Catanzaro
76789e3124 Disable LTO again to fix build
Avoids:

/usr/lib64/libglib-2.0.so  /usr/lib64/libz.so  /usr/lib64/libsystemd.so && :
/usr/bin/ld: /tmp/cczGkWSW.ltrans0.ltrans.o: in function `ipint_table_size_validate':
<artificial>:(.text+0x49f0f): undefined reference to `ipint_extern_table_size'
/usr/bin/ld: /tmp/cczGkWSW.ltrans0.ltrans.o: in function `ipint_table_fill_validate':
<artificial>:(.text+0x4a019): undefined reference to `ipint_extern_table_fill'

which I am not able to reproduce locally, even when using -flto=auto.
2023-08-19 16:37:01 -05:00
4 changed files with 38 additions and 117 deletions

25
.gitignore vendored
View file

@ -1,25 +1,2 @@
/webkitgtk-*.tar.xz
/webkitgtk-2.37.1.tar.xz.asc
/webkitgtk-2.37.90.tar.xz.asc
/webkitgtk-2.37.91.tar.xz.asc
/webkitgtk-2.38.0.tar.xz.asc
/webkitgtk-2.38.1.tar.xz.asc
/webkitgtk-2.38.2.tar.xz.asc
/webkitgtk-2.39.1.tar.xz.asc
/webkitgtk-2.39.2.tar.xz.asc
/webkitgtk-2.39.3.tar.xz.asc
/webkitgtk-2.39.4.tar.xz.asc
/webkitgtk-2.39.5.tar.xz.asc
/webkitgtk-2.39.6.tar.xz.asc
/webkitgtk-2.39.7.tar.xz.asc
/webkitgtk-2.39.90.tar.xz.asc
/webkitgtk-2.39.91.tar.xz.asc
/webkitgtk-2.40.0.tar.xz.asc
/webkitgtk-2.41.1.tar.xz.asc
/webkitgtk-2.41.2.tar.xz.asc
/webkitgtk-2.41.3.tar.xz.asc
/webkitgtk-2.41.4.tar.xz.asc
/webkitgtk-2.41.5.tar.xz.asc
/webkitgtk-2.41.6.tar.xz.asc
/webkitgtk-2.41.90.tar.xz.asc
/webkitgtk-2.41.91.tar.xz.asc
/webkitgtk-*.tar.xz.asc

View file

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.41.91.tar.xz.asc) = 8519795d85809e5c9ecfb8292e5bb9e6a963ff00388c08b1fb1d4d9554503212d1ab3fe51cbeecd4d391f4bc87b0770d28bc6428b38e0639807a98619320c961
SHA512 (webkitgtk-2.41.91.tar.xz) = 14381994830daff1a5126f0919760fdb7689a6ef4d96bdc147546839fbe5c012f71f3c4b51be6714bc25a0dc04260d4809d569fcc96cf60ae620fb8aeff5184a
SHA512 (webkitgtk-2.46.3.tar.xz) = efec6e92bbea3379cf3bd1aff7d91aee3f028dcd1bcfbe7120d5ded30ada1541469fc5cd7897cb375e03a55e59d268f915c2a35345a84192b14971ac4339719f
SHA512 (webkitgtk-2.46.3.tar.xz.asc) = bdd7c0b811869624d025988d1683a11701109038164bd8f373dbfe57d49d13a460775283e4448ebd5050c06d6ebdd0c7f59c4180cac0a7b01491d884cf77529a

Binary file not shown.

View file

@ -5,24 +5,21 @@
mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
# No libmanette in RHEL
%if !0%{?rhel}
%global with_gamepad 1
%endif
# Build documentation by default (use `rpmbuild --without docs` to override it).
# This is used by Coverity. Coverity injects custom compiler warnings, but
# any warning during WebKit docs build is fatal!
%bcond_without docs
# https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version
# ELN (RHEL 10) no longer needs 4.0
%if %{undefined rhel} || 0%{?rhel} < 10
%bcond_without api40
# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers
%global toolchain clang
# We run out of memory if building with LTO enabled on i686.
%ifarch %{ix86}
%global _lto_cflags %{nil}
%endif
Name: webkitgtk
Version: 2.41.91
Version: 2.46.3
Release: %autorelease
Summary: GTK web content engine library
@ -32,11 +29,12 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Use the keys from https://webkitgtk.org/verifying.html
# $ gpg --import aperez.key carlosgc.key
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: clang
BuildRequires: cmake
BuildRequires: flex
BuildRequires: gcc-c++
@ -49,6 +47,7 @@ BuildRequires: hyphen-devel
BuildRequires: libatomic
BuildRequires: ninja-build
BuildRequires: openssl-devel
BuildRequires: perl(bigint)
BuildRequires: perl(English)
BuildRequires: perl(FindBin)
BuildRequires: perl(JSON::PP)
@ -67,9 +66,7 @@ BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
@ -85,30 +82,23 @@ BuildRequires: pkgconfig(libgcrypt)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libjxl)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsecret-1)
%if %{with api40}
BuildRequires: pkgconfig(libsoup-2.4)
%endif
BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libtasn1)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxslt)
%if 0%{?with_gamepad}
BuildRequires: pkgconfig(manette-0.2)
%endif
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(wpe-1.0)
BuildRequires: pkgconfig(wpebackend-fdo-1.0)
BuildRequires: pkgconfig(xt)
# Filter out provides for private libraries
@ -122,6 +112,7 @@ GTK platform.
Summary: WebKitGTK for GTK 4
Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
Requires: bubblewrap
Requires: libGLES
Requires: xdg-dbus-proxy
Recommends: geoclue2
Recommends: gstreamer1-plugins-bad-free
@ -129,6 +120,7 @@ Recommends: gstreamer1-plugins-good
Recommends: xdg-desktop-portal-gtk
Provides: bundled(angle)
Provides: bundled(pdfjs)
Provides: bundled(skia)
Provides: bundled(xdgmime)
Obsoletes: webkit2gtk5.0 < %{version}-%{release}
@ -140,6 +132,7 @@ GTK platform. This package contains WebKitGTK for GTK 4.
Summary: WebKitGTK for GTK 3 and libsoup 3
Requires: javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
Requires: bubblewrap
Requires: libGLES
Requires: xdg-dbus-proxy
Recommends: geoclue2
Recommends: gstreamer1-plugins-bad-free
@ -147,13 +140,13 @@ Recommends: gstreamer1-plugins-good
Recommends: xdg-desktop-portal-gtk
Provides: bundled(angle)
Provides: bundled(pdfjs)
Provides: bundled(skia)
Provides: bundled(xdgmime)
%description -n webkit2gtk4.1
WebKitGTK is the port of the WebKit web rendering engine to the
GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3.
%if %{with api40}
%package -n webkit2gtk4.0
Summary: WebKitGTK for GTK 3 and libsoup 2
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
@ -174,7 +167,6 @@ Provides: webkit2gtk3 = %{version}-%{release}
%description -n webkit2gtk4.0
WebKitGTK is the port of the WebKit web rendering engine to the
GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2.
%endif
%package -n webkitgtk6.0-devel
Summary: Development files for webkitgtk6.0
@ -197,7 +189,6 @@ Requires: javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release}
The webkit2gtk4.1-devel package contains libraries, build data, and header
files for developing applications that use webkit2gtk4.1.
%if %{with api40}
%package -n webkit2gtk4.0-devel
Summary: Development files for webkit2gtk4.0
Requires: webkit2gtk4.0%{?_isa} = %{version}-%{release}
@ -211,7 +202,6 @@ Provides: webkit2gtk3-devel = %{version}-%{release}
%description -n webkit2gtk4.0-devel
The webkit2gtk4.0-devel package contains libraries, build data, and header
files for developing applications that use webkit2gtk4.0.
%endif
%if %{with docs}
%package -n webkitgtk6.0-doc
@ -233,7 +223,6 @@ Recommends: gi-docgen-fonts
%description -n webkit2gtk4.1-doc
This package contains developer documentation for webkit2gtk4.1.
%if %{with api40}
%package -n webkit2gtk4.0-doc
Summary: Documentation files for webkit2gtk4.0
BuildArch: noarch
@ -247,7 +236,6 @@ Recommends: gi-docgen-fonts
%description -n webkit2gtk4.0-doc
This package contains developer documentation for webkit2gtk4.0.
%endif
%endif
%package -n javascriptcoregtk6.0
Summary: JavaScript engine from webkitgtk6.0
@ -263,7 +251,6 @@ Obsoletes: webkit2gtk4.1-jsc < %{version}-%{release}
%description -n javascriptcoregtk4.1
This package contains the JavaScript engine from webkit2gtk4.1.
%if %{with api40}
%package -n javascriptcoregtk4.0
Summary: JavaScript engine from webkit2gtk4.0
Obsoletes: webkitgtk4-jsc < %{version}-%{release}
@ -273,7 +260,6 @@ Provides: webkit2gtk3-jsc = %{version}-%{release}
%description -n javascriptcoregtk4.0
This package contains the JavaScript engine from webkit2gtk4.0.
%endif
%package -n javascriptcoregtk6.0-devel
Summary: Development files for JavaScript engine from webkitgtk6.0
@ -293,7 +279,6 @@ Obsoletes: webkit2gtk4.1-jsc-devel < %{version}-%{release}
The javascriptcoregtk4.1-devel package contains libraries, build data, and header
files for developing applications that use JavaScript engine from webkit2gtk-4.1.
%if %{with api40}
%package -n javascriptcoregtk4.0-devel
Summary: Development files for JavaScript engine from webkit2gtk4.0
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
@ -305,7 +290,6 @@ Provides: webkit2gtk3-jsc-devel = %{version}-%{release}
%description -n javascriptcoregtk4.0-devel
The javascriptcoregtk4.0-devel package contains libraries, build data, and header
files for developing applications that use JavaScript engine from webkit2gtk-4.0.
%endif
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
@ -345,16 +329,9 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=ON \
-DUSE_LIBBACKTRACE=OFF \
%if %{without docs}
-DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%{nil}
@ -363,55 +340,39 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
-GNinja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=OFF \
-DENABLE_WEBDRIVER=OFF \
-DUSE_LIBBACKTRACE=OFF \
%if %{without docs}
-DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%{nil}
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
%cmake \
-GNinja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=OFF \
-DUSE_SOUP2=ON \
-DENABLE_WEBDRIVER=OFF \
-DUSE_LIBBACKTRACE=OFF \
%if %{without docs}
-DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%{nil}
%endif
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
export NINJA_STATUS="[1/3][%f/%t %es] "
%cmake_build %limit_build -m 3072
%cmake_build %limit_build -m 4096
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
export NINJA_STATUS="[2/3][%f/%t %es] "
%cmake_build %limit_build -m 3072
%cmake_build %limit_build -m 4096
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
export NINJA_STATUS="[3/3][%f/%t %es] "
%cmake_build %limit_build -m 3072
%endif
%cmake_build %limit_build -m 4096
%install
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
@ -420,16 +381,12 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
%cmake_install
%if %{with api40}
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
%cmake_install
%endif
%find_lang WebKitGTK-6.0
%find_lang WebKitGTK-4.1
%if %{with api40}
%find_lang WebKitGTK-4.0
%endif
# Finally, copy over and rename various files for %%license inclusion
%add_to_license_files Source/JavaScriptCore/COPYING.LIB
@ -474,7 +431,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
%exclude %{_libexecdir}/webkit2gtk-4.1/jsc
%if %{with api40}
%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang
%license _license_files/*ThirdParty*
%license _license_files/*WebCore*
@ -488,7 +444,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%{_libexecdir}/webkit2gtk-4.0/
%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
%exclude %{_libexecdir}/webkit2gtk-4.0/jsc
%endif
%files -n webkitgtk6.0-devel
%{_libexecdir}/webkitgtk-6.0/MiniBrowser
@ -513,7 +468,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%{_datadir}/gir-1.0/WebKit2-4.1.gir
%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir
%if %{with api40}
%files -n webkit2gtk4.0-devel
%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
%{_includedir}/webkitgtk-4.0/
@ -525,7 +479,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/WebKit2-4.0.gir
%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
%endif
%files -n javascriptcoregtk6.0
%license _license_files/*JavaScriptCore*
@ -539,13 +492,11 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib
%if %{with api40}
%files -n javascriptcoregtk4.0
%license _license_files/*JavaScriptCore*
%{_libdir}/libjavascriptcoregtk-4.0.so.18*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
%endif
%files -n javascriptcoregtk6.0-devel
%{_libexecdir}/webkitgtk-6.0/jsc
@ -566,7 +517,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir
%if %{with api40}
%files -n javascriptcoregtk4.0-devel
%{_libexecdir}/webkit2gtk-4.0/jsc
%dir %{_includedir}/webkitgtk-4.0
@ -576,32 +526,26 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
%endif
%if %{with docs}
%files -n webkitgtk6.0-doc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
%{_datadir}/gtk-doc/html/webkitgtk-6.0/
%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/
%dir %{_datadir}/doc
%{_datadir}/doc/javascriptcoregtk-6.0/
%{_datadir}/doc/webkitgtk-6.0/
%{_datadir}/doc/webkitgtk-web-process-extension-6.0/
%files -n webkit2gtk4.1-doc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/
%{_datadir}/gtk-doc/html/webkit2gtk-4.1/
%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/
%dir %{_datadir}/doc
%{_datadir}/doc/javascriptcoregtk-4.1/
%{_datadir}/doc/webkit2gtk-4.1/
%{_datadir}/doc/webkit2gtk-web-extension-4.1/
%if %{with api40}
%files -n webkit2gtk4.0-doc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
%endif
%dir %{_datadir}/doc
%{_datadir}/doc/javascriptcoregtk-4.0/
%{_datadir}/doc/webkit2gtk-4.0/
%{_datadir}/doc/webkit2gtk-web-extension-4.0/
%endif
%changelog
%autochangelog
%autochangelog