diff --git a/.github/workflows/compare.yml b/.github/workflows/compare.yml index 5c7895c..f774f87 100644 --- a/.github/workflows/compare.yml +++ b/.github/workflows/compare.yml @@ -34,7 +34,7 @@ jobs: mkdir old new tar xf release/$file -C old tar xf $file -C new - diff -r old new >> summary.md || true + diff -rq old new | grep -v '\.hpp differ' >> summary.md || true rm -r old new fi else diff --git a/ecm b/ecm index 44700a8..7dd28cc 160000 --- a/ecm +++ b/ecm @@ -1 +1 @@ -Subproject commit 44700a805ad41302a81eebd1fe885b9ca18bf7c8 +Subproject commit 7dd28cc56c339c3f8fb356f7c53c0e8f61433d81 diff --git a/fmt b/fmt index e3ddede..8303d14 160000 --- a/fmt +++ b/fmt @@ -1 +1 @@ -Subproject commit e3ddede6c4ee818825c4e5a6dfa1d384860c27d9 +Subproject commit 8303d140a1a11f19b982a9f664bbe59a1ccda3f4 diff --git a/libgee b/libgee index 2f0bbe8..d2e135e 160000 --- a/libgee +++ b/libgee @@ -1 +1 @@ -Subproject commit 2f0bbe8987e5eb1390b23ac531c971b202c2ef77 +Subproject commit d2e135e98718e37cae04599689fea8fb145b0b74 diff --git a/librime b/librime index b34e4ac..e8184dc 160000 --- a/librime +++ b/librime @@ -1 +1 @@ -Subproject commit b34e4ac3b8bad6ae237e12f3e03b76575709574d +Subproject commit e8184dceaf9a89a21d6dc25c1850779cd652c472 diff --git a/libuv b/libuv index e1095c7..8fb9cb9 160000 --- a/libuv +++ b/libuv @@ -1 +1 @@ -Subproject commit e1095c7a4373ce00cd8874d8e820de5afb25776e +Subproject commit 8fb9cb919489a48880680a56efecff6a7dfb4504 diff --git a/patches/libgee.patch b/patches/libgee.patch index b51225a..a0432c3 100644 --- a/patches/libgee.patch +++ b/patches/libgee.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index 07d2bdc..886c194 100644 +index 9058f89..1f67070 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,6 @@ endif @@ -11,7 +11,7 @@ index 07d2bdc..886c194 100644 $(BENCHMARK_SUBDIR) \ $(NULL) diff --git a/configure.ac b/configure.ac -index 10c661a..b1a4cfc 100644 +index e9bfb37..6d0d9e1 100644 --- a/configure.ac +++ b/configure.ac @@ -68,9 +68,6 @@ AC_ARG_ENABLE(consistency-check, [AS_HELP_STRING([--enable-consistency-check], [ diff --git a/patches/librime.patch b/patches/librime.patch index 81c0f46..97f0e98 100644 --- a/patches/librime.patch +++ b/patches/librime.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1608286..5b6942f 100644 +index 16082869..5b6942f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -166,6 +166,14 @@ if(BUILD_SHARED_LIBS) @@ -18,7 +18,7 @@ index 1608286..5b6942f 100644 OUTPUT_NAME "rime" PREFIX "lib" ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) diff --git a/src/rime/engine.cc b/src/rime/engine.cc -index 07aa6b7..7360e0b 100644 +index 07aa6b7d..7360e0b5 100644 --- a/src/rime/engine.cc +++ b/src/rime/engine.cc @@ -52,7 +52,6 @@ class ConcreteEngine : public Engine { @@ -30,7 +30,7 @@ index 07aa6b7..7360e0b 100644 // implementations diff --git a/src/rime/engine.h b/src/rime/engine.h -index 6b51a68..c5b8f7e 100644 +index 6b51a68e..c5b8f7e4 100644 --- a/src/rime/engine.h +++ b/src/rime/engine.h @@ -16,6 +16,7 @@ namespace rime { @@ -50,7 +50,7 @@ index 6b51a68..c5b8f7e 100644 protected: Engine(); diff --git a/src/rime/gear/navigator.cc b/src/rime/gear/navigator.cc -index e3c3b40..551716b 100644 +index e3c3b40e..551716b2 100644 --- a/src/rime/gear/navigator.cc +++ b/src/rime/gear/navigator.cc @@ -15,6 +15,9 @@ @@ -73,7 +73,7 @@ index e3c3b40..551716b 100644 FallbackOptions::All); } diff --git a/src/rime/gear/selector.cc b/src/rime/gear/selector.cc -index 0687410..b288eaf 100644 +index 06874103..b288eaf2 100644 --- a/src/rime/gear/selector.cc +++ b/src/rime/gear/selector.cc @@ -14,6 +14,16 @@ @@ -202,7 +202,7 @@ index 0687410..b288eaf 100644 return false; } diff --git a/src/rime/gear/selector.h b/src/rime/gear/selector.h -index 5e4bfce..e88aace 100644 +index 5e4bfce0..e88aace0 100644 --- a/src/rime/gear/selector.h +++ b/src/rime/gear/selector.h @@ -14,11 +14,12 @@ @@ -221,7 +221,7 @@ index 5e4bfce..e88aace 100644 enum CandidateListLayout { Stacked = 0, diff --git a/src/rime/service.h b/src/rime/service.h -index a69ae74..9b3d4b1 100644 +index a69ae741..9b3d4b16 100644 --- a/src/rime/service.h +++ b/src/rime/service.h @@ -44,11 +44,11 @@ class Session { @@ -238,7 +238,7 @@ index a69ae74..9b3d4b1 100644 string commit_text_; }; diff --git a/src/rime_api_impl.h b/src/rime_api_impl.h -index 6e906cf..f4dae0a 100644 +index 6e906cfe..f4dae0a3 100644 --- a/src/rime_api_impl.h +++ b/src/rime_api_impl.h @@ -17,6 +17,8 @@ diff --git a/scripts/boost.py b/scripts/boost.py index e5f4205..a0e393f 100644 --- a/scripts/boost.py +++ b/scripts/boost.py @@ -1,7 +1,7 @@ import os from common import CMakeBuilder, PLATFORM, cache, ensure -version = '1.86.0' +version = '1.87.0' boost_dir = f'boost-{version}' boost_tar = f'{boost_dir}-cmake.tar.xz'