From 200dead6c0443923b1715efde3a49d44829536eb Mon Sep 17 00:00:00 2001
From: Jason Christopher Cole <62337096+jasonccole@users.noreply.github.com>
Date: Thu, 27 Mar 2025 11:11:54 +0000
Subject: [PATCH 1/4] Update build_conquest_python.py (NO_JIRA)

Fix removal of extraneous packages
---
 build_conquest_python.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/build_conquest_python.py b/build_conquest_python.py
index fcbb382..ef6c41e 100755
--- a/build_conquest_python.py
+++ b/build_conquest_python.py
@@ -181,17 +181,15 @@ def source_archives(self):
     def extract_source_archives(self):
         super().extract_source_archives()
         # Remove packages we don't want to build
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'sqlite3.34.0')
-        shutil.rmtree(self.main_source_directory_path / 'pkgs' / 'tdbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcmysql1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcodbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcpostgres1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcsqlite3-1.1.2')
+        sp = Path(self.main_source_directory_path /'pkgs' )
+        
+        sqlite_path = sp.glob('sqlite*')
+        for file in sqlite_path:
+            shutil.rmtree(file)
+
+        tbc_path = sp.glob('tdbc*')
+        for file in tbc_pathh:
+            shutil.rmtree(file)
 
     @property
     def main_source_directory_path(self):

From fa3ed02536065beae73a884589ba03f4f15237bc Mon Sep 17 00:00:00 2001
From: Jason Christopher Cole <62337096+jasonccole@users.noreply.github.com>
Date: Thu, 27 Mar 2025 11:14:54 +0000
Subject: [PATCH 2/4] Update build_conquest_python.py

fix obviously wrong thing
---
 build_conquest_python.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_conquest_python.py b/build_conquest_python.py
index ef6c41e..0e5b16f 100755
--- a/build_conquest_python.py
+++ b/build_conquest_python.py
@@ -181,14 +181,14 @@ def source_archives(self):
     def extract_source_archives(self):
         super().extract_source_archives()
         # Remove packages we don't want to build
-        sp = Path(self.main_source_directory_path /'pkgs' )
+        sp = Path(self.main_source_directory_path /'pkgs')
         
         sqlite_path = sp.glob('sqlite*')
         for file in sqlite_path:
             shutil.rmtree(file)
 
         tbc_path = sp.glob('tdbc*')
-        for file in tbc_pathh:
+        for file in tbc_path:
             shutil.rmtree(file)
 
     @property

From 7183ec552ef092ce18c613de0483306e91125294 Mon Sep 17 00:00:00 2001
From: Jason Christopher Cole <62337096+jasonccole@users.noreply.github.com>
Date: Thu, 27 Mar 2025 11:19:06 +0000
Subject: [PATCH 3/4] Update build_conquest_python.py (NO_JIRA)

fix fussy review dog thing
---
 build_conquest_python.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_conquest_python.py b/build_conquest_python.py
index 0e5b16f..a8aade7 100755
--- a/build_conquest_python.py
+++ b/build_conquest_python.py
@@ -181,7 +181,7 @@ def source_archives(self):
     def extract_source_archives(self):
         super().extract_source_archives()
         # Remove packages we don't want to build
-        sp = Path(self.main_source_directory_path /'pkgs')
+        sp = Path(self.main_source_directory_path / 'pkgs')
         
         sqlite_path = sp.glob('sqlite*')
         for file in sqlite_path:

From 35c85932566060ce7ac5ef84cf6e934f6f587856 Mon Sep 17 00:00:00 2001
From: Jason Christopher Cole <62337096+jasonccole@users.noreply.github.com>
Date: Thu, 27 Mar 2025 12:09:29 +0000
Subject: [PATCH 4/4] Update jpeg package to the one now available (NO_JIRA)

---
 build_conquest_python.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_conquest_python.py b/build_conquest_python.py
index a8aade7..577f057 100755
--- a/build_conquest_python.py
+++ b/build_conquest_python.py
@@ -507,12 +507,12 @@ def arguments_to_configuration_script(self):
 
 class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixin, Package):
     name = 'jpeg'
-    version = '9e'
+    version = '9f'
 
     @property
     def source_archives(self):
         return {
-            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v9e.tar.gz'
+            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
         }