upgpkg: telegram-desktop-dev 4.11.6-1

- Version bump.
- Small improvements to the Python script for generating the submodules
  lines.

3 files changed, 37 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 653a3c3fa603..cdca2d0b52ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-dev
 	pkgdesc = Official Telegram Desktop client - development release
-	pkgver = 4.11.3
+	pkgver = 4.11.6
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -51,7 +51,7 @@ pkgbase = telegram-desktop-dev
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop#tag=v4.11.3
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop#tag=v4.11.6
 	source = submodule_GSL::git+https://github.com/desktop-app/GSL.git
 	source = submodule_Implib.so::git+https://github.com/yugr/Implib.so.git
 	source = submodule_QR-Code-generator::git+https://github.com/nayuki/QR-Code-generator
diff --git a/PKGBUILD b/PKGBUILD
index 2f0ee6ac11cf..e293bcdd7864 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 # You can pass parameters to `ninja` via MAKEFLAGS
 
 pkgname=telegram-desktop-dev
-pkgver=4.11.3
+pkgver=4.11.6
 pkgrel=1
 pkgdesc='Official Telegram Desktop client - development release'
 arch=(x86_64)
@@ -162,6 +162,14 @@ prepare() {
     git -C "$srcdir/tdesktop" config src.cmake.url "$srcdir/submodule_cmake_helpers"
     git -C "$srcdir/tdesktop" submodule update
 
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" submodule init
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" config src.cmake.url "$srcdir/submodule_cmake_helpers"
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" submodule update
+
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" submodule init
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" config src.doc/gh-pages.url "$srcdir/submodule_range-v3"
+    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" submodule update
+
     git -C "$srcdir/tdesktop/cmake" submodule init
     git -C "$srcdir/tdesktop/cmake" config src.external/Implib.so.url "$srcdir/submodule_Implib.so"
     git -C "$srcdir/tdesktop/cmake" config src.external/glib/cppgir.url "$srcdir/submodule_cppgir"
@@ -171,14 +179,6 @@ prepare() {
     git -C "$srcdir/tdesktop/cmake/external/glib/cppgir" config src.expected-lite.url "$srcdir/submodule_expected-lite"
     git -C "$srcdir/tdesktop/cmake/external/glib/cppgir" submodule update
 
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" submodule init
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" config src.doc/gh-pages.url "$srcdir/submodule_range-v3"
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/range-v3" submodule update
-
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" submodule init
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" config src.cmake.url "$srcdir/submodule_cmake_helpers"
-    git -C "$srcdir/tdesktop/Telegram/ThirdParty/libtgvoip" submodule update
-
     # Normal preparation here
     cd "$srcdir/tdesktop"
 
diff --git a/generate_submodules_lines.py b/generate_submodules_lines.py
index 86f589bc4a87..6ccc59b80d6b 100755
--- a/generate_submodules_lines.py
+++ b/generate_submodules_lines.py
@@ -11,7 +11,7 @@ from typing import Tuple
 
 def parse_versions() -> Tuple[str, str]:
     """Return the old and the new version of Telegram Desktop, in this order."""
-    with open("PKGBUILD") as PKGBUILD, open(".SRCINFO") as SRCINFO:
+    with open("PKGBUILD", encoding="utf-8") as PKGBUILD, open(".SRCINFO", encoding="utf-8") as SRCINFO:
         old_content = SRCINFO.readlines()
         new_content = PKGBUILD.readlines()
 
@@ -24,10 +24,13 @@ def parse_versions() -> Tuple[str, str]:
 
     return fetch_value(old_content), fetch_value(new_content)
 
+def make_temp_folder() -> str:
+    """Utility function for creating a temporary folder and returning its path."""
+    return tempfile.mkdtemp()
 
-def git_clone_repo(old_version: str, new_version: str) -> str:
-    """Fetch the Git repository with the proper parameters and provides the folder name."""
-    temp_git_folder = tempfile.mkdtemp()
+
+def git_clone_repo(old_version: str, new_version: str, git_folder: str):
+    """Fetch the Git repository with the proper parameters."""
 
     git_clone_command = [
         "git",
@@ -38,7 +41,7 @@ def git_clone_repo(old_version: str, new_version: str) -> str:
         f"--shallow-since=v{old_version}",
         f"--branch=v{new_version}",
         "https://github.com/telegramdesktop/tdesktop",
-        temp_git_folder,
+        git_folder,
     ]
 
     cpus = cpu_count()
@@ -48,7 +51,6 @@ def git_clone_repo(old_version: str, new_version: str) -> str:
     print(f"Runnng: {' '.join(git_clone_command)}")
 
     run_command(git_clone_command, check=True)
-    return temp_git_folder
 
 
 def fetch_submodule_data(git_repository: str, base_repo: str):
@@ -78,6 +80,7 @@ def fetch_submodule_data(git_repository: str, base_repo: str):
                 f'printf "$name{md_sep}" ; git remote get-url origin',
             ],
             capture_output=True,
+            check=True
         )
         git_submodules_metadata = git_remotes_command.stdout.decode().splitlines()
 
@@ -128,23 +131,29 @@ def fetch_submodule_data(git_repository: str, base_repo: str):
 
 def generate_metadata():
     """Main method, doing the hard work."""
-    old_version, new_version = parse_versions()
+    git_repo_path = make_temp_folder()
+
+    try:
+        old_version, new_version = parse_versions()
 
-    git_repo_path = git_clone_repo(old_version, new_version)
+        git_clone_repo(old_version, new_version, git_repo_path)
 
-    sources, commands = fetch_submodule_data(git_repo_path, "$srcdir/tdesktop")
+        sources, commands = fetch_submodule_data(git_repo_path, "$srcdir/tdesktop")
 
-    indent = " " * 4
+        indent = " " * 4
 
-    print("# Sources:")
-    for k, v in sorted(sources.items()):
-        print(indent + f'"{k}::git+{v}"')
+        print("# Sources:")
+        for k, v in sorted(sources.items()):
+            print(indent + f'"{k}::git+{v}"')
 
-    print("# Commands in prepare:")
-    for l in commands:
-        print(indent + l if l.strip() else "")
+        print("# Commands in prepare:")
+        for l in commands:
+            print(indent + l if l.strip() else "")
 
-    shutil.rmtree(git_repo_path)
+    except KeyboardInterrupt:
+        print("Keyboard interrupt received, stopping our work...")
+    finally:
+        shutil.rmtree(git_repo_path)
 
 
 if __name__ == "__main__":