From 2519850712b0f0cafae15eb0059eeb5c4108f719 Mon Sep 17 00:00:00 2001
From: Nick Chan <towinchenmi@gmail.com>
Date: Sat, 4 Feb 2023 19:54:47 +0800
Subject: [PATCH] fixes

---
 .github/workflows/build.yml | 42 +++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af915f3..0b80671 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,7 @@ jobs:
       NCURSES_VERSION: 6.4
       SLANG_VERSION: 2.3.3
       NEWT_VERSION: 0.52.23
+      POPT_VERSION: 1.19
 
     steps:
       - name: Checkout
@@ -52,13 +53,14 @@ jobs:
 
       - name: Download dependencies (source code)
         run: |
-          curl -LOOOOOO \
+          curl -LOOOOOOO \
             https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
             https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \
             https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \
             https://mirror-hk.koddos.net/gnu/ncurses/ncurses-${{ env.NCURSES_VERSION }}.tar.gz \
             https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \
-            https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz
+            https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \
+            https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz
 
           tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
           tar -xjf libusb-${{ env.LIBUSB_VERSION }}.tar.bz2
@@ -66,6 +68,7 @@ jobs:
           tar -xf ncurses-${{ env.NCURSES_VERSION }}.tar.gz
           tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2
           tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz
+          tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz
           git clone --depth=1 https://github.com/libimobiledevice/libplist
           git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
           git clone --depth=1 https://github.com/libimobiledevice/libirecovery
@@ -221,6 +224,20 @@ jobs:
           gmake -j$(sysctl -n hw.ncpu) install-static DESTDIR=${{ env.DESTDIR }}
           cd ..
 
+      - name: Build popt
+        run: |
+          cd popt-popt-${{ env.POPT_VERSION }}-release
+          autoreconf -fiv
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-libiconv-prefix \
+            --without-libintl-prefix \
+            --disable-nls \
+            --disable-werror
+          gmake -j$(sysctl -n hw.ncpu)
+          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
       - name: Build newt
         run: |
           cd newt-${{ env.NEWT_VERSION }}
@@ -403,6 +420,7 @@ jobs:
       SLANG_VERSION: 2.3.3
       NEWT_VERSION: 0.52.23
       GPM_VERSION: 1.20.7
+      POPT_VERSION: 1.19
 
     steps:
       - name: Checkout
@@ -470,14 +488,15 @@ jobs:
 
       - name: Download dependencies (source code)
         run: |
-          curl -LOOOOOOO \
+          curl -LOOOOOOOO \
             https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
             https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \
             https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \
             https://mirror-hk.koddos.net/gnu/ncurses/ncurses-${{ env.NCURSES_VERSION }}.tar.gz \
             https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \
             https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \
-            http://www.nico.schottelius.org/software/gpm/archives/gpm-${{ env.GPM_VERSION }}.tar.gz
+            http://www.nico.schottelius.org/software/gpm/archives/gpm-${{ env.GPM_VERSION }}.tar.gz \
+            https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz
 
           tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
           tar -xjf libusb-${{ env.LIBUSB_VERSION }}.tar.bz2
@@ -486,6 +505,7 @@ jobs:
           tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2
           tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz
           tar -xf gpm-${{ env.GPM_VERSION }}.tar.gz
+          tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz
           git clone --depth=1 https://github.com/libimobiledevice/libplist
           git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
           git clone --depth=1 https://github.com/libimobiledevice/libirecovery
@@ -593,6 +613,20 @@ jobs:
           gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
           cd ..
 
+      - name: Build popt
+        run: |
+          cd popt-popt-${{ env.POPT_VERSION }}-release
+          autoreconf -fiv
+          ./configure \
+            ${{ env.CONFIGURE_ARGS }} \
+            --without-libiconv-prefix \
+            --without-libintl-prefix \
+            --disable-nls \
+            --disable-werror
+          gmake -j$(sysctl -n hw.ncpu)
+          gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
+          cd ..
+
       - name: Build newt
         run: |
           cd newt-${{ env.NEWT_VERSION }}