Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron34
Commits:
f1d07a03 by kxxt at 2025-04-04T11:41:10+03:00
Pin repos with changed url by hash(url)
This makes more sense than having a clone for it for every electron
version.
pthreadpool changed from external/github.com/Maratyszcza/pthreadpool.git
to external/github.com/google/pthreadpool.git
- - - - -
c5aaff9b by Caleb Maclennan at 2025-04-04T13:12:20+03:00
upgpkg: 34.5.0-2: Rebuild without http-parser
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- makepkg-source-roller.py
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = electron34
pkgdesc = Build cross platform desktop apps with web technologies
pkgver = 34.5.0
- pkgrel = 1
+ pkgrel = 2
url = https://electronjs.org
arch = x86_64
license = MIT
@@ -185,7 +185,7 @@ pkgbase = electron34
source =
chromium-mirror_third_party_pdfium::git+https://pdfium.googlesource.com/pdfium.git#commit=84a8011ec69d0e2de271c05be7d62979608040d9
source =
chromium-mirror_third_party_perfetto::git+https://android.googlesource.com/platform/external/perfetto.git#commit=ea011a2c2d3aecdc4f1674887e107a56d2905edd
source =
chromium-mirror_third_party_protobuf-javascript_src::git+https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript.git#commit=e34549db516f8712f678fcd4bc411613b5cc5295
- source =
chromium-mirror_third_party_pthreadpool_src::git+https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git#commit=560c60d342a76076f0557a3946924c6478470044
+ source =
chromium-mirror_third_party_pthreadpool_src::git+https://chromium.googlesource.com/external/github.com/google/pthreadpool.git#commit=560c60d342a76076f0557a3946924c6478470044
source =
chromium-mirror_third_party_pyelftools::git+https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git#commit=19b3e610c86fcadb837d252c794cb5e8008826ae
source =
chromium-mirror_third_party_quic_trace_src::git+https://chromium.googlesource.com/external/github.com/google/quic-trace.git#commit=413da873d93a03d3662f24b881ea459a79f9c589
source =
chromium-mirror_third_party_pywebsocket3_src::git+https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git#commit=50602a14f1b6da17e0b619833a13addc6ea78bc2
@@ -258,7 +258,7 @@ pkgbase = electron34
sha256sums =
4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae
sha256sums =
55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e
sha256sums =
ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f
- sha256sums =
2c8cd28cee0e1df1862e801794f210d2b7cac652f943cf94f43c2abe26f2a2f4
+ sha256sums =
b7d75c9d9c176db2de7cb162b4e6106af28605a0374a20c20104d5e4c6b0030c
sha256sums =
88de07ecb31f08ccbc445f21093dd479eede1f7ffc783b35499cd3099b39cf49
sha256sums =
0b7a546ee6913c49519c10c293ac530ff381641a8a465fa2e184d6dbe0fb784d
sha256sums =
1f777ab427990d47a4e69184970dc0c868fc383b9d52b80bf8d1a36c4995d3e1
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgver=34.5.0
_gcc_patches=132
-pkgrel=1
+pkgrel=2
_major_ver=${pkgver%%.*}
pkgname="electron${_major_ver}"
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -176,7 +176,7 @@
source=("git+https://github.com/electron/electron.git#tag=v$pkgver";
chromium-mirror_third_party_pdfium::git+https://pdfium.googlesource.com/pdfium.git#commit=84a8011ec69d0e2de271c05be7d62979608040d9
chromium-mirror_third_party_perfetto::git+https://android.googlesource.com/platform/external/perfetto.git#commit=ea011a2c2d3aecdc4f1674887e107a56d2905edd
chromium-mirror_third_party_protobuf-javascript_src::git+https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript.git#commit=e34549db516f8712f678fcd4bc411613b5cc5295
-
chromium-mirror_third_party_pthreadpool_src::git+https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git#commit=560c60d342a76076f0557a3946924c6478470044
+
chromium-mirror_third_party_pthreadpool_src::git+https://chromium.googlesource.com/external/github.com/google/pthreadpool.git#commit=560c60d342a76076f0557a3946924c6478470044
chromium-mirror_third_party_pyelftools::git+https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git#commit=19b3e610c86fcadb837d252c794cb5e8008826ae
chromium-mirror_third_party_quic_trace_src::git+https://chromium.googlesource.com/external/github.com/google/quic-trace.git#commit=413da873d93a03d3662f24b881ea459a79f9c589
chromium-mirror_third_party_pywebsocket3_src::git+https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git#commit=50602a14f1b6da17e0b619833a13addc6ea78bc2
@@ -251,7 +251,7 @@
sha256sums=('52f0f3bf42f15a813b76de9120b6f7d9ea819e5a09211667bd9ffdd0b467bc34'
'4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
'55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e'
'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f'
- '2c8cd28cee0e1df1862e801794f210d2b7cac652f943cf94f43c2abe26f2a2f4'
+ 'b7d75c9d9c176db2de7cb162b4e6106af28605a0374a20c20104d5e4c6b0030c'
'88de07ecb31f08ccbc445f21093dd479eede1f7ffc783b35499cd3099b39cf49'
'0b7a546ee6913c49519c10c293ac530ff381641a8a465fa2e184d6dbe0fb784d'
'1f777ab427990d47a4e69184970dc0c868fc383b9d52b80bf8d1a36c4995d3e1'
=====================================
makepkg-source-roller.py
=====================================
@@ -3,6 +3,7 @@ from importlib.util import spec_from_loader, module_from_spec
from importlib.machinery import SourceFileLoader
from tempfile import NamedTemporaryFile
from heapq import heappush
+from hashlib import sha1
import sys
import requests
import base64
@@ -191,6 +192,7 @@ def parse_deps(path, prefix="", is_src=False, vars=None,
reverse_map=None):
repos_with_changed_url = {
"https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git";,
"https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf.git";,
+
"https://chromium.googlesource.com/external/github.com/google/pthreadpool.git";
}
@@ -208,7 +210,7 @@ def get_source_path(path, url, pkgname, reverse_map):
result = re.sub("^src", "chromium-mirror", flattened)
if url in repos_with_changed_url:
# To make makepkg happy when using SRCDEST
- result += f"_{pkgname}"
+ result += f"_{sha1(url.encode('utf-8')).hexdigest()[:8]}"
return result, deduplicated
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron34/-/compare/b9600e66acf08eca056fb7aed9c558db9116ecb4...c5aaff9b47b34996fb477c31976132c1147b9470
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron34/-/compare/b9600e66acf08eca056fb7aed9c558db9116ecb4...c5aaff9b47b34996fb477c31976132c1147b9470
You're receiving this email because of your account on gitlab.archlinux.org.
