diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-10-24 11:52:49 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-10-24 11:52:49 +0200 |
| commit | 0ba40e40d4ea4cf7ae6597c5dda94bce8b8755a8 (patch) | |
| tree | 8a96882a7883ff93d672693050cc46bc72ef6bda /modules | |
| parent | 09df9e6095b6dfdc78ecfae51fcb3f34bbb1ff42 (diff) | |
modules/taskwarrior: Rebase patch for v2.5.0.
It got bumped to version 2.5.0 in NixOS/nixpkgs@f0d1766. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user/aszlig/programs/taskwarrior/config.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/user/aszlig/programs/taskwarrior/config.patch b/modules/user/aszlig/programs/taskwarrior/config.patch index d2dde96f..4ee4c4ce 100644 --- a/modules/user/aszlig/programs/taskwarrior/config.patch +++ b/modules/user/aszlig/programs/taskwarrior/config.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ee5b6c7..7f7bdef 100644 +index 5558f6b..c8956f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -46,6 +46,9 @@ SET (TASK_DOCDIR share/doc/task CACHE STRING "Installation directory for doc fi +@@ -91,6 +91,9 @@ SET (TASK_DOCDIR share/doc/task CACHE STRING "Installation directory for doc fi SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files") SET (TASK_BINDIR bin CACHE STRING "Installation directory for the binary") @@ -13,7 +13,7 @@ index ee5b6c7..7f7bdef 100644 if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index) set (HAVE_COMMIT true) diff --git a/cmake.h.in b/cmake.h.in -index fbeb807..001a450 100644 +index 0041e6e..f8c1a0e 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -16,6 +16,7 @@ @@ -25,20 +25,20 @@ index fbeb807..001a450 100644 /* Localization */ #define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE} diff --git a/src/Context.cpp b/src/Context.cpp -index 6dedd5e..04ced17 100644 +index 8aae74e..ffa5557 100644 --- a/src/Context.cpp +++ b/src/Context.cpp -@@ -148,7 +148,8 @@ int Context::initialize (int argc, const char** argv) +@@ -121,7 +121,8 @@ int Context::initialize (int argc, const char** argv) } config.clear (); - config.load (rc_file); + config.load (SYSTEM_TASKRC); + config.load (rc_file, 2); - CLI::applyOverrides (argc, argv); + CLI2::applyOverrides (argc, argv); //////////////////////////////////////////////////////////////////////////// -@@ -173,7 +174,6 @@ int Context::initialize (int argc, const char** argv) +@@ -146,7 +147,6 @@ int Context::initialize (int argc, const char** argv) } tdb2.set_location (data_dir); |