diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12a2fdb0..4611d62d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev \ libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \ libxnvctrl0 libxnvctrl-dev libcurl4-gnutls-dev libflatpak-dev libjson-glib-dev \ + liblivechart-1-dev \ meson valac sassc git - name: Build run: | diff --git a/README.md b/README.md index c105914d..56a3c744 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,13 @@ Monitor will be available from the Applications menu. If you plan to install WITH a wingpanel-indicator ```bash -sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev libwingpanel-dev +sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libwingpanel-dev ``` Alternatively, if you plan to install WITHOUT a wingpanel-indicator ```bash -sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev +sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libwnck-3-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev ``` diff --git a/meson.build b/meson.build index b4687287..5cefae22 100644 --- a/meson.build +++ b/meson.build @@ -17,8 +17,6 @@ add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), lan add_project_arguments(['--vapidir', vapidir], language: 'vala') add_project_arguments(['-DWNCK_I_KNOW_THIS_IS_UNSTABLE', '-w'], language: 'c') -livechart_proj = subproject('live-chart') - # subprojects should be skipped: https://mesonbuild.com/Release-notes-for-0-58-0.html#skip-subprojects-installation # needs meson 0.58.0 # elementary_stylesheet = subproject('stylesheet') @@ -39,7 +37,8 @@ app_dependencies = [ dependency('json-glib-1.0'), dependency('flatpak'), - livechart_proj.get_variable('livechart_dep'), + # FIXME Bump required version to >= 1.10.0 when GTK 4 porting + dependency('livechart', version: '< 1.10.0', fallback: ['live-chart', 'livechart_dep']), meson.get_compiler('c').find_library('m', required : false), meson.get_compiler('vala').find_library('posix'),