bug#74133: Wrong files attached

[Nikolaos Chatzikonstantinou <nchatz314@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

Is there ever a time where gpg does not embarass me?

Re-attaching the correct files...

Regards,
Nikolaos Chatzikonstantinou

[-- Attachment #2: 0002-download-zst-msys2-sources-before-gzip.patch.asc --]
[-- Type: text/plain, Size: 228 bytes --]

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQT+qiF+WQ7fQkkAb/UJFDAFinzxjQUCZyNkpgAKCRAJFDAFinzx
jef9AP9MCzzUzy0yajHU2BAA2K2kgxP8wX5PMrNEILIaqicXqQD/Q4epjVEpCD4a
AX2V1/pFAVrVJaSkH2qx1gBieM/k3gQ=
=759y
-----END PGP SIGNATURE-----

[-- Attachment #3: 0001-add-docstrings.patch --]
[-- Type: text/x-patch, Size: 1998 bytes --]

From 62a534d527b79a5ff62b73940e8f604f8db1f325 Mon Sep 17 00:00:00 2001
From: Nikolaos Chatzikonstantinou <nchatz314@gmail.com>
Date: Thu, 31 Oct 2024 06:37:31 -0400
Subject: [PATCH 1/2] add docstrings

* admin/nt/dist-build/build-dep-zips.py: Change some top-level comments
to docstrings.
---
 admin/nt/dist-build/build-dep-zips.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 0b1cc4d8695..bb0ff7e32bf 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -62,8 +62,8 @@ def check_output_maybe(*args,**kwargs):
     else:
         return check_output(*args,**kwargs)
 
-## DLL Capture
 def gather_deps():
+    """DLL Capture"""
 
     os.mkdir("x86_64")
     os.chdir("x86_64")
@@ -78,13 +78,13 @@ def gather_deps():
                        shell=True)
     os.chdir("../")
 
-## Return all Emacs dependencies
 def full_dll_dependency():
+    """Return all Emacs dependencies"""
     deps = [dll_dependency(dep) for dep in DLL_REQ]
     return set(sum(deps, []) + DLL_REQ)
 
-## Dependencies for a given DLL
 def dll_dependency(dll):
+    """Dependencies for a given DLL"""
     output = check_output(["/mingw64/bin/ntldd", "--recursive",
                            "/mingw64/bin/{}*.dll".format(dll)]).decode("utf-8")
     ## munge output
@@ -141,8 +141,8 @@ def immediate_deps(pkgs):
     return dependencies
 
 
-## Extract all the msys2 packages that are dependencies of our direct dependencies
 def extract_deps():
+    """Extract all the msys2 packages that are dependencies of our direct dependencies"""
 
     print( "Extracting deps" )
 
@@ -178,8 +178,8 @@ def download_source(tarball):
                     "{}".format(tarball))
 
 
-## Fetch all the source code
 def gather_source(deps):
+    """Fetch all the source code"""
 
     if not os.path.exists("emacs-src-cache"):
         os.mkdir("emacs-src-cache")
-- 
2.39.5


[-- Attachment #4: 0002-download-zst-msys2-sources-before-gzip.patch --]
[-- Type: text/x-patch, Size: 1555 bytes --]

From f20e34d8f68f29eea2ba7a0bf67f042aeb67d24c Mon Sep 17 00:00:00 2001
From: Nikolaos Chatzikonstantinou <nchatz314@gmail.com>
Date: Thu, 31 Oct 2024 06:45:53 -0400
Subject: [PATCH 2/2] download zst msys2 sources before gzip

admin/nt/dist-build/build-dep-zips.py (gather_source): The previous
version assumed that all source tarballs were gzip compressed. This is
not always the case, as some are only available in zst. We prioritize
zst compression and only if not available we attempt gzip.
---
 admin/nt/dist-build/build-dep-zips.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index bb0ff7e32bf..022cebeedaf 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -23,7 +23,7 @@
 import functools
 import operator
 
-from subprocess import check_output
+from subprocess import check_output, CalledProcessError
 
 ## Constants
 EMACS_MAJOR_VERSION="28"
@@ -206,9 +206,13 @@ def gather_source(deps):
         ## Switch names if necessary
         pkg_name = MUNGE_SRC_PKGS.get(pkg_name,pkg_name)
 
+        tarzst = "{}-{}.src.tar.zst".format(pkg_name,pkg_version)
         tarball = "{}-{}.src.tar.gz".format(pkg_name,pkg_version)
 
-        download_source(tarball)
+        try:
+            download_source(tarzst)
+        except CalledProcessError:
+            download_source(tarball)
 
     print("Zipping")
     check_output_maybe("zip -9 ../emacs-{}-{}deps-mingw-w64-src.zip *"
-- 
2.39.5


[-- Attachment #5: 0001-add-docstrings.patch.asc --]
[-- Type: text/plain, Size: 228 bytes --]

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQT+qiF+WQ7fQkkAb/UJFDAFinzxjQUCZyNkowAKCRAJFDAFinzx
jUWuAP9SFHzmmr7C2hr+OOtUGIlf4gqWFjjE55VklLNcWnwWWgEA0HoMm22xRMgi
sa2dYlCYnm7HAZXyZRy/BuhISK8dYQQ=
=lKo6
-----END PGP SIGNATURE-----