Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nodejs-electron for openSUSE:Factory
checked in at 2023-11-13 22:18:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
and /work/SRC/openSUSE:Factory/.nodejs-electron.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-electron"
Mon Nov 13 22:18:44 2023 rev:89 rq:1125116 version:27.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes
2023-11-08 22:18:06.320005110 +0100
+++
/work/SRC/openSUSE:Factory/.nodejs-electron.new.17445/nodejs-electron.changes
2023-11-13 22:21:19.764515720 +0100
@@ -1,0 +2,18 @@
+Fri Nov 10 20:12:45 UTC 2023 - Bruno Pitrus <[email protected]>
+
+- Fix non-deterministic build in cloud_policy.pb.cc (bsc#1041090)
+ * add policy_templates-deterministic.patch
+
+-------------------------------------------------------------------
+Fri Nov 10 18:26:45 UTC 2023 - Bruno Pitrus <[email protected]>
+
+- New upstream release 27.0.4
+ * Chromium 118.0.5993.129
+ * Fixed an issue where WebViews could sometimes crash on unload
+ * obsolete crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch
+- Use system jinja2 for building
+ * add computed_style_base-nbsp.patch
+ * update system-pydeps.patch
+- Leap: use python 3.11 for building (was 3.6)
+
+-------------------------------------------------------------------
Old:
----
crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch
electron-27.0.3.tar.zst
New:
----
computed_style_base-nbsp.patch
electron-27.0.4.tar.zst
policy_templates-deterministic.patch
BETA DEBUG BEGIN:
Old: * Fixed an issue where WebViews could sometimes crash on unload
* obsolete crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch
- Use system jinja2 for building
BETA DEBUG END:
BETA DEBUG BEGIN:
New:- Use system jinja2 for building
* add computed_style_base-nbsp.patch
* update system-pydeps.patch
New:- Fix non-deterministic build in cloud_policy.pb.cc (bsc#1041090)
* add policy_templates-deterministic.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.pphp2G/_old 2023-11-13 22:21:23.460651807 +0100
+++ /var/tmp/diff_new_pack.pphp2G/_new 2023-11-13 22:21:23.460651807 +0100
@@ -205,6 +205,12 @@
%bcond_with system_abseil
%endif
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150700 || 0%{?fedora}
+%define PYVER 3
+%else
+%define PYVER 311
+%endif
+
# We always ship the following bundled libraries as part of Electron despite a
system version being available in either openSUSE or Fedora:
# Name | Path in tarball | Reason
#
-------------+-----------------------------------+---------------------------------------
@@ -221,7 +227,7 @@
Name: nodejs-electron
-Version: 27.0.3
+Version: 27.0.4
Release: 0
Summary: Build cross platform desktop apps with JavaScript, HTML, and
CSS
License: AFL-2.0 AND Apache-2.0 AND blessing AND BSD-2-Clause AND
BSD-3-Clause AND BSD-Protection AND BSD-Source-Code AND bzip2-1.0.6 AND IJG AND
ISC AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND MIT AND MIT-CMU AND
MIT-open-group AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND
MPL-2.0 AND OpenSSL AND SGI-B-2.0 AND SUSE-Public-Domain AND X11
@@ -348,6 +354,7 @@
Patch2041: chromium-117-blink-BUILD-mnemonic.patch
Patch2042: brotli-remove-shared-dictionary.patch
Patch2043: keyboard_util-gcc12-invalid-constexpr.patch
+Patch2044: computed_style_base-nbsp.patch
# PATCHES that should be submitted upstream verbatim or near-verbatim
Patch3016: chromium-98-EnumTable-crash.patch
@@ -383,7 +390,7 @@
Patch3224: autofill_i18n_parsing_expressions-constexpr.patch
Patch3225: simple_font_data-freetype-include.patch
Patch3226: perfetto-numeric_storage-double_t.patch
-Patch3227:
crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch
+Patch3227: policy_templates-deterministic.patch
%if %{with clang}
@@ -465,14 +472,12 @@
%endif
BuildRequires: pkgconfig
BuildRequires: plasma-wayland-protocols
-%if 0%{?suse_version} && 0%{?suse_version} < 1550
-BuildRequires: python3-dataclasses
-%endif
BuildRequires: python3-json5
+BuildRequires: python%{PYVER}-jinja2 >= 3.0.2
BuildRequires: python3-mako
BuildRequires: python3-ply
-BuildRequires: python3-PyYAML
-BuildRequires: python3-six
+BuildRequires: python%{PYVER}-PyYAML >= 6
+BuildRequires: python%{PYVER}-six
%if %{with system_simdutf}
BuildRequires: simdutf-devel >= 3
%endif
@@ -797,9 +802,20 @@
# Make sure python is python3
install -d -m 0755 python3-path
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150700 || 0%{?fedora}
ln -sf %{_bindir}/python3 "$(pwd)/python3-path/python"
+%else
+ln -sf %{_bindir}/python3.11 "$(pwd)/python3-path/python"
+ln -sf %{_bindir}/python3.11 "$(pwd)/python3-path/python3"
+%endif
export PATH="$(pwd)/python3-path:${PATH}"
+#HACK: Those packages on Leap are available only in python3.6 versions.
+%if 0%{?suse_version} && 0%{?suse_version} < 1550
+install -d -m 0755 python3-site
+cp -pr %{python3_sitelib}/{json5,mako,ply} -t "$(pwd)/python3-site"
+export PYTHONPATH="$(pwd)/python3-site"
+%endif
#some Fedora ports still try to build with LTO
ARCH_FLAGS=$(echo "%optflags"|sed 's/-f[^ ]*lto[^ ]*//g' )
++++++ computed_style_base-nbsp.patch ++++++
Fix spurious U+00a0 âNo-Break Spaceâ breaking jinja2 3.0.x. This code no
longer exists on upstream master.
---
src/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.cc.tmpl.orig
2023-11-09 20:20:31.584067600 +0000
+++
src/third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.cc.tmpl
2023-11-10 06:05:00.936736900 +0000
@@ -50,7 +50,7 @@ ComputedStyleBase::ComputedStyleBase(con
// that was copied wholesale.
{{setter_expression(field)}} = {{encode(field, field.default_value)}};
}
- Â {% endfor %}
+ {% endfor %}
{% endfor %}
}
++++++ create_tarball.sh ++++++
--- /var/tmp/diff_new_pack.pphp2G/_old 2023-11-13 22:21:23.620657698 +0100
+++ /var/tmp/diff_new_pack.pphp2G/_new 2023-11-13 22:21:23.624657845 +0100
@@ -65,6 +65,8 @@
]
EOF
+export DEPOT_TOOLS_UPDATE=0
+
echo ">>>>>> Downloading electron-${ELECTRON_PKGVERSION}"
gclient sync -v --jobs $(nproc) --nohooks --no-history --shallow
--revision=v"${ELECTRON_PKGVERSION}"
if [ $? -ne 0 ]; then
@@ -222,7 +224,6 @@
third_party/iccjpeg #not in any distro
third_party/inspector_protocol #integral part of chrome
third_party/ipcz #not in any distro
- third_party/jinja2 #Patch for deterministic builds. CONSIDER UNBUNDLING
this when chrome switches to jinja 3.x
third_party/jstemplate #javascript
third_party/khronos #Modified to add ANGLE definitions
third_party/leveldatabase #use of private headers
@@ -251,7 +252,6 @@
third_party/lss #Wrapper for linux ABI
#third_party/maldoca #integral part of chrome, but not used in electron.
#third_party/maldoca/src/third_party
- third_party/markupsafe #ImportError: cannot import name 'soft_unicode'
from 'markupsafe' (/usr/lib64/python3.10/site-packages/markupsafe/__init__.py).
CONSIDER UNBUNDLING when jinja is fixed
third_party/material_color_utilities #not in any distro
third_party/mesa_headers #ui/gl/gl_bindings.cc depends on
GL_KHR_robustness not being defined.
third_party/metrics_proto #integral part of chrome
++++++ policy_templates-deterministic.patch ++++++
--- src/components/policy/resources/policy_templates.py.old 2023-11-09
20:20:20.842699700 +0000
+++ src/components/policy/resources/policy_templates.py 2023-11-10
19:29:35.698934300 +0000
@@ -35,7 +35,7 @@ def _SafeListDir(directory):
# On macOS, Finder.app creates .DS_Store files when a user visit a
# directory causing failure of the script laters on because there
# are no such group as .DS_Store. Skip the file to prevent the error.
- return filter(lambda name:(name != '.DS_Store'),os.listdir(directory))
+ return filter(lambda name:(name !=
'.DS_Store'),sorted(os.listdir(directory)))
TEMPLATES_PATH = os.path.join(
os.path.dirname(__file__), 'templates')
++++++ system-pydeps.patch ++++++
--- /var/tmp/diff_new_pack.pphp2G/_old 2023-11-13 22:21:23.844665946 +0100
+++ /var/tmp/diff_new_pack.pphp2G/_new 2023-11-13 22:21:23.848666093 +0100
@@ -1,6 +1,4 @@
Unbundle assorted lexing/parsing/transpiling tools written in Python.
-Notably NOT including jinja2 due to
https://bugs.chromium.org/p/chromium/issues/detail?id=1194274
-Also excluding markupsafe, because jinja2 needs an ancient version.
âImportError: cannot import name 'soft_unicode' from 'markupsafe'
(/usr/lib64/python3.10/site-packages/markupsafe/__init__.py)â
--- a/mojo/public/tools/mojom/mojom/BUILD.gn
+++ b/mojo/public/tools/mojom/mojom/BUILD.gn
@@ -42,7 +40,7 @@
collect_idl_files.py
--- a/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps
+++ b/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps
-@@ -1,28 +1,8 @@
+@@ -1,28 +1,5 @@
# Generated by running:
# build/print_python_deps.py --root
third_party/blink/renderer/bindings/scripts --output
third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps
third_party/blink/renderer/bindings/scripts/generate_bindings.py
-../../../../mako/mako/mako/__init__.py
@@ -61,9 +59,9 @@
-../../../../mako/mako/mako/runtime.py
-../../../../mako/mako/mako/template.py
-../../../../mako/mako/mako/util.py
- ../../../../markupsafe/__init__.py
- ../../../../markupsafe/_compat.py
- ../../../../markupsafe/_native.py
+-../../../../markupsafe/__init__.py
+-../../../../markupsafe/_compat.py
+-../../../../markupsafe/_native.py
-../../../../pyjson5/src/json5/__init__.py
-../../../../pyjson5/src/json5/lib.py
-../../../../pyjson5/src/json5/parser.py
@@ -84,7 +82,7 @@
---
src/third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps.old
2022-11-30 10:28:05.822183900 +0000
+++
src/third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps
2022-11-30 19:51:45.562760400 +0000
-@@ -1,28 +1,8 @@
+@@ -1,28 +1,5 @@
# Generated by running:
# build/print_python_deps.py --root
third_party/blink/renderer/bindings/scripts --output
third_party/blink/renderer/bindings/scripts/check_generated_file_list.pydeps
third_party/blink/renderer/bindings/scripts/check_generated_file_list.py
-../../../../mako/mako/mako/__init__.py
@@ -103,9 +101,9 @@
-../../../../mako/mako/mako/runtime.py
-../../../../mako/mako/mako/template.py
-../../../../mako/mako/mako/util.py
- ../../../../markupsafe/__init__.py
- ../../../../markupsafe/_compat.py
- ../../../../markupsafe/_native.py
+-../../../../markupsafe/__init__.py
+-../../../../markupsafe/_compat.py
+-../../../../markupsafe/_native.py
-../../../../pyjson5/src/json5/__init__.py
-../../../../pyjson5/src/json5/lib.py
-../../../../pyjson5/src/json5/parser.py
@@ -138,10 +136,12 @@
outputs = []
--- src/third_party/blink/renderer/build/scripts/scripts.gni.old
+++ src/third_party/blink/renderer/build/scripts/scripts.gni
-@@ -19,7 +19,6 @@ scripts_for_json5_files = [
+@@ -17,9 +17,6 @@ _scripts_dir = "//third_party/blink/rend
+ scripts_for_json5_files = [
+ # jinja2/__init__.py contains version string, so sufficient as
# dependency for whole jinja2 package
- "//third_party/jinja2/__init__.py",
- "//third_party/markupsafe/__init__.py", # jinja2 dep
+- "//third_party/jinja2/__init__.py",
+- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "//third_party/pyjson5/src/json5/__init__.py",
"$_scripts_dir/blinkbuild/name_style_converter.py",
"$_scripts_dir/hasher.py",
@@ -158,4 +158,15 @@
../../build/scripts/blinkbuild/__init__.py
../../build/scripts/blinkbuild/name_style_converter.py
generate_event_interface_names.py
+--- src/third_party/jinja2/jinja2.gni.old 2023-11-09 21:20:56.224381300
+0100
++++ src/third_party/jinja2/jinja2.gni 2023-11-09 22:34:58.269569800 +0100
+@@ -1,6 +1,7 @@
+ import("//third_party/markupsafe/markupsafe.gni")
+
+-jinja2_sources = [
++jinja2_sources = []
++xjinja2_sourcesx = [
+ "//third_party/jinja2/__init__.py",
+ "//third_party/jinja2/_identifier.py",
+ "//third_party/jinja2/async_utils.py",
