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 2021-07-16 00:00:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
 and      /work/SRC/openSUSE:Factory/.nodejs-electron.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "nodejs-electron"

Fri Jul 16 00:00:36 2021 rev:4 rq:906414 version:13.1.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes  
2021-07-12 21:40:53.923795745 +0200
+++ 
/work/SRC/openSUSE:Factory/.nodejs-electron.new.2625/nodejs-electron.changes    
    2021-07-16 00:02:59.120464010 +0200
@@ -1,0 +2,6 @@
+Mon Jul 12 06:20:09 UTC 2021 - Andreas Schneider <a...@cryptomilk.org>
+
+- Fix build on Fedora
+  * Added electron-13-openh264-format-security.patch
+
+-------------------------------------------------------------------
@@ -4,0 +11,7 @@
+
+-------------------------------------------------------------------
+Fri Jul  9 08:55:57 UTC 2021 - Andreas Schneider <a...@cryptomilk.org>
+
+- Update to version 13.1.6
+  * https://github.com/electron/electron/releases/tag/v13.1.6
+  * https://github.com/electron/electron/releases/tag/v13.1.5

Old:
----
  electron-13.1.4.tar.xz

New:
----
  electron-13-openh264-format-security.patch
  electron-13.1.6.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.9jdIZG/_old  2021-07-16 00:03:04.692419357 +0200
+++ /var/tmp/diff_new_pack.9jdIZG/_new  2021-07-16 00:03:04.692419357 +0200
@@ -44,7 +44,7 @@
 %bcond_with system_vpx
 %bcond_with clang
 Name:           nodejs-electron
-Version:        13.1.4
+Version:        13.1.6
 Release:        0
 Summary:        Build cross platform desktop apps with JavaScript, HTML, and 
CSS
 License:        MIT
@@ -87,6 +87,8 @@
 Patch23:        electron-13-gcc-fix-v8-nodiscard.patch
 # Fix blink nodestructor
 Patch24:        electron-13-blink-gcc-ambiguous-nodestructor.patch
+# Remove -Wno-format-security from openh264
+Patch25:        electron-13-openh264-format-security.patch
 BuildRequires:  SDL-devel
 BuildRequires:  binutils-gold
 BuildRequires:  bison
@@ -112,16 +114,25 @@
 BuildRequires:  nasm
 BuildRequires:  ncurses-devel
 %if 0%{?suse_version}
+# Required for /usr/bin/clang-format
+BuildRequires:  clang >= 8.0.0
 BuildRequires:  ninja >= 1.7.2
-%else
+%endif
+%if 0%{?fedora_version}
+# Required for /usr/bin/clang-format
+BuildRequires:  clang-tools-extra
+BuildRequires:  libatomic
 BuildRequires:  ninja-build >= 1.7.2
 %endif
 BuildRequires:  nodejs >= 8.0
 BuildRequires:  npm
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python2
+%if 0%{?fedora_version}
+BuildRequires:  python2-devel
+%endif
 %if 0%{?suse_version}
+BuildRequires:  python2
 BuildRequires:  python2-xml
 %endif
 BuildRequires:  rsync
@@ -178,7 +189,11 @@
 BuildRequires:  pkgconfig(libwebp) >= 0.4.0
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.5
 BuildRequires:  pkgconfig(libxslt)
+%if 0%{?fedora_version}
+BuildRequires:  minizip-compat-devel
+%else
 BuildRequires:  pkgconfig(minizip)
+%endif
 BuildRequires:  pkgconfig(nspr) >= 4.9.5
 BuildRequires:  pkgconfig(nss) >= 3.26
 BuildRequires:  pkgconfig(ogg)
@@ -226,8 +241,6 @@
 %if %{with system_vpx}
 BuildRequires:  pkgconfig(vpx) >= 1.8.2
 %endif
-# Always required for clang-format
-BuildRequires:  clang >= 8.0.0
 %if %{without clang}
 %if 0%{?suse_version} >= 1550 || 0%{?fedora_version}
 BuildRequires:  gcc >= 10
@@ -270,6 +283,11 @@
 # GN sets lto on its own and we need just ldflag options, not cflags
 %define _lto_cflags %{nil}
 
+# Make sure python is python2
+install -d -m 0755 python2-path
+ln -sf %{_bindir}/python2 "$(pwd)/python2-path/python"
+export PATH="$(pwd)/python2-path:${PATH}"
+
 # for wayland
 export CXXFLAGS="${CXXFLAGS} -I/usr/include/wayland 
-I/usr/include/libxkbcommon"
 
@@ -284,6 +302,11 @@
 
 # REDUCE DEBUG as it gets TOO large
 ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ 
-g$//g'`"
+%if 0%{?fedora_version}
+# Fix base/allocator/allocator_shim.cc:408:2: error: #error This code cannot be
+# used when exceptions are turned on.
+ARCH_FLAGS="`echo $ARCH_FLAGS | sed -e 's/ -fexceptions / /g'`"
+%endif
 
 export CXXFLAGS="${CXXFLAGS} ${ARCH_FLAGS} -Wno-return-type"
 # extra flags to reduce warnings that aren't very useful
@@ -320,7 +343,6 @@
 %limit_build -m 2600
 
 gn_system_libraries=(
-    ffmpeg
     flac
     fontconfig
     freetype
@@ -340,6 +362,10 @@
     zlib
 )
 
+%if 0%{?suse_version}
+gn_system_libraries+=( ffmpeg )
+%endif
+
 %if %{with system_vpx}
 gn_system_libraries+=( libvpx )
 %endif
@@ -437,6 +463,10 @@
 pushd out/Release
 rsync -av *.bin *.pak *.so resources %{buildroot}%{_libdir}/electron/
 
+%if 0%{?fedora_version}
+rm -f %{buildroot}%{_libdir}/electron/libffmpeg*
+%endif
+
 rsync -av --exclude '*.pak.info' locales %{buildroot}%{_libdir}/electron/
 
 %if %{with swiftshader}

++++++ create_tarball.sh ++++++
--- /var/tmp/diff_new_pack.9jdIZG/_old  2021-07-16 00:03:04.748418908 +0200
+++ /var/tmp/diff_new_pack.9jdIZG/_new  2021-07-16 00:03:04.748418908 +0200
@@ -210,6 +210,7 @@
     third_party/emoji-segmenter
     third_party/farmhash
     third_party/fdlibm
+    third_party/ffmpeg
     third_party/fft2d
     third_party/flatbuffers
     third_party/fusejs/dist

++++++ electron-13-openh264-format-security.patch ++++++
Index: electron-13.1.6/third_party/openh264/BUILD.gn
===================================================================
--- electron-13.1.6.orig/third_party/openh264/BUILD.gn  2021-07-09 
09:23:47.767202563 +0200
+++ electron-13.1.6/third_party/openh264/BUILD.gn       2021-07-12 
08:06:11.340219647 +0200
@@ -24,8 +24,6 @@ config("config") {
   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
   if (!is_win || is_clang) {
     cflags += [
-      "-Wno-format",
-      "-Wno-format-security",
       "-Wno-header-hygiene",
       "-Wno-unused-function",
       "-Wno-unused-value",
++++++ electron-13.1.4.tar.xz -> electron-13.1.6.tar.xz ++++++
/work/SRC/openSUSE:Factory/nodejs-electron/electron-13.1.4.tar.xz 
/work/SRC/openSUSE:Factory/.nodejs-electron.new.2625/electron-13.1.6.tar.xz 
differ: char 15, line 1

Reply via email to