Keep required meson version low (#29)

* Keep required meson version low
* Downgrade libjpeg-turbo
* Downgrade to 2.1.5.1
* Version 1.5.7.1

.github/workflows/main.yml

@@ -109,8 +109,7 @@ jobs:
           sudo add-apt-repository -n ppa:talisein/outcome
           sudo add-apt-repository -n ppa:talisein/magic-enum
           sudo apt-get update
-          sudo apt-get install ninja-build libhowardhinnant-date-dev liboutcome-dev libboost-ext-ut-dev libctre-dev libmagicenum-dev jq findutils
-          sudo pip3 install meson
+          sudo apt-get install ninja-build libhowardhinnant-date-dev liboutcome-dev libboost-ext-ut-dev libctre-dev libmagicenum-dev jq findutils meson
 
       - if: ${{ matrix.flavor == 'mac' }}
         name: Install deps mac
@@ -248,6 +247,7 @@ jobs:
 
       - if: ${{ matrix.flavor == 'ubuntu' && matrix.compiler == 'gcc' && startsWith(github.ref, 'refs/tags/v') }}
         name: Publish PPA Snapshot
+        continue-on-error: true
         env:
           LD_PRELOAD:
           GPG_PRIVATE_KEY: ${{ secrets.PPA_PGP_SECRET_KEY }}

debian/changelog

@@ -1,3 +1,9 @@
+dregarnuhr (1.5.7.1-1) unstable; urgency=medium
+
+  * Lower meson version requirement
+
+ -- Andrew Potter <[email protected]>  Wed, 15 Nov 2023 18:41:17 -0800
+
 dregarnuhr (1.5.7.0-1) unstable; urgency=medium
 
   * P5V7

dregarnuhr.spec

@@ -1,5 +1,5 @@
 Name:           dregarnuhr
-Version:        1.5.7.0
+Version:        1.5.7.1
 Release:        1
 Summary:        Rearrange Ascendence of a Bookworm epubs into Chronological Order
 
@@ -51,6 +51,9 @@ Rearrange Ascendence of a Bookworm epubs into Chronological Order
 
 
 %changelog
+* Thu Nov 16 2023 Andrew Potter <[email protected]> - 1.5.7.1-1
+- Lower meson version requirement
+
 * Thu Nov 16 2023 Andrew Potter <[email protected]> - 1.5.7.0-1
 - P5V7
 - --slim doesn't include TOBooks Manga anymore

meson.build

@@ -1,6 +1,6 @@
 project('dregarnuhr', ['c', 'cpp'],
         license : 'GPLv3+',
-        version : '1.5.7.0',
+        version : '1.5.7.1',
         default_options : ['c_std=gnu17',
                            'buildtype=release',
                            'default_library=static',

subprojects/libjpeg-turbo.wrap

@@ -1,13 +1,13 @@
 [wrap-file]
-directory = libjpeg-turbo-3.0.1
-source_url = https://sourceforge.net/projects/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz
-source_filename = libjpeg-turbo-3.0.1.tar.gz
-source_hash = 22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75
-patch_filename = libjpeg-turbo_3.0.1-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_3.0.1-1/get_patch
-patch_hash = fe56c562a4be3d699f3948fb0ae9452445b94795540a7f6bd58e6fd2fd5b53cd
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libjpeg-turbo_3.0.1-1/libjpeg-turbo-3.0.1.tar.gz
-wrapdb_version = 3.0.1-1
+directory = libjpeg-turbo-2.1.5.1
+source_url = https://sourceforge.net/projects/libjpeg-turbo/files/2.1.5.1/libjpeg-turbo-2.1.5.1.tar.gz
+source_filename = libjpeg-turbo-2.1.5.1.tar.gz
+source_hash = 2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+patch_filename = libjpeg-turbo_2.1.5.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_2.1.5.1-1/get_patch
+patch_hash = 7daf69a0795f0fe3aecf2d1bcde78266d7a60a36df8573fe3b442e0adcbb4ca0
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libjpeg-turbo_2.1.5.1-1/libjpeg-turbo-2.1.5.1.tar.gz
+wrapdb_version = 2.1.5.1-1
 
 [provide]
-dependency_names = libjpeg, libturbojpeg
+dependency_names = libjpeg