From 64efbefb2c9a5f52658ec92f3d44c6469a91d0c2ee30a10f27ceafe42749b6cc Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Sat, 3 Dec 2022 23:54:17 +0000 Subject: [PATCH] Accepting request 1039925 from home:dziobian:gulgul-ultron:19 - New upstream release 21.3.2 * Updated Chromium to 106.0.5249.199 - Drop common.gypi-cpp-version.patch applied upstream - Use gcc12 also on Leap as it's available now. * that way we use the same compiler version everywhere - correct optflags not being applied for assembler files compiled wih gcc * add gcc-asmflags.patch - correct a compiler warning in system-libbsd.patch - remove more dead code OBS-URL: https://build.opensuse.org/request/show/1039925 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=51 --- common.gypi-cpp-version.patch | 36 ----------------------------------- create_tarball.sh | 4 ++++ electron-21.3.0.tar.xz | 3 --- electron-21.3.2.tar.xz | 3 +++ gcc-asmflags.patch | 10 ++++++++++ nodejs-electron.changes | 12 ++++++++++++ nodejs-electron.spec | 28 +++++++++++++++------------ system-libbsd.patch | 23 ++++++++++++---------- 8 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 common.gypi-cpp-version.patch delete mode 100644 electron-21.3.0.tar.xz create mode 100644 electron-21.3.2.tar.xz create mode 100644 gcc-asmflags.patch diff --git a/common.gypi-cpp-version.patch b/common.gypi-cpp-version.patch deleted file mode 100644 index c7fe629..0000000 --- a/common.gypi-cpp-version.patch +++ /dev/null @@ -1,36 +0,0 @@ -With c++14 compiling anything against these headers gets the following error: - -npm ERR! /usr/include/electron/v8-maybe.h:106:45: error: 'is_lvalue_reference_v' is not a member of 'std'; did you mean 'is_lvalue_reference'? -npm ERR! 106 | template >*> -npm ERR! | ^~~~~~~~~~~~~~~~~~~~~ - - ---- a/third_party/electron_node/common.gypi 2022-09-16 12:49:53.208366401 +0200 -+++ b/third_party/electron_node/common.gypi 2022-09-19 12:14:32.359490504 +0200 -@@ -440,7 +440,7 @@ - }], - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], -- 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14' ], -+ 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ], - 'defines': [ '__STDC_FORMAT_MACROS' ], - 'ldflags': [ '-rdynamic' ], - 'target_conditions': [ -@@ -580,7 +580,7 @@ - ['clang==1', { - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', -- 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++14', # -std=gnu++14 -+ 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++17', # -std=gnu++17 - 'CLANG_CXX_LIBRARY': 'libc++', - }, - }], -@@ -653,7 +653,7 @@ - '-qASM', - ], - 'cflags_cc': [ -- '-qxclang=-std=c++14', -+ '-qxclang=-std=c++17', - ], - 'ldflags': [ - '-q64', diff --git a/create_tarball.sh b/create_tarball.sh index 519feda..6319e00 100644 --- a/create_tarball.sh +++ b/create_tarball.sh @@ -358,8 +358,12 @@ rm -rf tools/disable_tests #6MB rm -rf tools/perf/{page_sets,testdata} #55MB rm -rf third_party/blink/web_tests # 1.6GB rm -rf third_party/catapult/tracing/test_data # 200MB +rm -rf third_party/sqlite/src/test #86MB find chrome/test/data -type f ! -name "*.gn" -a ! -name "*.gni" -delete #249MB, thanks Mageia +#see electron/.circleci/config/base.yml +rm -rf android_webview +rm -rf ios/chrome find . -type d -name .git -print0 | xargs -0 rm -rf # Remove generatted python bytecode diff --git a/electron-21.3.0.tar.xz b/electron-21.3.0.tar.xz deleted file mode 100644 index 91597cd..0000000 --- a/electron-21.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18631b42625e0f603dcf4111befe706d1267a6682914179cdf7189fadc688ee3 -size 545047828 diff --git a/electron-21.3.2.tar.xz b/electron-21.3.2.tar.xz new file mode 100644 index 0000000..3f82949 --- /dev/null +++ b/electron-21.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:465f392c124347f7e4f49f702d9a51578cc852274848a5a8a2a4867e7c74e9d3 +size 527213452 diff --git a/gcc-asmflags.patch b/gcc-asmflags.patch new file mode 100644 index 0000000..447fee6 --- /dev/null +++ b/gcc-asmflags.patch @@ -0,0 +1,10 @@ +--- webrtc-5005b/build/toolchain/linux/unbundle/BUILD.gn.old 2022-11-03 22:00:52.560610182 +0100 ++++ webrtc-5005b/build/toolchain/linux/unbundle/BUILD.gn 2022-12-02 18:00:45.728794737 +0100 +@@ -11,6 +11,7 @@ + nm = getenv("NM") + ld = cxx + ++ extra_asmflags = getenv("CFLAGS") + extra_cflags = getenv("CFLAGS") + extra_cppflags = getenv("CPPFLAGS") + extra_cxxflags = getenv("CXXFLAGS") diff --git a/nodejs-electron.changes b/nodejs-electron.changes index b4003c1..0c56e73 100644 --- a/nodejs-electron.changes +++ b/nodejs-electron.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 2 23:40:14 UTC 2022 - Bruno Pitrus +- New upstream release 21.3.2 + * Updated Chromium to 106.0.5249.199 +- Drop common.gypi-cpp-version.patch applied upstream +- Use gcc12 also on Leap as it's available now. + * that way we use the same compiler version everywhere +- correct optflags not being applied for assembler files compiled wih gcc + * add gcc-asmflags.patch +- correct a compiler warning in system-libbsd.patch +- remove more dead code + ------------------------------------------------------------------- Sat Nov 26 20:30:28 UTC 2022 - Bruno Pitrus - Re-enable optimization of js code compiled into chromium (optimize_webui) diff --git a/nodejs-electron.spec b/nodejs-electron.spec index 6ff3b11..4cae58b 100644 --- a/nodejs-electron.spec +++ b/nodejs-electron.spec @@ -213,7 +213,7 @@ BuildArch: i686 Name: nodejs-electron -Version: 21.3.0 +Version: 21.3.2 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 @@ -265,6 +265,7 @@ Patch72: electron-version-from-env.patch # https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=102-based&id=d617766b236a93749ddbb50b75573dd35238ffc9 Patch73: disable-webspeech.patch Patch74: common.gypi-remove-fno-omit-frame-pointer.patch +Patch75: gcc-asmflags.patch # PATCHES to use system libs Patch1002: chromium-system-libusb.patch @@ -340,7 +341,6 @@ Patch3067: reproducible-config.gypi.patch Patch3068: content_language_parser-missing-string.patch Patch3069: aggregatable_attribution_utils-do-not-assume-abseil-ABI.patch Patch3072: attribution_response_parsing-do-not-assume-abseil-ABI.patch -Patch3073: common.gypi-cpp-version.patch Patch3074: pending_beacon_dispatcher-virtual-functions-cannot-be-constexpr.patch Patch3075: std_lib_extras-missing-intptr_t.patch Patch3076: gtk_ui_platform_stub-incomplete-type-LinuxInputMethodContext.patch @@ -602,11 +602,11 @@ BuildRequires: pkgconfig(vpx) >= 1.8.2 %endif %if %{without clang} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150600 || 0%{?fedora} -BuildRequires: gcc >= 11 -BuildRequires: gcc-c++ >= 11 +BuildRequires: gcc >= 12 +BuildRequires: gcc-c++ >= 12 %else -BuildRequires: gcc11-PIE -BuildRequires: gcc11-c++ +BuildRequires: gcc12-PIE +BuildRequires: gcc12-c++ %endif %endif %if %{with pipewire} @@ -815,11 +815,11 @@ export AR=gcc-ar export NM=gcc-nm export RANLIB=gcc-ranlib %else -export CC=gcc-11 -export CXX=g++-11 -export AR=gcc-ar-11 -export NM=gcc-nm-11 -export RANLIB=gcc-ranlib-11 +export CC=gcc-12 +export CXX=g++-12 +export AR=gcc-ar-12 +export NM=gcc-nm-12 +export RANLIB=gcc-ranlib-12 %endif # endif with clang @@ -1105,6 +1105,7 @@ myconf_gn+=" enable_vr=false" myconf_gn+=" enable_reading_list=false" myconf_gn+=" enable_reporting=false" myconf_gn+=" build_with_tflite_lib=false" +myconf_gn+=" build_tflite_with_xnnpack=false" myconf_gn+=" safe_browsing_mode=0" myconf_gn+=" enable_captive_portal_detection=false" myconf_gn+=" enable_browser_speech_service=false" @@ -1113,16 +1114,19 @@ myconf_gn+=" enable_screen_ai_service=false" myconf_gn+=" include_transport_security_state_preload_list=false" myconf_gn+=" enable_web_speech=false" myconf_gn+=" chrome_wide_echo_cancellation_supported=false" -myconf_gn+=" enable_dice_support=false" myconf_gn+=" enable_downgrade_processing=false" myconf_gn+=" enable_click_to_call=false" myconf_gn+=" enable_webui_tab_strip=false" +myconf_gn+=" enable_webui_certificate_viewer=false" myconf_gn+=" enable_background_contents=false" +myconf_gn+=" enable_xz_extractor=false" +myconf_gn+=" enable_feed_v2=false" #Do not build Chromecast myconf_gn+=" enable_remoting=false" myconf_gn+=" enable_media_remoting=false" +myconf_gn+=" enable_service_discovery=false" diff --git a/system-libbsd.patch b/system-libbsd.patch index 9a25c6b..f5ac8f7 100644 --- a/system-libbsd.patch +++ b/system-libbsd.patch @@ -2,7 +2,19 @@ This source file was copied from libbsd, use the system library instead --- a/third_party/libsync/BUILD.gn 2022-06-21 21:52:53.867987945 +0200 +++ a/third_party/libsync/BUILD.gn 2022-06-28 17:30:45.327377489 +0200 -@@ -31,7 +31,6 @@ +@@ -21,9 +21,8 @@ + ] + } + +- config("libsync_private_config") { +- # To suppress the warning caused by strlcpy. +- cflags = [ "-Wno-implicit-function-declaration" ] ++ pkg_config("libsync_private_config") { ++ packages = [ "libbsd-overlay" ] + } + + source_set("libsync") { +@@ -31,7 +30,6 @@ "src/include/sync/sync.h", "src/sw_sync.h", "src/sync.c", @@ -10,12 +22,3 @@ This source file was copied from libbsd, use the system library instead ] configs -= [ "//build/config/compiler:chromium_code" ] -@@ -41,6 +40,8 @@ - ] - - public_configs = [ ":libsync_config" ] -+ -+ libs = [ "bsd" ] - } - } -