From 40ef4dbbf4c19d4ed5cf664adb1f66bde64f0f00 Mon Sep 17 00:00:00 2001 From: pentarctagon Date: Sun, 8 Sep 2024 10:25:45 -0500 Subject: [PATCH] Revert "Bump min Boost version to 1.82 (#9317)" This reverts commit 7c60174ad10de5adc8b7e56b24810e830f50e62a. --- .github/workflows/codeql.yml | 10 +++++----- CMakeLists.txt | 2 +- INSTALL.md | 2 +- SConstruct | 2 +- changelog_entries/boost-to-82.md | 2 -- packaging/flatpak/org.wesnoth.Wesnoth.json | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 changelog_entries/boost-to-82.md diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 94e54cc74aa..2a960be7fb1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,7 +16,7 @@ jobs: # - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/using-larger-runners # Consider using larger runners for possible analysis time improvements. - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest timeout-minutes: 360 permissions: actions: read @@ -51,10 +51,10 @@ jobs: if: matrix.language == 'cpp' run: | sudo apt update - sudo apt install scons libboost-system1.83-dev libboost-filesystem1.83-dev libboost-iostreams1.83-dev \ - libboost-serialization1.83-dev libboost-locale1.83-dev libboost-regex1.83-dev libboost-random1.83-dev \ - libboost-program-options1.83-dev libboost-thread1.83-dev libboost-context1.83-dev libboost-test-dev \ - libboost-coroutine1.83-dev libboost-graph1.83-dev libasio-dev libsdl2-dev libsdl2-image-dev \ + sudo apt install scons libboost-system1.74-dev libboost-filesystem1.74-dev libboost-iostreams1.74-dev \ + libboost-serialization1.74-dev libboost-locale1.74-dev libboost-regex1.74-dev libboost-random1.74-dev \ + libboost-program-options1.74-dev libboost-thread1.74-dev libboost-context1.74-dev libboost-test-dev \ + libboost-coroutine1.74-dev libboost-graph1.74-dev libasio-dev libsdl2-dev libsdl2-image-dev \ libsdl2-mixer-dev libvorbis-dev libpango1.0-dev libssl-dev libcurl4-openssl-dev liblua5.4-dev # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - name: Autobuild diff --git a/CMakeLists.txt b/CMakeLists.txt index d6a161ba548..0a20a6372b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ option(ENABLE_MYSQL "Enable building MP/add-ons servers with mysql support" OFF) option(ENABLE_TESTS "Build unit tests") option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME}) -set(BOOST_VERSION "1.82") +set(BOOST_VERSION "1.67") if(NOT WIN32) set(Lua_FIND_VERSION_MAJOR 5) diff --git a/INSTALL.md b/INSTALL.md index 1bdb57085c4..4314a51e55e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,7 +8,7 @@ later, or a version of Clang with equivalent support. You'll need to have these libraries and their development headers installed in order to build Wesnoth: - * Boost libraries >= 1.82.0 + * Boost libraries >= 1.66.0 Most headers plus the following binary libs: * Filesystem * Locale diff --git a/SConstruct b/SConstruct index cf1dbf9ed15..bf8b0793478 100755 --- a/SConstruct +++ b/SConstruct @@ -189,7 +189,7 @@ if env['distcc']: if env['ccache']: env.Tool('ccache') -boost_version = "1.82" +boost_version = "1.67" def SortHelpText(a, b): return (a > b) - (a < b) diff --git a/changelog_entries/boost-to-82.md b/changelog_entries/boost-to-82.md deleted file mode 100644 index 576583f2821..00000000000 --- a/changelog_entries/boost-to-82.md +++ /dev/null @@ -1,2 +0,0 @@ -### Packaging - * The minimum required Boost version is now 1.82. diff --git a/packaging/flatpak/org.wesnoth.Wesnoth.json b/packaging/flatpak/org.wesnoth.Wesnoth.json index b5b0aa456d3..f56808a5490 100644 --- a/packaging/flatpak/org.wesnoth.Wesnoth.json +++ b/packaging/flatpak/org.wesnoth.Wesnoth.json @@ -34,12 +34,12 @@ "sources": [ { "type": "archive", - "url": "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2", - "sha256": "a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6" + "url": "https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2", + "sha256": "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba" } ], "build-commands": [ - "./bootstrap.sh --prefix=/app --with-libraries=system,filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph", + "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph", "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system" ] },