apply custom patches to minizip and Qt

Author: kambala-decapitator

.github/workflows/rebuildDependencies.yml

@@ -17,35 +17,35 @@ jobs:
             os: macos-14
             before_install: macos.sh
             conan_profile: macos-intel
-            conan_system_libs: '*'
-          # - platform: mac-arm
-          #   os: macos-14
-          #   before_install: macos.sh
-          #   conan_profile: macos-arm
-          #   conan_system_libs: '*'
-          # - platform: ios
-          #   os: macos-14
-          #   before_install: macos.sh
-          #   conan_profile: ios-arm64
-          #   conan_system_libs: '*'
-          # - platform: android-armeabi-v7a
-          #   os: ubuntu-24.04
-          #   before_install: android.sh
-          #   conan_profile: android-32-ndk
-          #   conan_system_libs: zlib
-          # - platform: android-arm64-v8a
-          #   os: ubuntu-24.04
-          #   conan_profile: android-64-ndk
-          #   conan_system_libs: zlib
-          # - platform: windows-x64
-          #   os: windows-2022
-          #   # before_install: msvc.sh
-          #   conan_profile: msvc-x64
-          #   conan_options: -o target_pre_windows10=True -c tools.cmake.cmaketoolchain:generator=
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: mac-arm
+            os: macos-14
+            before_install: macos.sh
+            conan_profile: macos-arm
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: ios
+            os: macos-14
+            before_install: macos.sh
+            conan_profile: ios-arm64
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: android-armeabi-v7a
+            os: ubuntu-24.04
+            before_install: android.sh
+            conan_profile: android-32-ndk
+            conan_system_libs: zlib
+          - platform: android-arm64-v8a
+            os: ubuntu-24.04
+            conan_profile: android-64-ndk
+            conan_system_libs: zlib
+          - platform: windows-x64
+            os: windows-2022
+            # before_install: msvc.sh
+            conan_profile: msvc-x64
+            conan_options: -o target_pre_windows10=True
     runs-on: ${{ matrix.os }}
 
     steps:
-    - name: Checkout repository
+    - name: Checkout VCMI
       uses: actions/checkout@v4
       # TODO
       with:
@@ -79,29 +79,82 @@ jobs:
           --single-branch
         cd "$systemLibsRepo"
         for p in ${{ matrix.conan_system_libs }} ; do
-          [ -d "$p" ] && conan create "$p" --user system
+          conan create "$p" --user system
+        done
+
+    steps:
+    - name: Checkout current
+      uses: actions/checkout@v4
+      with:
+        path: deps
+
+    - name: Build recipes with our patches
+      shell: bash
+      run: |
+        cciRepo='conan-center-index'
+        branchName='master'
+        recipePathMinizip='recipes/minizip/all'
+        recipePathQt='recipes/qt/5.x.x'
+        custom_patches_path="$(pwd)/deps/conan_patches"
+
+        git clone "https://github.com/conan-io/$cciRepo.git" \
+          --branch "$branchName" \
+          --no-checkout \
+          --depth 1 \
+          --no-tags \
+          --single-branch
+        cd "$cciRepo"
+        git sparse-checkout init
+        git sparse-checkout set "$recipePathMinizip" "$recipePathQt"
+        git switch "$branchName"
+
+        # versions must be synced with: conan_patches/<package>/conandata.yml
+        # if no custom patches are required for a package, it should be removed from here
+        for p in minizip/1.3.1 qt/5.15.16 ; do
+          IFS_OLD="$IFS"
+          read package version <<<"$p"
+          IFS="IFS_OLD"
+
+          if [[ $package == qt ]] ; then
+            packagePath="$recipePathQt"
+          else
+            packagePath="recipes/$package/all"
+          fi
+
+          conan create "$packagePath" \
+            --version="$version" \
+            --profile=CI/conan/${{ matrix.conan_profile }} \
+            --build=missing \
+            --test-folder='' \
+            --core-conf core.sources.patch:extra_path="$custom_patches_path"
         done
 
     # TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged
     - name: Build LuaJIT from PR changes
       shell: bash
       run: |
-        # TODO: sparse checkout
-        cciForkRepo='conan-center-index'
-        git clone "https://github.com/kambala-decapitator/$cciForkRepo.git" \
-          --branch package/luajit \
+        cciForkRepo='cci-fork'
+        branchName='package/luajit'
+        recipePath='recipes/luajit/all'
+
+        git clone "https://github.com/kambala-decapitator/conan-center-index.git" "$cciForkRepo" \
+          --branch "$branchName" \
+          --no-checkout \
           --depth 1 \
           --no-tags \
           --single-branch
-        conan create "$cciForkRepo/recipes/luajit/all" \
+        cd "$cciForkRepo"
+        git sparse-checkout init
+        git sparse-checkout set "$recipePath"
+        git switch "$branchName"
+
+        conan create "$recipePath" \
           --version=2.1.0-beta3 \
           --profile=CI/conan/${{ matrix.conan_profile }} \
-          --build=missing
-
-    # TODO:
-    # 1. download our patches
-    # 2. build patched packages with conan create
+          --build=missing \
+          --test-folder=''
 
+    # must run in the native platform shell: Qt doesn't build in bash on Windows
     - name: Generate conan profile
       run: |
         conan install . -of conan-generated -b missing -pr CI/conan/${{ matrix.conan_profile }} ${{ matrix.conan_options }}

conan_patches/minizip/conandata.yml

@@ -0,0 +1,3 @@
+patches:
+  "1.3.1":
+    - patch_file: "patches/android-pre-24.diff"

conan_patches/minizip/patches/android-pre-24.diff

@@ -0,0 +1,11 @@
+--- a/contrib/minizip/ioapi.h
++++ b/contrib/minizip/ioapi.h
+@@ -21,7 +21,7 @@
+ #ifndef _ZLIBIOAPI64_H
+ #define _ZLIBIOAPI64_H
+ 
+-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
++#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && !(defined(__ANDROID_API__) && __ANDROID_API__ < 24)
+ 
+   // Linux needs this to support file operation on files larger then 4+GB
+   // But might need better if/def to select just the platforms that needs them.