From c0bb3a402ff06f7172ea6b83a6fbaab32da4c7b9 Mon Sep 17 00:00:00 2001
From: fraggerfox <santhosh.raju@gmail.com>
Date: Sun, 4 Aug 2024 19:14:34 +0200
Subject: [PATCH] CI: Fix NetBSD build.

---
 .github/workflows/ci.yml | 52 +++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1782c33d3..76538034a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -241,34 +241,30 @@ jobs:
               ./configure --enable-unicode --enable-werror
               gmake -k
 
-# This is broken since the ncursesw merge in NetBSD, cf.
-#  https://github.com/NetBSD/pkgsrc/commit/4f72c2c3a2081165a195b2667bbd5e2030397442
-# DL240722, disabling this until somebody with NetBSD can fix the build
-#
-#  build-netbsd-latest-gcc:
-#    runs-on: ubuntu-22.04
-#    timeout-minutes: 20
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Compile
-#        uses: vmactions/netbsd-vm@v1
-#        with:
-#          release: '10.0'
-#          usesh: true
-#          prepare: |
-#            PATH="/usr/pkg/sbin:/usr/pkg/bin:$PATH"
-#            PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.0/All/"
-#            export PATH PKG_PATH
-#            /usr/sbin/pkg_add pkgin
-#            pkgin -y install autoconf automake libtool ncurses ncursesw gmake git
-#            git config --global --add safe.directory /home/runner/work/htop/htop
-#          run: |
-#            set -e
-#            ./autogen.sh
-#            CPPFLAGS="-I/usr/pkg/include" ./configure --enable-unicode --enable-werror
-#            gmake -k
+  build-netbsd-latest-gcc:
+      runs-on: ubuntu-22.04
+      timeout-minutes: 20
+      steps:
+        - uses: actions/checkout@v4
+          with:
+            submodules: recursive
+        - name: Compile
+          uses: vmactions/netbsd-vm@v1
+          with:
+            release: '10.0'
+            usesh: true
+            prepare: |
+              PATH="/usr/pkg/sbin:/usr/pkg/bin:$PATH"
+              PKG_PATH="https://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.0/All/"
+              export PATH PKG_PATH
+              /usr/sbin/pkg_add pkgin
+              pkgin -y install autoconf automake libtool ncurses gmake git
+              git config --global --add safe.directory /home/runner/work/htop/htop
+            run: |
+              set -e
+              ./autogen.sh
+              CPPFLAGS="-I/usr/pkg/include -I/usr/pkg/include/ncurses" LDFLAGS="-L/usr/pkg/lib" ./configure --enable-unicode --enable-werror
+              gmake -k
 
   build-openbsd-latest-clang:
       runs-on: ubuntu-22.04