From 06e0bb19a3637d04f6c9ee0571ba4fb2f110c2c6 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sun, 28 Feb 2021 15:24:02 +0100
Subject: [PATCH] github: Use dependency install scripts in CI

---
 .github/workflows/build.yml | 44 ++++---------------------------------
 dist/ImHex-9999.ebuild      |  1 -
 dist/get_deps_debian.sh     | 29 ++++++++++++------------
 dist/get_deps_msys2.sh      |  3 +--
 dist/msys2/PKGBUILD         |  4 ++--
 5 files changed, 22 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd1e803e7..86e06486d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,21 +23,7 @@ jobs:
     - name: ⬇️ Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y \
-          build-essential       \
-          gcc-10                \
-          g++-10                \
-          pkg-config            \
-          cmake                 \
-          make                  \
-          libglfw3-dev          \
-          libglm-dev            \
-          libmagic-dev          \
-          libmbedtls-dev        \
-          libcapstone-dev       \
-          python3-dev           \
-          libfreetype-dev       \
-          libgtk-3-dev          \
+        sudo bash dist/get_deps_debian.sh
 
     - name: ✋ Build
       run: |
@@ -62,18 +48,10 @@ jobs:
 
   win:
     runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { msystem: MINGW64, arch: x86_64 }
-          #- { msystem: MINGW32, arch: i686   } # currently fail
-    name: 🟦 ${{ matrix.msystem }} · ${{ matrix.arch }}
+    name: 🟦 Windows MINGW64
     defaults:
       run:
         shell: msys2 {0}
-    env:
-      MINGW_INSTALLS: ${{ matrix.msystem }}
     steps:
 
     - name: 🧰 Checkout
@@ -84,22 +62,8 @@ jobs:
 
     - name: ⬇️ Install dependencies
       uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ matrix.msystem }}
-        update: true
-        install: >
-          mingw-w64-${{ matrix.arch }}-gcc
-          mingw-w64-${{ matrix.arch }}-cmake
-          mingw-w64-${{ matrix.arch }}-make
-          mingw-w64-${{ matrix.arch }}-capstone
-          mingw-w64-${{ matrix.arch }}-glfw
-          mingw-w64-${{ matrix.arch }}-glm
-          mingw-w64-${{ matrix.arch }}-file
-          mingw-w64-${{ matrix.arch }}-mbedtls
-          mingw-w64-${{ matrix.arch }}-polly
-          mingw-w64-${{ matrix.arch }}-python
-          mingw-w64-${{ matrix.arch }}-dlfcn
-          mingw-w64-${{ matrix.arch }}-freetype
+      run: |
+        bash dist/get_deps_msys2.sh
 
     - name: ✋ Build
       run: |
diff --git a/dist/ImHex-9999.ebuild b/dist/ImHex-9999.ebuild
index a878570d0..cbab12190 100644
--- a/dist/ImHex-9999.ebuild
+++ b/dist/ImHex-9999.ebuild
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
 		sys-apps/file
 		dev-libs/mbedtls
 		dev-libs/capstone
-		sys-devel/llvm
 		dev-cpp/nlohmann_json
 		media-libs/glm
 		x11-libs/gtk+
diff --git a/dist/get_deps_debian.sh b/dist/get_deps_debian.sh
index 192e18df7..9119e7fd2 100755
--- a/dist/get_deps_debian.sh
+++ b/dist/get_deps_debian.sh
@@ -10,20 +10,21 @@ then
     PKGCONF="pkgconf"
 fi
 
-apt install \
-  cmake \
-  g++-10 \
-  ${PKGCONF:-} \
-  libcapstone-dev \
-  libmagic-dev \
-  libglfw3-dev \
-  libglm-dev \
-  libjsoncpp-dev \
-  libmbedtls-dev \
-  libstdc++-10-dev \
-  python3-dev \
-  libfreetype-dev \
-  libgtk-3-dev
+apt install -y \
+  build-essential       \
+  gcc-10                \
+  g++-10                \
+  ${PKGCONF:-}          \
+  cmake                 \
+  make                  \
+  libglfw3-dev          \
+  libglm-dev            \
+  libmagic-dev          \
+  libmbedtls-dev        \
+  libcapstone-dev       \
+  python3-dev           \
+  libfreetype-dev       \
+  libgtk-3-dev          \
 
 echo "Please consider this before running cmake (useful on e.g. Ubuntu 20.04):"
 echo "export CXX=g++-10"
diff --git a/dist/get_deps_msys2.sh b/dist/get_deps_msys2.sh
index e290a0b5c..2db2c9896 100755
--- a/dist/get_deps_msys2.sh
+++ b/dist/get_deps_msys2.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-pacman -S --needed \
+pacman -S --needed --noconfirm \
   mingw-w64-x86_64-gcc \
   mingw-w64-x86_64-cmake \
   mingw-w64-x86_64-make \
@@ -9,7 +9,6 @@ pacman -S --needed \
   mingw-w64-x86_64-glm \
   mingw-w64-x86_64-file \
   mingw-w64-x86_64-mbedtls \
-  mingw-w64-x86_64-polly \
   mingw-w64-x86_64-python \
   mingw-w64-x86_64-freetype \
   mingw-w64-x86_64-dlfcn
diff --git a/dist/msys2/PKGBUILD b/dist/msys2/PKGBUILD
index 990f3d915..c8169b106 100644
--- a/dist/msys2/PKGBUILD
+++ b/dist/msys2/PKGBUILD
@@ -11,12 +11,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-make"
-             "${MINGW_PACKAGE_PREFIX}-dlsym"
+             "${MINGW_PACKAGE_PREFIX}-dlfcn"
              "${MINGW_PACKAGE_PREFIX}-capstone"
              "${MINGW_PACKAGE_PREFIX}-glfw"
              "${MINGW_PACKAGE_PREFIX}-glm"
              "${MINGW_PACKAGE_PREFIX}-file"
-             "${MINGW_PACKAGE_PREFIX}-openssl"
+             "${MINGW_PACKAGE_PREFIX}-mbedtls"
              "${MINGW_PACKAGE_PREFIX}-polly"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-freetype")