Browse Source

follow upstream PKGBUILD more closely

Noah Vogt 1 năm trước cách đây
mục cha
commit
a424a5a24f
1 tập tin đã thay đổi với 10 bổ sung11 xóa
  1. 10 11
      PKGBUILD

+ 10 - 11
PKGBUILD

@@ -1,7 +1,12 @@
 # Maintainer: Noah Vogt (noahvogt) <noah@noahvogt.com>
 # Maintainer: Bruno Pagani <archange@archlinux.org>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Pascal Ernster <archlinux@hardfalcon.net>
+# Contributor: loqs <bugs-archlinux@entropy-collector.net>
+
+# https://releases.electronjs.org/
+# https://github.com/stha09/chromium-patches/releases
 
-# Remember to handle https://bugs.archlinux.org/task/74324 on major upgrades
 _use_suffix=1
 pkgver=25.6.0
 _chromiumver=114.0.5735.134
@@ -12,6 +17,7 @@ _major_ver=${pkgver%%.*}
 if [[ ${_use_suffix} != 0 ]]; then
   pkgname="electron${_major_ver}-xdg"
 else
+  pkgbase="electron${_major_ver}-xdg"
   pkgname=electron-xdg
 fi
 # shellcheck disable=SC2034
@@ -125,11 +131,11 @@ prepare() {
 
   sed --in-place "/'chromium_version':/{n;s/'[0-9.]\+',/'${_chromiumver}',/}" "${srcdir}/electron/DEPS"
 
-  cat >.gclient <<EOF
+cat >.gclient <<EOF
 solutions = [
   {
     "name": "src/electron",
-    "url": "file://${srcdir}/electron@${_commit}",
+    "url": "file://${srcdir}/electron@v$pkgver",
     "deps_file": "DEPS",
     "managed": False,
     "custom_deps": {
@@ -231,18 +237,11 @@ build() {
   export AR=ar
   export NM=nm
 
-  # https://github.com/webpack/webpack/issues/14532
-  export NODE_OPTIONS=--openssl-legacy-provider
-
   # 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'
-
   # Let Chromium set its own symbol level
   CFLAGS=${CFLAGS/-g }
   CXXFLAGS=${CXXFLAGS/-g }
@@ -267,7 +266,7 @@ build() {
 
   cd src || exit
   export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools"
-   GN_EXTRA_ARGS='
+  GN_EXTRA_ARGS='
     custom_toolchain = "//build/toolchain/linux/unbundle:default"
     host_toolchain = "//build/toolchain/linux/unbundle:default"
     clang_base_path = "/usr"