Remove stb submodule

Since 37b0896 stb_image isn't used anymore and recently the nix CI also
broke because of the hacky way the include directory is determined. This
is now fixed. One side effect of this is, that gBar no longer needs to
be cloned recursively.
This commit is contained in:
scorpion-26 2024-03-13 01:37:31 +01:00
parent 57eb5c5781
commit 097c3d97e7
9 changed files with 4 additions and 21 deletions

View file

@ -23,8 +23,6 @@ jobs:
- name: Download gBar
uses: actions/checkout@v3.3.0
with:
submodules: recursive
- name: Run meson
run: |

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "thirdparty/stb"]
path = thirdparty/stb
url = https://github.com/nothings/stb

View file

@ -17,9 +17,9 @@ My personal blazingly fast and efficient status bar + widgets, in case anyone fi
- meson, gcc/clang, ninja
## Building and installation (Manually)
1. Clone gBar recursively
1. Clone gBar
```
git clone https://github.com/scorpion-26/gBar --recursive
git clone https://github.com/scorpion-26/gBar
```
2. Configure with meson

View file

@ -29,7 +29,6 @@
gtk3
gtk-layer-shell
libpulseaudio
stb
libdbusmenu-gtk3
libsass
];

View file

@ -121,16 +121,9 @@ endif
add_global_arguments('-DUSE_LOGFILE', language: 'cpp')
# stb
fs = import('fs')
stb = include_directories('thirdparty')
add_global_arguments('-DHAS_STB', language: 'cpp')
libgBar = library('gBar',
sources,
dependencies: dependencies,
include_directories: stb,
install: true)
pkg = import('pkgconfig')

View file

@ -4,7 +4,7 @@ option('WithHyprland', type: 'boolean', value : true)
# Workspaces general, enables Wayland protocol
option('WithWorkspaces', type: 'boolean', value : true)
# Tray icons, requires stb git submodule
# Tray icons
option('WithSNI', type: 'boolean', value : true)
option('WithNvidia', type: 'boolean', value : true)

View file

@ -123,7 +123,7 @@ public:
bool hasBlueZ = false;
#endif
#if defined WITH_SNI && defined HAS_STB
#ifdef WITH_SNI
bool hasSNI = true;
#else
bool hasSNI = false;

View file

@ -11,9 +11,6 @@
#include <gio/gio.h>
#include <libdbusmenu-gtk/menu.h>
#define STB_IMAGE_IMPLEMENTATION
#include <stb/stb_image.h>
#include <fstream>
#include <cstdio>
#include <unordered_set>

1
thirdparty/stb vendored

@ -1 +0,0 @@
Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9