diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 189e5457..09b402ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: run: | apt update 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 \ + libdbus-glib-1-dev libgtop2-dev libwingpanel-3.0-dev libudisks2-dev \ libxnvctrl0 libxnvctrl-dev libcurl4-gnutls-dev libflatpak-dev libjson-glib-dev \ liblivechart-1-dev libpci-dev \ meson valac sassc git diff --git a/README.md b/README.md index 1c2f7cbd..a642d98b 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 liblivechart-1-dev libpci-dev libwingpanel-dev meson +sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev libwingpanel-dev meson ``` 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 liblivechart-1-dev libpci-dev meson +sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev meson ``` diff --git a/meson.build b/meson.build index 8636cf10..1e6600fc 100644 --- a/meson.build +++ b/meson.build @@ -15,7 +15,6 @@ vapidir = meson.current_source_dir() / 'vapi/' add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c') add_project_arguments(['--vapidir', vapidir], language: 'vala') -add_project_arguments(['-DWNCK_I_KNOW_THIS_IS_UNSTABLE', '-w'], language: 'c') # subprojects should be skipped: https://mesonbuild.com/Release-notes-for-0-58-0.html#skip-subprojects-installation # needs meson 0.58.0 @@ -29,7 +28,6 @@ app_dependencies = [ dependency('gio-2.0'), dependency('gobject-2.0'), dependency('libgtop-2.0'), - dependency('libwnck-3.0'), dependency('libhandy-1', version: '>=0.90.0'), dependency('gdk-x11-3.0'), dependency('x11'), diff --git a/src/Managers/Process.vala b/src/Managers/Process.vala index 91f74f9d..db527f83 100644 --- a/src/Managers/Process.vala +++ b/src/Managers/Process.vala @@ -322,12 +322,6 @@ public class Monitor.Process : GLib.Object { GTop.get_proc_mem (out proc_mem, stat.pid); mem_usage = (proc_mem.resident - proc_mem.share) / 1024; // in KiB - // also if it is using X Window Server - if (Gdk.Display.get_default () is Gdk.X11.Display) { - Wnck.ResourceUsage resu = Wnck.ResourceUsage.pid_read (Gdk.Display.get_default (), stat.pid); - mem_usage += (resu.total_bytes_estimate / 1024); - } - var total_installed_memory = (double) mem.total / 1024; mem_percentage = (mem_usage / total_installed_memory) * 100;