Skip to content

Update dependencies #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 0 additions & 47 deletions .github/patches/gcc_14_2.diff

This file was deleted.

25 changes: 10 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,6 @@ jobs:
echo "CC=clang-19" >> "$GITHUB_ENV"
echo "CXX=clang++-19" >> "$GITHUB_ENV"
echo "OBJC=clang-19" >> "$GITHUB_ENV"
# Patch the libstd++ library, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115119
# This is a dirty workaround, but it is needed, since gcc 14.2 (where this was patched usptream) is not easily available
# If we use the oracular (Ubuntu 24.10) repos, we could install gcc 14.2, but clang-19 isn't compatible with that
# TODO: remove this, after it works again
sudo patch -p1 /usr/include/c++/14/bits/unicode.h .github/patches/gcc_14_2.diff

- name: Setup GCC (Linux)
if: matrix.config.os == 'ubuntu' && matrix.config.use-clang == false
Expand All @@ -144,6 +139,16 @@ jobs:
version: 14
platform: x64

- name: Unbreak Python in GHA (MacOS 13 image)
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
run: |
# TODO: remove this, after it works again
# A workaround for "The `brew link` step did not complete successfully" error.
# See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3

- name: Setup Clang (MacOS)
if: matrix.config.os == 'macos'
run: |
Expand All @@ -160,16 +165,6 @@ jobs:
echo "CXX_LD=lld" >> "$GITHUB_ENV"
echo "OBJC_LD=lld" >> "$GITHUB_ENV"

- name: Unbreak Python in GHA (MacOS 13 image)
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
run: |
# TODO: remove this, after it works again
# A workaround for "The `brew link` step did not complete successfully" error.
# See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3

- name: Setup meson (MacOS)
if: matrix.config.os == 'macos'
run: |
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.6.1'
classpath 'com.android.tools.build:gradle:8.7.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
10 changes: 5 additions & 5 deletions subprojects/argparse.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ directory = argparse-3.1
source_url = https://github.com/p-ranav/argparse/archive/refs/tags/v3.1.tar.gz
source_filename = argparse-3.1.tar.gz
source_hash = d01733552ca4a18ab501ae8b8be878131baa32e89090fafdeef018ebfa4c6e46
patch_filename = argparse_3.1-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.1-1/get_patch
patch_hash = f7503f5f633dfe7bda7fbf51372afbd1ebc2ec496d14d1daf37d0af36b2bebab
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.1-1/argparse-3.1.tar.gz
wrapdb_version = 3.1-1
patch_filename = argparse_3.1-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.1-2/get_patch
patch_hash = 681512473913fd9f918c1d1abc40a358a739e4d02df50d8b54bf3d863fa27266
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.1-2/argparse-3.1.tar.gz
wrapdb_version = 3.1-2

[provide]
argparse = argparse_dep
14 changes: 7 additions & 7 deletions subprojects/cpp-httplib.wrap
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[wrap-file]
directory = cpp-httplib-0.18.0
source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.18.0.tar.gz
source_filename = cpp-httplib-0.18.0.tar.gz
source_hash = 6ed5894bbbc4a34a0f4c5e962672d0003d2ea099bbadacc66f6dee2b213ff394
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.18.0-1/cpp-httplib-0.18.0.tar.gz
wrapdb_version = 0.18.0-1
diff_files = cpp-httplib-0.18.0_mingw.diff
directory = cpp-httplib-0.18.1
source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.18.1.tar.gz
source_filename = cpp-httplib-0.18.1.tar.gz
source_hash = 405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.18.1-1/cpp-httplib-0.18.1.tar.gz
wrapdb_version = 0.18.1-1
diff_files = cpp-httplib-0.18.1_mingw.diff

[provide]
cpp-httplib = cpp_httplib_dep
10 changes: 5 additions & 5 deletions subprojects/spdlog.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ directory = spdlog-1.14.1
source_url = https://github.com/gabime/spdlog/archive/refs/tags/v1.14.1.tar.gz
source_filename = spdlog-1.14.1.tar.gz
source_hash = 1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
patch_filename = spdlog_1.14.1-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.14.1-1/get_patch
patch_hash = ae878e732330ea1048f90d7e117c40c0cd2a6fb8ae5492c7955818ce3aaade6c
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.14.1-1/spdlog-1.14.1.tar.gz
wrapdb_version = 1.14.1-1
patch_filename = spdlog_1.14.1-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.14.1-2/get_patch
patch_hash = d9fe1e98d330e3283214321844a89b9b339e272b91a2709c373ff47f8299942b
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.14.1-2/spdlog-1.14.1.tar.gz
wrapdb_version = 1.14.1-2

[provide]
spdlog = spdlog_dep
2 changes: 1 addition & 1 deletion wrapper/c
2 changes: 1 addition & 1 deletion wrapper/javascript
Loading