diff --git a/.github/patches/gcc_14_2.diff b/.github/patches/gcc_14_2.diff deleted file mode 100644 index 9a81651f..00000000 --- a/.github/patches/gcc_14_2.diff +++ /dev/null @@ -1,47 +0,0 @@ -From c9e05b03c18e898be604ab90401476e9c473cc52 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Thu, 16 May 2024 17:15:55 +0100 -Subject: [PATCH] libstdc++: Fix typo in _Grapheme_cluster_view::_Iterator - [PR115119] - -libstdc++-v3/ChangeLog: - - PR libstdc++/115119 - * include/bits/unicode.h (_Iterator::operator++(int)): Fix typo - in increment expression. - * testsuite/ext/unicode/grapheme_view.cc: Check post-increment - on view's iterator. - - Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=c9e05b03c18e898be604ab90401476e9c473cc52 - Modified paths, to make it work ---- - bits/unicode.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bits/unicode.h b/bits/unicode.h -index 46238143fb61..a14a17c5dfcf 100644 ---- a/bits/unicode.h -+++ b/bits/unicode.h -@@ -34,10 +34,12 @@ - #include - #include // bit_width - #include // __detail::__from_chars_alnum_to_val_table -+#include - #include - #include - #include --#include -+#include // iterator_t, sentinel_t, input_range, etc. -+#include // view_interface - - namespace std _GLIBCXX_VISIBILITY(default) - { -@@ -802,7 +804,7 @@ inline namespace __v15_1_0 - operator++(int) - { - auto __tmp = *this; -- ++this; -+ ++*this; - return __tmp; - } - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 951b1cf0..5f3b1794 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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: | @@ -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: | diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle index f3fa7ecf..da0461b6 100644 --- a/platforms/android/build.gradle +++ b/platforms/android/build.gradle @@ -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 diff --git a/subprojects/argparse.wrap b/subprojects/argparse.wrap index 26aacb5e..17180323 100644 --- a/subprojects/argparse.wrap +++ b/subprojects/argparse.wrap @@ -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 diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap index 9702e42b..cdbcc56b 100644 --- a/subprojects/cpp-httplib.wrap +++ b/subprojects/cpp-httplib.wrap @@ -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 diff --git a/subprojects/packagefiles/cpp-httplib-0.18.0_mingw.diff b/subprojects/packagefiles/cpp-httplib-0.18.1_mingw.diff similarity index 100% rename from subprojects/packagefiles/cpp-httplib-0.18.0_mingw.diff rename to subprojects/packagefiles/cpp-httplib-0.18.1_mingw.diff diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index af00d5a7..97023ca5 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -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 diff --git a/wrapper/c b/wrapper/c index f033ae48..e23c6346 160000 --- a/wrapper/c +++ b/wrapper/c @@ -1 +1 @@ -Subproject commit f033ae48a1b56a9d6a4d47d52ac5bcf3a5cd9889 +Subproject commit e23c634661692ffb259e43c6a359e4c0d54bb247 diff --git a/wrapper/javascript b/wrapper/javascript index c63c4762..01b3759c 160000 --- a/wrapper/javascript +++ b/wrapper/javascript @@ -1 +1 @@ -Subproject commit c63c4762c9de8106c9c12bd380e968bcead262b2 +Subproject commit 01b3759cdf54492164b08694e0701c63a8aa97dd