diff --git a/angle-ShaderVars-missing-uint32_t.patch b/angle-ShaderVars-missing-uint32_t.patch new file mode 100644 index 0000000..73d2c75 --- /dev/null +++ b/angle-ShaderVars-missing-uint32_t.patch @@ -0,0 +1,10 @@ +--- src/third_party/angle/include/GLSLANG/ShaderVars.h.old ++++ src/third_party/angle/include/GLSLANG/ShaderVars.h +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/blink-gcc13-missing-headers.patch b/blink-gcc13-missing-headers.patch new file mode 100644 index 0000000..40098f6 --- /dev/null +++ b/blink-gcc13-missing-headers.patch @@ -0,0 +1,22 @@ +--- src/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h.old 2023-03-07 10:51:27.754759600 +0000 ++++ src/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h 2023-03-09 08:25:00.771159100 +0000 +@@ -6,6 +6,9 @@ + #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_ + + #include ++#include ++#include ++#include + #include + + #include "third_party/blink/public/common/common_export.h" +--- src/third_party/blink/public/common/origin_trials/origin_trial_public_key.h.old 2023-03-07 11:51:27.758759553 +0100 ++++ src/third_party/blink/public/common/origin_trials/origin_trial_public_key.h 2023-03-09 13:54:11.881700635 +0100 +@@ -6,6 +6,7 @@ + #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_ + + #include ++#include + + namespace blink { + diff --git a/bluetooth_uuid-missing-uint8_t.patch b/bluetooth_uuid-missing-uint8_t.patch new file mode 100644 index 0000000..31d8198 --- /dev/null +++ b/bluetooth_uuid-missing-uint8_t.patch @@ -0,0 +1,10 @@ +--- src/device/bluetooth/public/cpp/bluetooth_uuid.h.old 2023-03-07 11:51:25.678757600 +0100 ++++ src/device/bluetooth/public/cpp/bluetooth_uuid.h 2023-03-07 21:50:18.367030500 +0100 +@@ -5,6 +5,7 @@ + #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + ++#include + #include + #include + #include diff --git a/broker_file_permission-missing-uint64_t.patch b/broker_file_permission-missing-uint64_t.patch new file mode 100644 index 0000000..c27cf1b --- /dev/null +++ b/broker_file_permission-missing-uint64_t.patch @@ -0,0 +1,10 @@ +--- src/sandbox/linux/syscall_broker/broker_file_permission.h.old 2023-03-07 11:51:27.250759100 +0100 ++++ src/sandbox/linux/syscall_broker/broker_file_permission.h 2023-03-07 22:30:50.447848900 +0100 +@@ -6,6 +6,7 @@ + #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ + + #include ++#include + #include + + #include "sandbox/sandbox_export.h" diff --git a/components-gcc13-missing-headers.patch b/components-gcc13-missing-headers.patch new file mode 100644 index 0000000..59cff9d --- /dev/null +++ b/components-gcc13-missing-headers.patch @@ -0,0 +1,70 @@ +--- a/components/crash/core/app/crash_reporter_client.h ++++ b/components/crash/core/app/crash_reporter_client.h +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_ + #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_ + ++#include + #include + #include + +--- src/components/feature_engagement/internal/event_storage_validator.h.old 2023-03-07 10:51:24.306756300 +0000 ++++ src/components/feature_engagement/internal/event_storage_validator.h 2023-03-08 19:07:07.780289000 +0000 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ + #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_ + ++#include + #include + + namespace feature_engagement { +--- a/components/password_manager/core/browser/generation/password_generator.h ++++ b/components/password_manager/core/browser/generation/password_generator.h +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ + #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_ + ++#include + #include + + +--- src/components/metrics/psi_memory_parser.h.old 2023-03-07 11:51:24.394756322 +0100 ++++ src/components/metrics/psi_memory_parser.h 2023-03-08 14:04:15.470128894 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_ + #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_ + ++#include + #include + + #include "base/gtest_prod_util.h" +--- src/components/soda/constants.h.old 2023-03-07 10:51:24.794756800 +0000 ++++ src/components/soda/constants.h 2023-03-08 20:58:33.789967200 +0000 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_SODA_CONSTANTS_H_ + #define COMPONENTS_SODA_CONSTANTS_H_ + ++#include + #include + + #include "base/files/file_path.h" +--- src/components/viz/common/shared_element_resource_id.h.old 2023-03-07 10:51:25.094757000 +0000 ++++ src/components/viz/common/shared_element_resource_id.h 2023-03-08 22:10:33.253309800 +0000 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ + #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_ + ++#include + #include + #include + +--- src/components/autofill/core/browser/autofill_ablation_study.h.old 2023-03-07 11:51:24.058756000 +0100 ++++ src/components/autofill/core/browser/autofill_ablation_study.h 2023-03-09 11:39:59.131542780 +0100 +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ + #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_ + ++#include + #include + + class GURL; diff --git a/create_tarball.sh b/create_tarball.sh index b6dfb04..3bfa863 100644 --- a/create_tarball.sh +++ b/create_tarball.sh @@ -4,7 +4,7 @@ # Copyright (c) 2021 Andreas Schneider # License: GPLv3 # -# dnf install python3-base git-core npm16 yarn python2-base moreutils +# dnf install python3-base file findutils git-core tar yarn moreutils zstd ELECTRON_PKGVERSION="$(rpmspec -P ./*.spec | grep ^\s*Version | sed -e 's/Version:[ ]*//g')" ELECTRON_PKGNAME="electron" @@ -169,7 +169,7 @@ keeplibs=( third_party/angle # ANGLE is an integral part of chrome and is not available as a shared library. third_party/angle/src/common/third_party/base #Derived code, not vendored dependency. third_party/angle/src/common/third_party/smhasher ##Derived code, not vendored dependency. - third_party/angle/src/third_party/libXNVCtrl #Not in Factory yet + third_party/angle/src/third_party/libXNVCtrl #Not in 15.4 third_party/angle/src/third_party/trace_event #Does not seem to be a separate library. third_party/angle/src/third_party/volk #Not in Factory or Rawhide. Debian has it as vulkan-volk, CONSIDER UNBUNDLING when we have it third_party/blink #Integral part of chrome @@ -212,7 +212,7 @@ keeplibs=( third_party/electron_node #Integral part of electron third_party/emoji-segmenter #not available as a shared library third_party/fdlibm #derived code, not vendored dep - third_party/highway #Not in Leap + third_party/highway #Not in 15.4. Needed by libjxl third_party/hunspell #heavily forked version third_party/iccjpeg #not in any distro third_party/inspector_protocol #integral part of chrome @@ -250,7 +250,7 @@ keeplibs=( 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/mesa_headers #ui/gl/gl_bindings.cc depends on GL_KHR_robustness not being defined. third_party/metrics_proto #integral part of chrome - third_party/modp_b64 #not in any distro + third_party/modp_b64 #not in Factory or Rawhide. pkgconfig(stringencoders) Mageia, AltLinux, Debian have it third_party/node #javascript code third_party/one_euro_filter #not in any distro third_party/openscreen #Integral part of chrome, needed even if you're building without. @@ -289,7 +289,6 @@ keeplibs=( third_party/vulkan-deps/spirv-headers #FC36 too old third_party/vulkan-deps/spirv-tools #FC36 too old third_party/vulkan-deps/vulkan-headers #FC36 too old. CONSIDER UNBUNDLING when all distros have new enough vulkan sdk - third_party/vulkan-deps/vulkan-tools #The mock ICD seems to be used during build, but is not shipped (see https://github.com/electron/electron/pull/18596) third_party/vulkan_memory_allocator #not in any distro third_party/webgpu-cts #Javascript code. Needed even if you're building chrome without webgpu third_party/webrtc #Integral part of chrome @@ -384,9 +383,9 @@ echo ">>>>>> Remove empty directories" find . -type d -empty -print -delete popd || cleanup_and_exit 1 -echo ">>>>>> Hardlink duplicate files to reduce extraction time" - -/usr/lib/rpm/fdupes_wrapper src +#echo ">>>>>> Hardlink duplicate files to reduce extraction time" +#Disabled this — it fails to link sometimes causing tarball nondeterminism +#/usr/lib/rpm/fdupes_wrapper src echo ">>>>>> Create tarball" ZSTD_CLEVEL=19 ZSTD_NBTHREADS=$(nproc) tar --zstd --sort=name -vvScf "${ELECTRON_PKGDIR}/${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}.tar.zst" src diff --git a/effect_paint_property_node-Wchanges-meaning.patch b/effect_paint_property_node-Wchanges-meaning.patch new file mode 100644 index 0000000..fa85337 --- /dev/null +++ b/effect_paint_property_node-Wchanges-meaning.patch @@ -0,0 +1,11 @@ +--- src/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h.old 2023-03-07 11:51:28.326760100 +0100 ++++ src/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h 2023-03-09 21:56:47.418863400 +0100 +@@ -122,7 +122,7 @@ + + // An identifier for a document transition shared element. `id.valid()` + // returns true if this has been set, and false otherwise. +- DocumentTransitionSharedElementId document_transition_shared_element_id; ++ blink::DocumentTransitionSharedElementId document_transition_shared_element_id; + + // An identifier to tag shared element resources generated and cached in the + // Viz process. This generated resource can be used as content for other diff --git a/electron-16-system-node-headers.patch b/electron-16-system-node-headers.patch index 1032bce..19402d7 100644 --- a/electron-16-system-node-headers.patch +++ b/electron-16-system-node-headers.patch @@ -8,7 +8,7 @@ Index: electron-17.1.0/third_party/electron_node/common.gypi }], + [ 'OS in "linux"', { + 'cflags': [ '-I/usr/include/electron' ], -+ 'ldflags': [ '-Wl,--as-needed', '-lz' ], ++ 'libraries': [ '-lz' ], + }], [ 'OS in "linux freebsd openbsd solaris aix"', { 'cflags': [ '-pthread' ], diff --git a/electron-22.3.0.tar.zst b/electron-22.3.0.tar.zst deleted file mode 100644 index cb2321c..0000000 --- a/electron-22.3.0.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af55c707e73293f4a29e7ffc8e2b223c1dabb1b585221df2852f1b7a152e759e -size 577391395 diff --git a/electron-22.3.2.tar.zst b/electron-22.3.2.tar.zst new file mode 100644 index 0000000..ec81c05 --- /dev/null +++ b/electron-22.3.2.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f37f950783fffc075149c96a3589feb0b5c9273e2e6d772db337e0ccd5a6857 +size 591100866 diff --git a/extensions-gcc13-missing-headers.patch b/extensions-gcc13-missing-headers.patch new file mode 100644 index 0000000..27f06da --- /dev/null +++ b/extensions-gcc13-missing-headers.patch @@ -0,0 +1,22 @@ +--- src/extensions/common/constants.h.old 2023-03-07 10:51:25.826757700 +0000 ++++ src/extensions/common/constants.h 2023-03-08 16:42:05.632267700 +0000 +@@ -5,6 +5,9 @@ + #ifndef EXTENSIONS_COMMON_CONSTANTS_H_ + #define EXTENSIONS_COMMON_CONSTANTS_H_ + ++#include ++#include ++ + #include "base/files/file_path.h" + #include "base/strings/string_piece_forward.h" + #include "build/chromeos_buildflags.h" +--- src/extensions/renderer/bindings/api_invocation_errors.h.old 2023-03-07 10:51:25.838757800 +0000 ++++ src/extensions/renderer/bindings/api_invocation_errors.h 2023-03-09 17:57:28.682181200 +0000 +@@ -5,6 +5,7 @@ + #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_ + #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_ + ++#include + #include + #include + diff --git a/gpu_feature_info-missing-uint32_t.patch b/gpu_feature_info-missing-uint32_t.patch new file mode 100644 index 0000000..94444b5 --- /dev/null +++ b/gpu_feature_info-missing-uint32_t.patch @@ -0,0 +1,10 @@ +--- src/gpu/config/gpu_feature_info.h.old 2023-03-07 10:51:25.926757800 +0000 ++++ src/gpu/config/gpu_feature_info.h 2023-03-09 05:36:10.635812200 +0000 +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ + #define GPU_CONFIG_GPU_FEATURE_INFO_H_ + ++#include + #include + #include + diff --git a/net-gcc13-missing-headers.patch b/net-gcc13-missing-headers.patch new file mode 100644 index 0000000..fe300eb --- /dev/null +++ b/net-gcc13-missing-headers.patch @@ -0,0 +1,21 @@ +--- src/net/cookies/cookie_inclusion_status.h.old 2023-03-07 11:51:26.874758704 +0100 ++++ src/net/cookies/cookie_inclusion_status.h 2023-03-08 16:26:46.505830726 +0100 +@@ -6,6 +6,7 @@ + #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + + #include ++#include + #include + #include + #include +--- src/net/base/parse_number.h.old 2023-03-07 11:51:26.858758688 +0100 ++++ src/net/base/parse_number.h 2023-03-08 14:54:32.174472371 +0100 +@@ -5,6 +5,8 @@ + #ifndef NET_BASE_PARSE_NUMBER_H_ + #define NET_BASE_PARSE_NUMBER_H_ + ++#include ++ + #include "base/strings/string_piece.h" + #include "net/base/net_export.h" + diff --git a/net-third_party-quiche-gcc13-missing-headers.patch b/net-third_party-quiche-gcc13-missing-headers.patch new file mode 100644 index 0000000..1b9c7ef --- /dev/null +++ b/net-third_party-quiche-gcc13-missing-headers.patch @@ -0,0 +1,30 @@ +--- src/net/third_party/quiche/src/quiche/http2/adapter/header_validator_base.h.old 2023-03-07 11:51:42.050773300 +0100 ++++ src/net/third_party/quiche/src/quiche/http2/adapter/header_validator_base.h 2023-03-07 23:09:36.544902600 +0100 +@@ -1,6 +1,7 @@ + #ifndef QUICHE_HTTP2_ADAPTER_HEADER_VALIDATOR_BASE_H_ + #define QUICHE_HTTP2_ADAPTER_HEADER_VALIDATOR_BASE_H_ + ++#include + #include + + #include "absl/strings/string_view.h" +--- src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h.old 2023-03-07 10:51:42.086773400 +0000 ++++ src/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h 2023-03-08 05:31:08.115134100 +0000 +@@ -5,6 +5,7 @@ + #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ + #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_ + ++#include + #include + #include + +--- src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h.old 2023-03-07 11:51:42.070773300 +0100 ++++ src/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h 2023-03-08 00:06:05.139705800 +0100 +@@ -5,6 +5,7 @@ + #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ + #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_ + ++#include + #include + + #include "absl/strings/string_view.h" diff --git a/nodejs-electron.changes b/nodejs-electron.changes index 29cec7b..9adfbae 100644 --- a/nodejs-electron.changes +++ b/nodejs-electron.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Fri Mar 10 05:54:55 UTC 2023 - Bruno Pitrus +- New upstream release 22.3.2 + * Fixed window could not go back to maximized state when restored + * Improved error messages for contents.takeHeapSnapshot +- Disable some debugging code +- Revert disablement of _package_note_file on Fedora +- Switch to default BFD linker on aarch64 Fedora 36 +- Fix FTBFS on Rawhide + * angle-ShaderVars-missing-uint32_t.patch + * openscreen-gcc13-missing-headers.patch + * perfetto-uuid-missing-uint8_t.patch + * swiftshader-LRUCache-missing-uint64_t.patch + * vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch + * profiler-missing-uintptr_t.patch + * components-gcc13-missing-headers.patch + * one_writer_seqlock-missing-uintptr_t.patch + * bluetooth_uuid-missing-uint8_t.patch + * broker_file_permission-missing-uint64_t.patch + * net-third_party-quiche-gcc13-missing-headers.patch + * webrtc-base64-missing-uint8_t.patch + * ui-gcc13-missing-headers.patch + * net-gcc13-missing-headers.patch + * extensions-gcc13-missing-headers.patch + * target_property-missing-uint32_t.patch + * gpu_feature_info-missing-uint32_t.patch + * blink-gcc13-missing-headers.patch + * effect_paint_property_node-Wchanges-meaning.patch + +------------------------------------------------------------------- +Thu Feb 23 11:33:18 UTC 2023 - Bruno Pitrus +- New upstream release 22.3.1 + * no changes +- Actually fix -lz inserted in wrong place in the modules build command line + ------------------------------------------------------------------- Thu Feb 16 20:32:34 UTC 2023 - Bruno Pitrus - New upstream release 22.3.0 diff --git a/nodejs-electron.spec b/nodejs-electron.spec index 3356f97..3f65d32 100644 --- a/nodejs-electron.spec +++ b/nodejs-electron.spec @@ -17,7 +17,6 @@ # -%undefine _package_note_file # https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck %undefine _auto_set_build_flags @@ -45,7 +44,7 @@ BuildArch: i686 %bcond_without pipewire %bcond_without swiftshader -%ifarch %ix86 x86_64 %arm +%ifarch %ix86 x86_64 %x86_64 %arm #Use subzero as swiftshader backend instead of LLVM %bcond_without subzero %else @@ -77,12 +76,15 @@ BuildArch: i686 # Linker selection. GCC only. Default is BFD. # You can try different ones if it has problems. # arm64 reports relocation errors with BFD. +%if 0%{?suse_version} %ifarch aarch64 %bcond_without gold %else %bcond_with gold %endif - +%else +%bcond_with gold +%endif %endif #with clang @@ -193,7 +195,7 @@ BuildArch: i686 Name: nodejs-electron -Version: 22.3.0 +Version: 22.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 @@ -347,6 +349,25 @@ Patch3098: document_loader-private-DecodedBodyData.patch Patch3099: crashpad-elf_image_reader-ProgramHeaderTableSpecific-expected-unqualified-id.patch Patch3100: first_party_set_parser-IssueWithMetadata-no-known-conversion.patch Patch3101: print_dialog_gtk-no-kEnableOopPrintDriversJobPrint.patch +Patch3102: angle-ShaderVars-missing-uint32_t.patch +Patch3103: openscreen-gcc13-missing-headers.patch +Patch3104: perfetto-uuid-missing-uint8_t.patch +Patch3105: swiftshader-LRUCache-missing-uint64_t.patch +Patch3106: vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch +Patch3107: profiler-missing-uintptr_t.patch +Patch3108: components-gcc13-missing-headers.patch +Patch3109: one_writer_seqlock-missing-uintptr_t.patch +Patch3110: bluetooth_uuid-missing-uint8_t.patch +Patch3111: broker_file_permission-missing-uint64_t.patch +Patch3112: net-third_party-quiche-gcc13-missing-headers.patch +Patch3113: webrtc-base64-missing-uint8_t.patch +Patch3114: ui-gcc13-missing-headers.patch +Patch3115: net-gcc13-missing-headers.patch +Patch3116: extensions-gcc13-missing-headers.patch +Patch3117: target_property-missing-uint32_t.patch +Patch3118: gpu_feature_info-missing-uint32_t.patch +Patch3119: blink-gcc13-missing-headers.patch +Patch3120: effect_paint_property_node-Wchanges-meaning.patch %if %{with clang} BuildRequires: clang @@ -369,7 +390,6 @@ BuildRequires: cmake(Crc32c) %endif BuildRequires: double-conversion-devel BuildRequires: desktop-file-utils -BuildRequires: fdupes %if 0%{?fedora} BuildRequires: flatbuffers-compiler %endif @@ -410,7 +430,7 @@ BuildRequires: memory-constraints %if %{with mold} BuildRequires: mold %endif -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 %x86_64 BuildRequires: nasm %endif %if 0%{?suse_version} @@ -431,7 +451,6 @@ BuildRequires: python3-json5 BuildRequires: python3-mako BuildRequires: python3-ply BuildRequires: python3-six -BuildRequires: rsync BuildRequires: snappy-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -770,7 +789,7 @@ export CXXFLAGS="${CXXFLAGS} -Wno-class-memaccess" # REDUCE DEBUG for C++ as it gets TOO large due to “heavy hemplate use in Blink”. See symbol_level below and chromium-102-compiler.patch export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e 's/-g / /g' -e 's/-g$//g')" -%ifnarch x86_64 +%ifnarch x86_64 %x86_64 export CFLAGS="$(echo ${CFLAGS} | sed -e 's/-g /-g1 /g' -e 's/-g$/-g1/g')" %endif @@ -1003,7 +1022,7 @@ myconf_gn+=" use_custom_libcxx=false" %ifarch %ix86 myconf_gn+=" host_cpu=\"x86\"" %endif -%ifarch x86_64 +%ifarch x86_64 %x86_64 myconf_gn+=" host_cpu=\"x64\"" %endif %ifarch aarch64 @@ -1104,6 +1123,7 @@ 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_maldoca=false" myconf_gn+=" enable_captive_portal_detection=false" myconf_gn+=" enable_browser_speech_service=false" myconf_gn+=" enable_speech_service=false" @@ -1129,6 +1149,14 @@ myconf_gn+=" enable_remoting=false" myconf_gn+=" enable_media_remoting=false" myconf_gn+=" enable_service_discovery=false" +#disable some debug/tracing hooks, they increase size and we do not build chrome://tracing anyway (see disable-catapult.patch) +myconf_gn+=" enable_trace_logging=false" +myconf_gn+=" optional_trace_events_enabled=false" +myconf_gn+=" use_runtime_vlog=false" +myconf_gn+=" rtc_disable_logging=true" +myconf_gn+=" rtc_disable_metrics=true" +myconf_gn+=" rtc_disable_trace_events=true" + myconf_gn+=" enable_library_cdms=false" @@ -1240,13 +1268,9 @@ myconf_gn+=" ffmpeg_branding=\"Chrome\"" # https://bugs.chromium.org/p/chromium/issues/detail?id=642016 gn gen out/Release --args="import(\"//electron/build/args/release.gn\") ${myconf_gn}" -#Build the supplementary stuff first to notice errors earlier bc building electron itself takes several hours. -ninja -v %{?_smp_mflags} -C out/Release chromium_licenses -ninja -v %{?_smp_mflags} -C out/Release copy_headers -ninja -v %{?_smp_mflags} -C out/Release version # dump the linker command line (if any) in case of failure -ninja -v %{?_smp_mflags} -C out/Release electron || (cat out/Release/*.rsp | sed 's/ /\n/g' && false) +ninja -v %{?_smp_mflags} -C out/Release chromium_licenses copy_headers version electron || (cat out/Release/*.rsp | sed 's/ /\n/g' && false) @@ -1267,10 +1291,11 @@ install -pm 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps desktop-file-install --dir %{buildroot}%{_datadir}/applications/ %{SOURCE11} pushd out/Release -rsync -av *.bin *.pak %{buildroot}%{_libdir}/electron/ +cp -lv *.bin *.pak -t %{buildroot}%{_libdir}/electron/ install -pm 0644 resources/default_app.asar -t %{buildroot}%{_libdir}/electron/resources/ -rsync -av --exclude '*.pak.info' locales %{buildroot}%{_libdir}/electron/ +cp -lrv locales -t %{buildroot}%{_libdir}/electron/ +rm -v %{buildroot}%{_libdir}/electron/locales/*.pak.info install -pm 0755 electron -t %{buildroot}%{_libdir}/electron/ @@ -1290,7 +1315,7 @@ popd mkdir -p "%{buildroot}%{_sysconfdir}/webapps" mkdir -p "%{buildroot}%{_datadir}/webapps" -rsync -av out/Release/gen/node_headers/include/node/* %{buildroot}%{_includedir}/electron +cp -lrvT out/Release/gen/node_headers/include/node %{buildroot}%{_includedir}/electron # Install electron.macros mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d @@ -1308,6 +1333,7 @@ ln -srv third_party -t out/Release ln -srv third_party/libvpx -t third_party/libvpx/source/libvpx/third_party ln -srv third_party -t third_party/libvpx/source/libvpx/vp8 ln -srv third_party -t third_party/libvpx/source/libvpx/vp9 +ln -srv third_party -t third_party/libvpx/source %files %license electron/LICENSE out/Release/LICENSES.chromium.html diff --git a/one_writer_seqlock-missing-uintptr_t.patch b/one_writer_seqlock-missing-uintptr_t.patch new file mode 100644 index 0000000..70578f3 --- /dev/null +++ b/one_writer_seqlock-missing-uintptr_t.patch @@ -0,0 +1,11 @@ +--- src/device/base/synchronization/one_writer_seqlock.h.old 2023-03-07 10:51:25.662757600 +0000 ++++ src/device/base/synchronization/one_writer_seqlock.h 2023-03-07 18:51:45.647766600 +0000 +@@ -6,6 +6,8 @@ + #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_ + + #include ++#include ++#include + #include + + #include "base/atomicops.h" diff --git a/openscreen-gcc13-missing-headers.patch b/openscreen-gcc13-missing-headers.patch new file mode 100644 index 0000000..4d94ab9 --- /dev/null +++ b/openscreen-gcc13-missing-headers.patch @@ -0,0 +1,20 @@ +--- src/third_party/openscreen/src/util/base64.h.old 2023-03-07 11:52:10.906800987 +0100 ++++ src/third_party/openscreen/src/util/base64.h 2023-03-07 13:52:52.310335841 +0100 +@@ -5,6 +5,7 @@ + #ifndef UTIL_BASE64_H_ + #define UTIL_BASE64_H_ + ++#include + #include + #include + +--- src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h.old ++++ src/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h +@@ -5,6 +5,7 @@ + #ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_ + #define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_ + ++#include + #include + #include + #include diff --git a/perfetto-uuid-missing-uint8_t.patch b/perfetto-uuid-missing-uint8_t.patch new file mode 100644 index 0000000..0538566 --- /dev/null +++ b/perfetto-uuid-missing-uint8_t.patch @@ -0,0 +1,10 @@ +--- a/third_party/perfetto/include/perfetto/ext/base/uuid.h ++++ b/third_party/perfetto/include/perfetto/ext/base/uuid.h +@@ -18,6 +18,7 @@ + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ + + #include ++#include + #include + + #include "perfetto/ext/base/optional.h" diff --git a/profiler-missing-uintptr_t.patch b/profiler-missing-uintptr_t.patch new file mode 100644 index 0000000..68aa39b --- /dev/null +++ b/profiler-missing-uintptr_t.patch @@ -0,0 +1,10 @@ +--- a/base/debug/profiler.h ++++ b/base/debug/profiler.h +@@ -6,6 +6,7 @@ + #define BASE_DEBUG_PROFILER_H_ + + #include ++#include + + #include + diff --git a/swiftshader-LRUCache-missing-uint64_t.patch b/swiftshader-LRUCache-missing-uint64_t.patch new file mode 100644 index 0000000..6b64014 --- /dev/null +++ b/swiftshader-LRUCache-missing-uint64_t.patch @@ -0,0 +1,10 @@ +--- a/third_party/swiftshader/src/System/LRUCache.hpp ++++ b/third_party/swiftshader/src/System/LRUCache.hpp +@@ -18,6 +18,7 @@ + #include "System/Debug.hpp" + + #include ++#include + #include + #include + #include diff --git a/target_property-missing-uint32_t.patch b/target_property-missing-uint32_t.patch new file mode 100644 index 0000000..b72f8c5 --- /dev/null +++ b/target_property-missing-uint32_t.patch @@ -0,0 +1,11 @@ +--- src/cc/trees/target_property.cc.old 2023-03-07 10:51:21.466753600 +0000 ++++ src/cc/trees/target_property.cc 2023-03-08 17:47:48.197294200 +0000 +@@ -4,6 +4,8 @@ + + #include "cc/trees/target_property.h" + ++#include ++ + #include "ui/gfx/animation/keyframe/target_property.h" + + namespace cc { diff --git a/ui-gcc13-missing-headers.patch b/ui-gcc13-missing-headers.patch new file mode 100644 index 0000000..b8a7168 --- /dev/null +++ b/ui-gcc13-missing-headers.patch @@ -0,0 +1,33 @@ +--- src/ui/base/prediction/kalman_filter.h.old 2023-03-07 10:51:36.714768200 +0000 ++++ src/ui/base/prediction/kalman_filter.h 2023-03-08 08:32:35.533343500 +0000 +@@ -5,6 +5,8 @@ + #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_ + #define UI_BASE_PREDICTION_KALMAN_FILTER_H_ + ++#include ++ + #include "base/component_export.h" + #include "ui/gfx/geometry/matrix3_f.h" + +--- src/ui/gfx/geometry/linear_gradient.h.old 2023-03-07 11:51:36.862768295 +0100 ++++ src/ui/gfx/geometry/linear_gradient.h 2023-03-08 13:03:18.500668734 +0100 +@@ -6,6 +6,8 @@ + #define UI_GFX_LINEAR_GRADIENT_H_ + + #include ++#include ++#include + #include + + #include "ui/gfx/geometry/geometry_skia_export.h" +--- src/ui/events/types/scroll_types.h.old 2023-03-07 11:51:36.834768269 +0100 ++++ src/ui/events/types/scroll_types.h 2023-03-08 11:07:48.696799233 +0100 +@@ -5,6 +5,8 @@ + #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_ + #define UI_EVENTS_TYPES_SCROLL_TYPES_H_ + ++#include ++ + namespace ui { + + enum class ScrollGranularity : uint8_t { diff --git a/vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch b/vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch new file mode 100644 index 0000000..3b92f9f --- /dev/null +++ b/vulkan_memory_allocator-vk_mem_alloc-missing-snprintf.patch @@ -0,0 +1,26 @@ +From 29d492b60c84ca784ea0943efc7d2e6e0f3bdaac Mon Sep 17 00:00:00 2001 +From: Adam Sawicki +Date: Thu, 19 Jan 2023 13:19:55 +0100 +Subject: [PATCH] Added missing #include + +For snprintf, for compatibility with GCC 13. +Fixes #312 - thanks @marxin ! +--- + include/vk_mem_alloc.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h +index b787c36..0fe459b 100644 +--- a/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h ++++ b/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +@@ -2403,6 +2403,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #endif + #endif + ++#if VMA_STATS_STRING_ENABLED ++ #include // For snprintf ++#endif ++ + /******************************************************************************* + CONFIGURATION SECTION + diff --git a/webrtc-base64-missing-uint8_t.patch b/webrtc-base64-missing-uint8_t.patch new file mode 100644 index 0000000..5041399 --- /dev/null +++ b/webrtc-base64-missing-uint8_t.patch @@ -0,0 +1,11 @@ +--- src/third_party/webrtc/rtc_base/third_party/base64/base64.h.old 2023-03-07 10:52:34.754823900 +0000 ++++ src/third_party/webrtc/rtc_base/third_party/base64/base64.h 2023-03-08 06:56:05.662101900 +0000 +@@ -12,6 +12,8 @@ + #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + ++#include ++#include + #include + #include +