Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / 
electron26


Commits:
13fb9e93 by Caleb Maclennan at 2024-03-04T18:34:29+03:00
upgpkg: 26.6.10-3: Sync packaging cleanups between 
electron{22,23,24,25,26,27,28,29}

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,8 +1,8 @@
 pkgbase = electron26
        pkgdesc = Build cross platform desktop apps with web technologies
        pkgver = 26.6.10
-       pkgrel = 2
-       url = https://electronjs.org/
+       pkgrel = 3
+       url = https://electronjs.org
        arch = x86_64
        license = MIT
        license = BSD-3-Clause
@@ -17,6 +17,7 @@ pkgbase = electron26
        makedepends = lld
        makedepends = llvm
        makedepends = ninja
+       makedepends = nodejs-lts-hydrogen
        makedepends = npm
        makedepends = patchutils
        makedepends = pciutils
@@ -254,7 +255,7 @@ pkgbase = electron26
        sha256sums = 
1808df5ba4d1e2f9efa07ac6b510bec866fa6d60e44505d82aea3f6072105a71
        sha256sums = 
893bc04c7fceba2f0a7195ed48551d55f066bbc530ec934c89c55768e6f3949c
        sha256sums = 
ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f
-       sha256sums = 
1eebf52f298ffb0a5525fa64b28039a6a0b5d83c07c3457262c88e9cc4bb0451
+       sha256sums = 
3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224
        sha256sums = SKIP
        sha256sums = SKIP
        sha256sums = SKIP


=====================================
PKGBUILD
=====================================
@@ -10,12 +10,12 @@
 
 pkgver=26.6.10
 _gcc_patches=116-patchset-2
-pkgrel=2
+pkgrel=3
 _major_ver=${pkgver%%.*}
 pkgname="electron${_major_ver}"
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=(x86_64)
-url='https://electronjs.org/'
+url='https://electronjs.org'
 license=(MIT BSD-3-Clause)
 depends=(c-ares
          gcc-libs # libgcc_s.so
@@ -37,6 +37,9 @@ makedepends=(clang
              lld
              llvm
              ninja
+             # Electron ships a vendored nodejs. Meanwhile the npm dependency 
pulls in nodejs whith is Arch's freshest version.
+             # Pinning the closest LTS here makes the build environment more 
consistent with the vendored copy.
+             nodejs-lts-hydrogen
              npm
              patchutils
              pciutils
@@ -448,7 +451,8 @@ prepare() {
 
   echo "Applying local patches..."
 
-  # Upstream fixes
+  ## Upstream fixes
+
   # Fix build with libxml2 2.12
   patch -Np1 -i ../libxml2-2.12.patch
 
@@ -532,11 +536,6 @@ build() {
     _flags+=('icu_use_data_file=false')
   fi
 
-  # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
-  CFLAGS+='   -Wno-builtin-macro-redefined'
-  CXXFLAGS+=' -Wno-builtin-macro-redefined'
-  CPPFLAGS+=' -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__='
-
   # Do not warn about unknown warning options
   CFLAGS+='   -Wno-unknown-warning-option'
   CXXFLAGS+=' -Wno-unknown-warning-option'



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/electron26/-/commit/13fb9e932e96ae5a33186c452a159de9ab072abf

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/electron26/-/commit/13fb9e932e96ae5a33186c452a159de9ab072abf
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to