Sort Task Lists using calendar-order

.gitignore

@@ -1,2 +1,3 @@
 *~
 build/*
+.flatpak-builder/

README.md

@@ -3,6 +3,33 @@
 
 ## Building and Installation
 
+### Build with Flatpak
+
+_Starting with elementary 6 Odin, Flatpak is the preferred build method._
+
+You'll need to install the following dependencies:
+
+```bash
+flatpak --user install flathub \
+  org.gnome.Sdk//3.38 \
+  io.elementary.BaseApp//juno-20.08
+```
+
+Run `flatpak-builder` to build:
+
+```bash
+flatpak-builder --force-clean build io.elementary.tasks.yml
+```
+
+To install, use `flatpak-builder --install`, then execute with `flatpak run io.elementary.tasks`:
+
+```bash
+flatpak-builder --install --user --force-clean build io.elementary.tasks.yml
+flatpak run io.elementary.tasks
+```
+
+### Build with Meson
+
 You'll need the following dependencies:
 * glib-2.0
 * gobject-2.0

meson.build

@@ -34,7 +34,7 @@ tasks_deps = [
     dependency('libgdata')
 ]
 
-if libecal_dep.version().version_compare('>=3.39.2')
+if libecal_dep.version().version_compare('>=3.40.0')
     add_project_arguments('--define=HAS_EDS_3_40', language: 'vala')
 else
     tasks_deps += meson.get_compiler('vala').find_library('libecal-2.0-fixes', dirs: meson.current_source_dir() / 'vapi')

src/MainWindow.vala

@@ -340,7 +340,11 @@ public class Tasks.MainWindow : Hdy.ApplicationWindow {
         if (row.source.parent == null || before.source.parent == null) {
             return -1;
         } else if (row.source.parent == before.source.parent) {
+#if HAS_EDS_3_40
+            return E.util_source_compare_for_sort (row.source, before.source);
+#else
             return row.source.display_name.collate (before.source.display_name);
+#endif
         } else {
             return row.source.parent.collate (before.source.parent);
         }