blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: remove wlroots dependency

This commit is contained in:
Alex 2019-05-20 09:48:57 +02:00
parent 913d0f7ad0
commit 03e43fb31d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,4 +17,4 @@ script:
- echo FROM alexays/waybar:${distro} > Dockerfile - echo FROM alexays/waybar:${distro} > Dockerfile
- echo ADD . /root >> Dockerfile - echo ADD . /root >> Dockerfile
- docker build -t waybar . - docker build -t waybar .
- docker run waybar /bin/sh -c "cd /root && git clone --depth=1 https://github.com/swaywm/wlroots subprojects/wlroots && meson build && ninja -C build" - docker run waybar /bin/sh -c "cd /root && meson build && ninja -C build"

2
meson.build
View File

@ -51,7 +51,6 @@ fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep'])
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_cursor = dependency('wayland-cursor') wayland_cursor = dependency('wayland-cursor')
wayland_protos = dependency('wayland-protocols') wayland_protos = dependency('wayland-protocols')
wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
gtkmm = dependency('gtkmm-3.0') gtkmm = dependency('gtkmm-3.0')
dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk')) dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk')) giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk'))
@ -125,7 +124,6 @@ executable(
src_files, src_files,
dependencies: [ dependencies: [
thread_dep, thread_dep,
wlroots,
client_protos, client_protos,
wayland_client, wayland_client,
fmt, fmt,

1
src/modules/network.cpp
View File

@ -593,6 +593,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
} }
// Check for valid interface // Check for valid interface
if (rtif->ifi_index == net->ifid_) { if (rtif->ifi_index == net->ifid_) {
net->linked_ = true;
// Get Iface and WIFI info // Get Iface and WIFI info
net->getInterfaceAddress(); net->getInterfaceAddress();
net->thread_timer_.wake_up(); net->thread_timer_.wake_up();