From 597a63fa8880b1d9aeb0fbda005d4f22e4b9313b Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 19 Dec 2024 02:08:36 +0100 Subject: [PATCH] Fix build on Ubuntu 24.04 Signed-off-by: Vitalii Koshura --- .github/workflows/android.yml | 2 +- .github/workflows/linux-package.yml | 7 +------ .github/workflows/linux.yml | 2 +- mingw/ci_make_apps.sh | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e3f0cf6945e..1ed9bf0ee82 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -51,7 +51,7 @@ jobs: run: | sudo add-apt-repository universe sudo apt-get -qq update - sudo apt-get install -y libncurses5 + sudo apt-get install -y libncurses6 - name: Check if build is running from origin repo if: ${{ success() && env.AWS_ACCESS_KEY_ID != 0 && env.AWS_SECRET_ACCESS_KEY != 0 }} diff --git a/.github/workflows/linux-package.yml b/.github/workflows/linux-package.yml index 9894bd6533f..960641444f9 100644 --- a/.github/workflows/linux-package.yml +++ b/.github/workflows/linux-package.yml @@ -923,12 +923,7 @@ jobs: - name: Install dependencies if: ${{ success() && env.SKIP_RUN == 0 }} run: | - # Install aptly version 1.5.0+ (to support ubuntu xz compression) - # gpg1 is used for compatibility with aptly - wget -qO - https://www.aptly.info/pubkey.txt | sudo apt-key add - - echo "deb http://repo.aptly.info/ squeeze main" | sudo tee -a /etc/apt/sources.list - sudo apt update -qq - sudo apt-get install -y aptly gnupg1 gpgv1 + sudo apt-get install -y aptly - name: Setup GPG keys if: ${{ success() && env.SKIP_RUN == 0 }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6caf4dd6a52..3873d3c6e9c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -50,7 +50,7 @@ jobs: - name: Install dependencies run: | sudo apt-get -qq update - sudo apt-get install -y autopoint libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.0-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip + sudo apt-get install -y autopoint libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.1-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip libltdl-dev - name: Install dependencies for arm64 if: success() && endsWith(matrix.type, 'arm64') diff --git a/mingw/ci_make_apps.sh b/mingw/ci_make_apps.sh index 0ea80bbf50e..9c6e9439657 100755 --- a/mingw/ci_make_apps.sh +++ b/mingw/ci_make_apps.sh @@ -14,7 +14,7 @@ export CXX="x86_64-w64-mingw32-g++" export CC="x86_64-w64-mingw32-gcc" # condor export MINGW_FLAGS="-Dflockfile=_lock_file -Dfunlockfile=_unlock_file" -export CURL_EXTRA_LDFLAGS="-lcurl -lwinmm -lpthread -lssl -lcrypto -lws2_32 -lzlib -ladvapi32 -lcrypt32" +export CURL_EXTRA_LDFLAGS="-lcurl -lwinmm -lpthread -lssl -lcrypto -lws2_32 -lzlib -ladvapi32 -lcrypt32 -lbcrypt" # wrapper export MINGW_WRAPPER_FLAGS="-DEINSTEINATHOME_CROSS_BUILD -DMINGW_WIN32 -DHAVE_STRCASECMP -D_WINDOWS -D_WIN32 -DWIN32 -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_MT -DBOINC -DNODB -D_CONSOLE -fexceptions" export MINGW_ZIP_FIX="../../zip/zip/__p___mb_cur_max.c"