diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template index bd013d3ef71..da331ac0d25 100644 --- a/srcpkgs/electron10/template +++ b/srcpkgs/electron10/template @@ -1,6 +1,6 @@ # Template file for 'electron10' pkgname=electron10 -version=10.1.3 +version=10.1.5 _nodever=12.16.3 _chromiumver=85.0.4183.121 revision=1 @@ -30,7 +30,7 @@ homepage="https://electronjs.org" distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz" -checksum="b50e2b86abb3641a664a87d92cb09835e6d0ea5b81c4d3e031f041c75ea74158 +checksum="ae73d71f3f7caa732ad1138d7f6ae0c7a38692880173e82f81244d66ac1cdb31 e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28 dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1" @@ -40,7 +40,6 @@ esac no_generic_pkgconfig_link=yes lib32disabled=yes -nodebug=yes nopie=yes # contains tools that are not PIE, enables PIE itself build_options="pulseaudio sndio clang" @@ -210,6 +209,8 @@ do_configure() { # the build system will set march for use, adding it to cflags will break builds export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} ) export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} ) + export CFLAGS=${CFLAGS/-g/} + export CXXFLAGS=${CXXFLAGS/-g/} local conf=() cd third_party/electron_node if [ "$CROSS_BUILD" ]; then @@ -273,6 +274,11 @@ do_configure() { 'use_sndio=true' ) fi + if [ -n "$XBPS_DEBUG_PKGS" ]; then + conf+=('symbol_level=1') + else + conf+=('symbol_level=0') + fi conf+=( 'enable_hangout_services_extension=true' 'enable_nacl_nonsfi=false' @@ -289,7 +295,6 @@ do_configure() { 'is_desktop_linux=true' 'linux_use_bundled_binutils=false' 'proprietary_codecs=true' - 'symbol_level=0' 'treat_warnings_as_errors=false' 'use_allocator_shim=false' 'use_allocator="none"' @@ -319,6 +324,8 @@ do_configure() { do_build() { export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} ) export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} ) + export CFLAGS=${CFLAGS/-g/} + export CXXFLAGS=${CXXFLAGS/-g/} if [ "$build_option_clang" ]; then export CC=clang export CXX=clang++