From aecd6d22cf15fdd204e8952be41d7782c582dba9 Mon Sep 17 00:00:00 2001 From: lbonn Date: Mon, 8 Jul 2024 22:52:03 +0200 Subject: [PATCH 1/2] Fix some compiler warnings * -Wno-inline in autoconf builds (was already in meson builds) * Use non-deprecated name for g_spawn_check_wait_status * Update libgwater --- configure.ac | 2 +- source/rofi-icon-fetcher.c | 4 ++-- subprojects/libgwater | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c658aed9d..499bdf4d8 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AM_PROG_AR dnl --------------------------------------------------------------------- dnl Base CFLAGS dnl --------------------------------------------------------------------- -AM_CFLAGS="-Wall -Wextra -Wparentheses -Winline -pedantic -Wno-overlength-strings -Wunreachable-code" +AM_CFLAGS="-Wall -Wextra -Wparentheses -Wno-inline -pedantic -Wno-overlength-strings -Wunreachable-code" dnl --------------------------------------------------------------------- dnl Enable source code coverage reporting for GCC diff --git a/source/rofi-icon-fetcher.c b/source/rofi-icon-fetcher.c index e22a49757..acdf460e2 100644 --- a/source/rofi-icon-fetcher.c +++ b/source/rofi-icon-fetcher.c @@ -210,11 +210,11 @@ static gboolean exec_thumbnailer_command(gchar **command_args) { NULL, G_SPAWN_DEFAULT | G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &wait_status, &error); if (spawned) { - return g_spawn_check_exit_status(wait_status, NULL); + return g_spawn_check_wait_status(wait_status, NULL); } else { g_warning("Error calling thumbnailer: %s", error->message); g_error_free(error); - + return FALSE; } } diff --git a/subprojects/libgwater b/subprojects/libgwater index 42a145150..d86f9903e 160000 --- a/subprojects/libgwater +++ b/subprojects/libgwater @@ -1 +1 @@ -Subproject commit 42a145150cff135be377754486c504836ddea836 +Subproject commit d86f9903efb9c490c0e3b0316d7f2da5b5a5632c From d55d85ad2baabc131918a4b2e2a02f0f5c04c796 Mon Sep 17 00:00:00 2001 From: lbonn Date: Mon, 8 Jul 2024 23:08:50 +0200 Subject: [PATCH 2/2] [Autotools] Ship missing files for meson build --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 509f7761c..3471bb560 100644 --- a/Makefile.am +++ b/Makefile.am @@ -673,6 +673,7 @@ desktop_DATA=\ data/rofi-theme-selector.desktop EXTRA_DIST += \ + doc/man_filter.lua \ doc/meson.build \ subprojects/libgwater/mpd/meson.build \ subprojects/libgwater/nl/meson.build \ @@ -697,6 +698,7 @@ EXTRA_DIST += \ subprojects/libgwater/alsa-mixer/libgwater-alsa-mixer.h \ subprojects/libgwater/alsa-mixer/libgwater-alsa-mixer.c \ data/rofi.png\ + meson-dist-script \ meson_options.txt \ meson.build