From e1616b98b46e2dc89423c8715f791b416e0a59cd Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@blender.org>
Date: Wed, 4 Dec 2024 15:45:20 +0100
Subject: [PATCH] Refactor rename script and add patch

---
 ...h => 2024-05-10_13-28-51_d4a41bc0eb.patch} |  0
 ...h => 2024-05-10_13-31-35_92388c8038.patch} |  0
 ...h => 2024-05-10_13-32-53_f9da0329b6.patch} |  0
 ...h => 2024-05-10_13-33-32_343b5d5701.patch} |  0
 ...h => 2024-05-10_13-56-36_180c3c85b7.patch} |  0
 ...h => 2024-05-10_13-58-05_839fac9573.patch} |  0
 ...h => 2024-05-10_14-00-36_699719b67f.patch} |  0
 ...h => 2024-05-10_14-02-04_ba9670f5af.patch} |  0
 ...h => 2024-05-10_14-04-02_be8fc25748.patch} |  0
 ...h => 2024-05-10_14-04-49_dc6069b433.patch} |  0
 ...h => 2024-05-10_14-05-47_33d5661e2c.patch} |  0
 ...h => 2024-05-10_14-07-25_59cbbb6dda.patch} |  0
 ...h => 2024-05-10_14-09-11_62e70696f4.patch} |  0
 ...h => 2024-05-10_14-58-32_4c24231b25.patch} |  0
 ...h => 2024-06-25_13-25-27_47b8beb7c8.patch} |  0
 ...h => 2024-06-27_17-46-19_57f1c317be.patch} |  0
 patches/2024-12-04_15-29-10_8523a34060.patch  | 29 +++++++++++++++++++
 patches/rename_files.sh                       |  7 +++--
 18 files changed, 34 insertions(+), 2 deletions(-)
 rename patches/{2024-05-10_13-28-51_2024-05-10_d4a41bc0eb.patch => 2024-05-10_13-28-51_d4a41bc0eb.patch} (100%)
 rename patches/{2024-05-10_13-31-35_2024-05-10_92388c8038.patch => 2024-05-10_13-31-35_92388c8038.patch} (100%)
 rename patches/{2024-05-10_13-32-53_2024-05-10_f9da0329b6.patch => 2024-05-10_13-32-53_f9da0329b6.patch} (100%)
 rename patches/{2024-05-10_13-33-32_2024-05-10_343b5d5701.patch => 2024-05-10_13-33-32_343b5d5701.patch} (100%)
 rename patches/{2024-05-10_13-56-36_2024-05-10_180c3c85b7.patch => 2024-05-10_13-56-36_180c3c85b7.patch} (100%)
 rename patches/{2024-05-10_13-58-05_2024-05-10_839fac9573.patch => 2024-05-10_13-58-05_839fac9573.patch} (100%)
 rename patches/{2024-05-10_14-00-36_2024-05-10_699719b67f.patch => 2024-05-10_14-00-36_699719b67f.patch} (100%)
 rename patches/{2024-05-10_14-02-04_2024-05-10_ba9670f5af.patch => 2024-05-10_14-02-04_ba9670f5af.patch} (100%)
 rename patches/{2024-05-10_14-04-02_2024-05-10_be8fc25748.patch => 2024-05-10_14-04-02_be8fc25748.patch} (100%)
 rename patches/{2024-05-10_14-04-49_2024-05-10_dc6069b433.patch => 2024-05-10_14-04-49_dc6069b433.patch} (100%)
 rename patches/{2024-05-10_14-05-47_2024-05-10_33d5661e2c.patch => 2024-05-10_14-05-47_33d5661e2c.patch} (100%)
 rename patches/{2024-05-10_14-07-25_2024-05-10_59cbbb6dda.patch => 2024-05-10_14-07-25_59cbbb6dda.patch} (100%)
 rename patches/{2024-05-10_14-09-11_2024-05-10_62e70696f4.patch => 2024-05-10_14-09-11_62e70696f4.patch} (100%)
 rename patches/{2024-05-10_14-58-32_2024-05-10_4c24231b25.patch => 2024-05-10_14-58-32_4c24231b25.patch} (100%)
 rename patches/{2024-06-25_13-25-27_2024-06-25_47b8beb7c8.patch => 2024-06-25_13-25-27_47b8beb7c8.patch} (100%)
 rename patches/{2024-06-27_17-46-19_2024-06-27_57f1c317be.patch => 2024-06-27_17-46-19_57f1c317be.patch} (100%)
 create mode 100644 patches/2024-12-04_15-29-10_8523a34060.patch

