Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

upgrade other deps; fix librime not patched #8

Merged
merged 2 commits into from
Nov 11, 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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
url = https://github.com/google/leveldb
[submodule "opencc"]
path = opencc
url = git@github.com:BYVoid/OpenCC
url = https://github.com/BYVoid/OpenCC
[submodule "glog"]
path = glog
url = https://github.com/google/glog
Expand Down
2 changes: 1 addition & 1 deletion extra-cmake-modules
Submodule extra-cmake-modules updated 45 files
+0 −1 .gitlab-ci.yml
+1 −1 CMakeLists.txt
+0 −72 cmake/FindQCollectionGenerator.cmake
+10 −5 docs/CMakeLists.txt
+1 −0 docs/module/ECMGeneratePythonBindings.rst
+76 −3 find-modules/FindGLIB2.cmake
+8 −0 find-modules/FindKF6.cmake
+0 −503 find-modules/FindPythonModuleGeneration.cmake
+0 −7 find-modules/GeneratePythonBindingUmbrellaModule.cmake
+0 −134 find-modules/Qt5Ruleset.py
+0 −973 find-modules/rules_engine.py
+0 −59 find-modules/run-sip.py
+0 −796 find-modules/sip_generator.py
+18 −14 kde-modules/KDEClangFormat.cmake
+6 −2 kde-modules/KDEInstallDirs6.cmake
+1 −1 kde-modules/appstreamtest.cmake
+3 −0 kde-modules/clang-format.cmake
+2 −0 kde-modules/prefix.sh.cmake
+1 −1 modules/ECMFindQmlModule.cmake.in
+41 −4 modules/ECMGeneratePkgConfigFile.cmake
+180 −0 modules/ECMGeneratePythonBindings.cmake
+26 −0 modules/ECMGeneratePythonBindings.toml.in
+2 −0 modules/ECMGeneratePythonBindings.toml.in.license
+3 −3 modules/ECMQmlModule.cmake
+60 −18 modules/ECMQmlModule6.cmake
+2 −4 modules/ECMQueryQt.cmake
+0 −29 tests/CMakeLists.txt
+2 −0 tests/ECMGeneratePkgConfigFile/CMakeLists.txt
+12 −0 tests/ECMGeneratePkgConfigFile/KF6Attica.pc
+22 −0 tests/ECMGeneratePkgConfigFile/run_test.cmake.config
+43 −0 tests/ECMGeneratePkgConfigFile/test_imported_targets/CMakeLists.txt
+13 −0 tests/ECMGeneratePkgConfigFile/test_imported_targets/EGPF_imported_include_dirs_control.pc
+4 −0 tests/ECMGeneratePkgConfigFile/test_imported_targets/main.cpp
+12 −4 tests/ECMPoQmToolsTest/CMakeLists.txt
+6 −2 tests/ECMPoQmToolsTest/check.cmake.in
+4 −0 tests/ECMPoQmToolsTest/check_conf_static.cmake.in
+0 −52 tests/GenerateSipBindings/CMakeLists.txt
+0 −241 tests/GenerateSipBindings/cpplib.cpp
+0 −221 tests/GenerateSipBindings/cpplib.h
+0 −13 tests/GenerateSipBindings/external_lib.cpp
+0 −12 tests/GenerateSipBindings/external_lib.h
+0 −72 tests/GenerateSipBindings/rules_SipTest.py
+0 −7 tests/GenerateSipBindings/subdir/subdirfile.cpp
+0 −8 tests/GenerateSipBindings/subdir/subdirfile.h
+0 −137 tests/GenerateSipBindings/testscript.py
2 changes: 1 addition & 1 deletion iso-codes
Submodule iso-codes updated from c2fcaa to 064007
2 changes: 1 addition & 1 deletion json-c
Submodule json-c updated 115 files
2 changes: 1 addition & 1 deletion libexpat
2 changes: 1 addition & 1 deletion libime
2 changes: 1 addition & 1 deletion opencc
10 changes: 7 additions & 3 deletions scripts/librime.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
from common import Builder
from common import Builder, patch

Builder('librime', [
project = 'librime'

patch(project)

Builder(project, [
'-DENABLE_THREADING=OFF',
'-DBUILD_TEST:BOOL=OFF'
'-DBUILD_TEST=OFF'
]).exec()
2 changes: 1 addition & 1 deletion xkeyboard-config
Submodule xkeyboard-config updated from ee603e to 4c6d0d