From 54a79681371d6c779ccf734f4d5390841baef49c Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Fri, 27 Dec 2024 17:40:39 +0000
Subject: [PATCH 1/4] Improve sorting in group_entries

---
 tools/changelog-helper.sh | 50 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/tools/changelog-helper.sh b/tools/changelog-helper.sh
index 0826c0f910..171532082b 100755
--- a/tools/changelog-helper.sh
+++ b/tools/changelog-helper.sh
@@ -39,6 +39,7 @@ export GH_REPO=jamulussoftware/jamulus
 
 PR_LIST_LIMIT=300
 TRANSLATION_ENTRY_TEXT="GUI: Translations have been updated:"
+TRANSLATION_ENTRY_TEXT2="Translations updated from Hosted Weblate"
 declare -A LANGS
 LANGS[de_DE]="German"
 LANGS[fr_FR]="French"
@@ -112,32 +113,35 @@ group_entries() {
     # Prepend a number to known categories in order to make their sorting position consistent:
     category_order=(
         "$TRANSLATION_ENTRY_TEXT"
-        "GUI"
-        "Accessibility"
-        "Client"
-        "Server"
-        "Recorder"
-        "Performance"
-        "CLI"
-        "Bug Fix"
-        "Windows"
-        "Installer"
-        "Linux"
-        "Mac"
-        "Android"
-        "iOS"
-        "Translation"
-        "Doc"
-        "Website"
-        "Github"
-        "Build"
-        "Autobuild"
-        "Code"
-        "Internal"
+        "$TRANSLATION_ENTRY_TEXT2"
+        "GUI:"
+        "Accessibility:"
+        "Client:"
+        "Client/Server:"
+        "Server:"
+        "Recorder:"
+        "Performance:"
+        "CLI:"
+        "Bug Fix:"
+        "Windows:"
+        "Installer:"
+        "Linux:"
+        "Mac:"
+        "Android:"
+        "iOS:"
+        "Translation:"
+        "Doc:"
+        "Website:"
+        "Github:"
+        "Build:"
+        "Autobuild:"
+        "Code:"
+        "Internal:"
     )
     local index=0
     for category in "${category_order[@]}"; do
-        changelog=$(sed -re 's/^(- '"${category}"')/'"${index}"' \1/' <<< "${changelog}")
+        # use | as delimiter, as category may contain /
+        changelog=$(sed -re 's|^(- '"${category}"')|'"${index}"' \1|' <<< "${changelog}")
         index=$((index + 1))
     done
 

From 92396ab5a651398f9e641c31a0a62d885fe5e773 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Mon, 30 Dec 2024 22:28:09 +0000
Subject: [PATCH 2/4] Preserve trailing newline in $changelog for correct
 sorting

---
 tools/changelog-helper.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/changelog-helper.sh b/tools/changelog-helper.sh
index 171532082b..92bb2c32fa 100755
--- a/tools/changelog-helper.sh
+++ b/tools/changelog-helper.sh
@@ -141,7 +141,8 @@ group_entries() {
     local index=0
     for category in "${category_order[@]}"; do
         # use | as delimiter, as category may contain /
-        changelog=$(sed -re 's|^(- '"${category}"')|'"${index}"' \1|' <<< "${changelog}")
+        # also re-add stripped newline from last line, for correct sorting
+        changelog=$(sed -re 's|^(- '"${category}"')|'"${index}"' \1|' <<< "${changelog}")$'\n'
         index=$((index + 1))
     done
 

From 48aa303f8258beced51c846473171e6a5176f962 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Mon, 30 Dec 2024 22:46:13 +0000
Subject: [PATCH 3/4] Keep bundled Qt updates together

---
 tools/changelog-helper.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/changelog-helper.sh b/tools/changelog-helper.sh
index 92bb2c32fa..bcfb96e0ce 100755
--- a/tools/changelog-helper.sh
+++ b/tools/changelog-helper.sh
@@ -40,6 +40,7 @@ export GH_REPO=jamulussoftware/jamulus
 PR_LIST_LIMIT=300
 TRANSLATION_ENTRY_TEXT="GUI: Translations have been updated:"
 TRANSLATION_ENTRY_TEXT2="Translations updated from Hosted Weblate"
+BUNDLED_QT_UPDATE_TEXT="Build: Updated bundled Qt6"
 declare -A LANGS
 LANGS[de_DE]="German"
 LANGS[fr_FR]="French"
@@ -133,6 +134,7 @@ group_entries() {
         "Doc:"
         "Website:"
         "Github:"
+        "$BUNDLED_QT_UPDATE_TEXT"
         "Build:"
         "Autobuild:"
         "Code:"

From 18e54a996e97bd589ed7e22493494cc9fd672742 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Tue, 31 Dec 2024 15:24:07 +0000
Subject: [PATCH 4/4] Add category for Dependencies

---
 tools/changelog-helper.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/changelog-helper.sh b/tools/changelog-helper.sh
index bcfb96e0ce..fb33dff773 100755
--- a/tools/changelog-helper.sh
+++ b/tools/changelog-helper.sh
@@ -130,6 +130,7 @@ group_entries() {
         "Mac:"
         "Android:"
         "iOS:"
+        "Dependencies:"
         "Translation:"
         "Doc:"
         "Website:"