12:02 p.m.
The package rpms/webkitgtk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/webkitgtk.git/commit/?id=ceec4bf3....
Change:
+%ifarch %{ix86} s390x
Thanks.
Full change:
============
commit 6e4054b5ec433ce804d5831ce34008ad2db62086
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Thu Dec 22 12:02:07 2022 -0600
Update to 2.38.3
diff --git a/.gitignore b/.gitignore
index 119620c..5f93da7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/webkitgtk-2.38.0.tar.xz.asc
/webkitgtk-2.38.1.tar.xz.asc
/webkitgtk-2.38.2.tar.xz.asc
+/webkitgtk-2.38.3.tar.xz.asc
diff --git a/sources b/sources
index d398b39..c79c051 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.38.2.tar.xz) =
177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
-SHA512 (webkitgtk-2.38.2.tar.xz.asc) =
3a48e6622ea65ed4e4b1c4e004d805992e232c37eb8966c987cf496ec31c708837e58f8ae24f42e3e60ec8e85bbfb08c6c519bbec2fb0488da6a9c3e2cb41f01
+SHA512 (webkitgtk-2.38.3.tar.xz) =
1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
+SHA512 (webkitgtk-2.38.3.tar.xz.asc) =
e920c601f4972ddbaeeb714e451dbab1fdb492e678c9f43269e271cf8d63f62ef9f7c57ebc8b2ba2e284eb90ad4acc6c507e7e4eca674f5e17429eaa29d12d3b
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 1a57f45..6890a19 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -16,7 +16,7 @@
%bcond_without docs
Name: webkitgtk
-Version: 2.38.2
+Version: 2.38.3
Release: %autorelease
Summary: GTK web content engine library
commit ceec4bf3c810bf3c1db6883d08010568f9680420
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Tue Dec 20 14:41:46 2022 -0600
Sabotage debuginfo on s390x
https://pagure.io/fedora-infrastructure/issue/11000
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 619d402..1a57f45 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -290,11 +290,13 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
%global _find_debuginfo_opts %limit_build -m 32768
-# Remove debuginfo from 32-bit builds to reduce memory consumption even more.
-# No amount of optimizing is going to work here.
+# Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
# https://bugs.webkit.org/show_bug.cgi?id=140176
#
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
-%ifarch %{ix86}
+#
+# Do this for s390x too as a temporary measure.
+# https://pagure.io/fedora-infrastructure/issue/11000
+%ifarch %{ix86} s390x
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
commit ac26c980fffdb44d413d1f28b54b85a4c3f67f98
Author: David King <amigadave(a)amigadave.com>
Date: Fri Dec 2 15:37:00 2022 +0000
Fix javascriptcore5 Requires in webkitgtk6.0
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 7c7c59c..619d402 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -105,7 +105,7 @@ GTK platform.
%package -n webkit2gtk5.0
Summary: WebKitGTK for GTK 4
-Requires: javascriptcoregtk5.0%{?_isa} = %{version}-%{release}
+Requires: javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
Requires: bubblewrap
Requires: xdg-dbus-proxy
Recommends: geoclue2
commit b0a38202ef35ef2753c48e50b3896a903e833f13
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Tue Nov 29 11:32:57 2022 -0600
Update comment regarding debuginfo size
diff --git a/webkitgtk.spec b/webkitgtk.spec
index f954731..7c7c59c 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -280,9 +280,10 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
%build
# Increase the DIE limit so our debuginfo packages can be size-optimized.
-# Decreases the size for x86_64 from ~5G to ~1.1G. This requires lots of
-# RAM on the builders, so only do this for x86_64 because other architectures
-# have underpowered builders that cannot handle a higher limit.
+# This previously decreased the size for x86_64 from ~5G to ~1.1G, but as of
+# 2022 it's more like 850 MB -> 675 MB. This requires lots of RAM on the
+# builders, so only do this for x86_64 to avoid overwhelming non-x86_64
+# builders.
# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
%global _dwz_max_die_limit_x86_64 250000000
commit bb06c4ff6e8d67d99c3cb1882a9e481a424a8c2a
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Tue Nov 29 10:13:25 2022 -0600
Request 32 GB per vCPU when processing debuginfo
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 54274c0..f954731 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -286,8 +286,8 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
%global _dwz_max_die_limit_x86_64 250000000
-# Require 16 GB of RAM per vCPU for debuginfo processing.
-%global _find_debuginfo_opts %limit_build -m 16384
+# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
+%global _find_debuginfo_opts %limit_build -m 32768
# Remove debuginfo from 32-bit builds to reduce memory consumption even more.
# No amount of optimizing is going to work here.
commit a7b4cc064bc0de5eaefe84af87c6f44998e884e9
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Mon Nov 28 14:09:54 2022 -0600
Experimentally tweak debuginfo generation settings some more
Note this is expected to cause the size of the debuginfo packages to
balloon, but it's better than not being able to update the package at
all. See: https://pagure.io/fedora-infrastructure/issue/11000
diff --git a/webkitgtk.spec b/webkitgtk.spec
index c71944c..54274c0 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -280,18 +280,17 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
%build
# Increase the DIE limit so our debuginfo packages can be size-optimized.
-# Decreases the size for x86_64 from ~5G to ~1.1G.
+# Decreases the size for x86_64 from ~5G to ~1.1G. This requires lots of
+# RAM on the builders, so only do this for x86_64 because other architectures
+# have underpowered builders that cannot handle a higher limit.
# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
-%global _dwz_max_die_limit 250000000
-
-# On x86_64, the _dwz_max_die_limit is overridden by the arch-specific limit
-# from redhat-rpm-config.
%global _dwz_max_die_limit_x86_64 250000000
-# Require 8 GB of RAM per vCPU for debuginfo processing
-%global _find_debuginfo_opts %limit_build -m 8192
+# Require 16 GB of RAM per vCPU for debuginfo processing.
+%global _find_debuginfo_opts %limit_build -m 16384
-# Remove debuginfo from 32-bit builds to reduce memory consumption:
+# Remove debuginfo from 32-bit builds to reduce memory consumption even more.
+# No amount of optimizing is going to work here.
# https://bugs.webkit.org/show_bug.cgi?id=140176
#
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
%ifarch %{ix86}
commit 16b205a51978c2c4178c38eda3345176ce58a937
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Tue Nov 15 10:15:36 2022 -0600
Adjust %limit_build to request 3 GB of RAM per CPU
I think this should be enough. If I see builds fail due to OOM, then I
can always switch back to requesting 4 GB
diff --git a/webkitgtk.spec b/webkitgtk.spec
index a1703f5..c71944c 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -360,15 +360,15 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
export NINJA_STATUS="[1/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
export NINJA_STATUS="[2/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
export NINJA_STATUS="[3/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
%install
%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0