diff --git a/patches/2024-05-10_13-28-51_2024-05-10_d4a41bc0eb.patch b/patches/2024-05-10_13-28-51_d4a41bc0eb.patch
similarity index 100%
rename from patches/2024-05-10_13-28-51_2024-05-10_d4a41bc0eb.patch
rename to patches/2024-05-10_13-28-51_d4a41bc0eb.patch
diff --git a/patches/2024-05-10_13-31-35_2024-05-10_92388c8038.patch b/patches/2024-05-10_13-31-35_92388c8038.patch
similarity index 100%
rename from patches/2024-05-10_13-31-35_2024-05-10_92388c8038.patch
rename to patches/2024-05-10_13-31-35_92388c8038.patch
diff --git a/patches/2024-05-10_13-32-53_2024-05-10_f9da0329b6.patch b/patches/2024-05-10_13-32-53_f9da0329b6.patch
similarity index 100%
rename from patches/2024-05-10_13-32-53_2024-05-10_f9da0329b6.patch
rename to patches/2024-05-10_13-32-53_f9da0329b6.patch
diff --git a/patches/2024-05-10_13-33-32_2024-05-10_343b5d5701.patch b/patches/2024-05-10_13-33-32_343b5d5701.patch
similarity index 100%
rename from patches/2024-05-10_13-33-32_2024-05-10_343b5d5701.patch
rename to patches/2024-05-10_13-33-32_343b5d5701.patch
diff --git a/patches/2024-05-10_13-56-36_2024-05-10_180c3c85b7.patch b/patches/2024-05-10_13-56-36_180c3c85b7.patch
similarity index 100%
rename from patches/2024-05-10_13-56-36_2024-05-10_180c3c85b7.patch
rename to patches/2024-05-10_13-56-36_180c3c85b7.patch
diff --git a/patches/2024-05-10_13-58-05_2024-05-10_839fac9573.patch b/patches/2024-05-10_13-58-05_839fac9573.patch
similarity index 100%
rename from patches/2024-05-10_13-58-05_2024-05-10_839fac9573.patch
rename to patches/2024-05-10_13-58-05_839fac9573.patch
diff --git a/patches/2024-05-10_14-00-36_2024-05-10_699719b67f.patch b/patches/2024-05-10_14-00-36_699719b67f.patch
similarity index 100%
rename from patches/2024-05-10_14-00-36_2024-05-10_699719b67f.patch
rename to patches/2024-05-10_14-00-36_699719b67f.patch
diff --git a/patches/2024-05-10_14-02-04_2024-05-10_ba9670f5af.patch b/patches/2024-05-10_14-02-04_ba9670f5af.patch
similarity index 100%
rename from patches/2024-05-10_14-02-04_2024-05-10_ba9670f5af.patch
rename to patches/2024-05-10_14-02-04_ba9670f5af.patch
diff --git a/patches/2024-05-10_14-04-02_2024-05-10_be8fc25748.patch b/patches/2024-05-10_14-04-02_be8fc25748.patch
similarity index 100%
rename from patches/2024-05-10_14-04-02_2024-05-10_be8fc25748.patch
rename to patches/2024-05-10_14-04-02_be8fc25748.patch
diff --git a/patches/2024-05-10_14-04-49_2024-05-10_dc6069b433.patch b/patches/2024-05-10_14-04-49_dc6069b433.patch
similarity index 100%
rename from patches/2024-05-10_14-04-49_2024-05-10_dc6069b433.patch
rename to patches/2024-05-10_14-04-49_dc6069b433.patch
diff --git a/patches/2024-05-10_14-05-47_2024-05-10_33d5661e2c.patch b/patches/2024-05-10_14-05-47_33d5661e2c.patch
similarity index 100%
rename from patches/2024-05-10_14-05-47_2024-05-10_33d5661e2c.patch
rename to patches/2024-05-10_14-05-47_33d5661e2c.patch
diff --git a/patches/2024-05-10_14-07-25_2024-05-10_59cbbb6dda.patch b/patches/2024-05-10_14-07-25_59cbbb6dda.patch
similarity index 100%
rename from patches/2024-05-10_14-07-25_2024-05-10_59cbbb6dda.patch
rename to patches/2024-05-10_14-07-25_59cbbb6dda.patch
diff --git a/patches/2024-05-10_14-09-11_2024-05-10_62e70696f4.patch b/patches/2024-05-10_14-09-11_62e70696f4.patch
similarity index 100%
rename from patches/2024-05-10_14-09-11_2024-05-10_62e70696f4.patch
rename to patches/2024-05-10_14-09-11_62e70696f4.patch
diff --git a/patches/2024-05-10_14-58-32_2024-05-10_4c24231b25.patch b/patches/2024-05-10_14-58-32_4c24231b25.patch
similarity index 100%
rename from patches/2024-05-10_14-58-32_2024-05-10_4c24231b25.patch
rename to patches/2024-05-10_14-58-32_4c24231b25.patch
diff --git a/patches/2024-06-25_13-25-27_2024-06-25_47b8beb7c8.patch b/patches/2024-06-25_13-25-27_47b8beb7c8.patch
similarity index 100%
rename from patches/2024-06-25_13-25-27_2024-06-25_47b8beb7c8.patch
rename to patches/2024-06-25_13-25-27_47b8beb7c8.patch
diff --git a/patches/2024-06-27_17-46-19_2024-06-27_57f1c317be.patch b/patches/2024-06-27_17-46-19_57f1c317be.patch
similarity index 100%
rename from patches/2024-06-27_17-46-19_2024-06-27_57f1c317be.patch
rename to patches/2024-06-27_17-46-19_57f1c317be.patch
diff --git a/patches/2024-12-04_15-29-10_8523a34060.patch b/patches/2024-12-04_15-29-10_8523a34060.patch
new file mode 100644
index 0000000000000..4ef4052961767
--- /dev/null
+++ b/patches/2024-12-04_15-29-10_8523a34060.patch
@@ -0,0 +1,29 @@
+From 8523a340604c296e42fb46496885ff522dedae5d Mon Sep 17 00:00:00 2001
+From: Bart van der Braak <bart@blender.org>
+Date: Wed, 4 Dec 2024 15:29:10 +0100
+Subject: [PATCH] BLENDER: Add Pandoc as external renderer
+
+To be used for RestructuredText rendering.
+---
+ Dockerfile.rootless | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Dockerfile.rootless b/Dockerfile.rootless
+index 736cea5d05..777666542e 100644
+--- a/Dockerfile.rootless
++++ b/Dockerfile.rootless
+@@ -54,6 +54,11 @@ RUN apk --no-cache add \
+     gnupg \
+     && rm -rf /var/cache/apk/*
+ 
++# External renderers
++RUN apk --no-cache add \
++    pandoc \
++    && rm -rf /var/cache/apk/*
++
+ RUN addgroup \
+     -S -g 1000 \
+     git && \
+-- 
+2.45.2
+
diff --git a/patches/rename_files.sh b/patches/rename_files.sh
index 861a1af5209b1..14bab22a51d28 100755
--- a/patches/rename_files.sh
+++ b/patches/rename_files.sh
@@ -2,14 +2,17 @@
 
 # Iterate through all `.patch` files in the current directory
 for file in *.patch; do
+  # Extract the commit ID from the first line (starts with "From")
+  commit_id=$(grep -m 1 "^From " "$file" | awk '{print $2}' | cut -c 1-10)
+
   # Extract the full timestamp from the "Date" line
   commit_timestamp=$(grep -m 1 "^Date:" "$file" | sed -E 's/Date: [A-Za-z]+, (.*)/\1/')
 
   # Convert the extracted timestamp to ISO 8601 format (YYYY-MM-DD_HH-MM-SS)
   iso_timestamp=$(date -d "$commit_timestamp" +"%Y-%m-%d_%H-%M-%S")
 
-  # Prepend the formatted timestamp to the filename
-  new_name="${iso_timestamp}_${file}"
+  # Prepend the formatted timestamp and commit ID to the filename
+  new_name="${iso_timestamp}_${commit_id}.patch"
 
   # Rename the file
   mv "$file" "$new_name"