Angel Yankov
f16f17bb80
* Sorting task lists randomly is now supported with configuration such as report.<report-name>.sort = random (#3940) * Handling for tags in a "tags" column after task edit is fixed (#3911) * tags.none: works correctly (#3877) * Non-interactive invocations of task, such as for shell completion, no longer prompts to create .taskrc. (#3888) * task sync now describes what it has done (#3758) * UDAs can now have type "UUID" (#3827) * Full changelog: https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v3.4.2 - Fix up spec file and Cmake to include rust crates - Re-vendor to include cxx and cxx-bridge - Add fix-corrosion.patch - add corrosion options to force cargo to build offline. - Add fix_cmake_ignore_hash.patch - Match the expected hash of aws-lc CmakeLists after build system supresses CMAKE_VERBOSE option. - Drop %check section - upstream is not shipping the tests in the tarballs for some reason. OBS-URL: https://build.opensuse.org/package/show/utilities/taskwarrior?expand=0&rev=43
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
Index: task-3.4.2/src/taskchampion-cpp/corrosion/cmake/Corrosion.cmake
|
|
===================================================================
|
|
--- task-3.4.2.orig/src/taskchampion-cpp/corrosion/cmake/Corrosion.cmake
|
|
+++ task-3.4.2/src/taskchampion-cpp/corrosion/cmake/Corrosion.cmake
|
|
@@ -1728,7 +1728,6 @@ function(corrosion_add_cxxbridge cxx_tar
|
|
set(ONE_VALUE_KEYWORDS CRATE REGEN_TARGET)
|
|
set(MULTI_VALUE_KEYWORDS FILES)
|
|
cmake_parse_arguments(PARSE_ARGV 1 _arg "${OPTIONS}" "${ONE_VALUE_KEYWORDS}" "${MULTI_VALUE_KEYWORDS}")
|
|
-
|
|
set(required_keywords CRATE FILES)
|
|
foreach(keyword ${required_keywords})
|
|
if(NOT DEFINED "_arg_${keyword}")
|
|
@@ -1803,6 +1802,7 @@ function(corrosion_add_cxxbridge cxx_tar
|
|
cxxbridge-cmd
|
|
--version "${cxx_required_version}"
|
|
--locked
|
|
+ --offline
|
|
--root "${CMAKE_BINARY_DIR}/corrosion/cxxbridge_v${cxx_required_version}"
|
|
--quiet
|
|
# todo: use --target-dir to potentially reuse artifacts
|
|
Index: task-3.4.2/src/taskchampion-cpp/CMakeLists.txt
|
|
===================================================================
|
|
--- task-3.4.2.orig/src/taskchampion-cpp/CMakeLists.txt
|
|
+++ task-3.4.2/src/taskchampion-cpp/CMakeLists.txt
|
|
@@ -61,11 +61,13 @@ endif (ENABLE_TLS_NATIVE_ROOTS)
|
|
corrosion_import_crate(
|
|
MANIFEST_PATH "${CMAKE_SOURCE_DIR}/Cargo.toml"
|
|
LOCKED
|
|
+ FROZEN
|
|
CRATES "taskchampion-lib"
|
|
FEATURES "${TASKCHAMPION_FEATURES}")
|
|
|
|
# Set up `taskchampion-cpp`, the C++ side of the bridge.
|
|
corrosion_add_cxxbridge(taskchampion-cpp
|
|
CRATE taskchampion_lib
|
|
+ FROZEN
|
|
FILES lib.rs
|
|
)
|