Merge pull request #924 from alebastr/build-fixes

Build fixes

meson.build

@@ -2,6 +2,7 @@ project(
     'waybar', 'cpp', 'c',
     version: '0.9.4',
     license: 'MIT',
+    meson_version: '>= 0.49.0',
     default_options : [
         'cpp_std=c++17',
         'buildtype=release',
@@ -9,8 +10,6 @@ project(
     ],
 )
 
-fs = import('fs')
-
 compiler = meson.get_compiler('cpp')
 
 cpp_args = []
@@ -318,9 +317,9 @@ if scdoc.found()
 
     foreach file : man_files
         path = '@0@'.format(file)
-        basename = fs.name(path)
+        basename = path.split('/')[-1]
 
-        topic = basename.split('.')[-3].split('/')[-1]
+        topic = basename.split('.')[-3]
         section = basename.split('.')[-2]
         output = '@0@.@1@'.format(topic, section)
 

src/modules/network.cpp

@@ -3,6 +3,7 @@
 #include <sys/eventfd.h>
 #include <fstream>
 #include <cassert>
+#include <optional>
 #include "util/format.hpp"
 #ifdef WANT_RFKILL
 #include "util/rfkill.hpp"