| Message ID | 20241022120051.123888-2-hadess@hadess.net |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix bluetoothctl --help hanging if daemon isn't running | expand |
This is an automated email and please do not reply to this email. Dear Submitter, Thank you for submitting the patches to the linux bluetooth mailing list. While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository. ----- Output ----- error: patch failed: client/main.c:3187 error: client/main.c: patch does not apply hint: Use 'git am --show-current-patch' to see the failed patch Please resolve the issue and submit the patches again. --- Regards, Linux Bluetooth
On Tue, 2024-10-22 at 14:40 +0200, Bastien Nocera wrote: > On Tue, 2024-10-22 at 05:31 -0700, bluez.test.bot@gmail.com wrote: > > This is an automated email and please do not reply to this email. > > > > Dear Submitter, > > > > Thank you for submitting the patches to the linux bluetooth mailing > > list. > > While preparing the CI tests, the patches you submitted couldn't be > > applied to the current HEAD of the repository. > > > > ----- Output ----- > > > > error: patch failed: client/main.c:3187 > > error: client/main.c: patch does not apply > > hint: Use 'git am --show-current-patch' to see the failed patch > > > > Please resolve the issue and submit the patches again. > > Which patch is that for? The error message doesn't say. Figured it out. Happy to send a patch to the bot if somebody tells me where its code lives.
diff --git a/acinclude.m4 b/acinclude.m4 index 4b73a5bfc38f..d0bfe6ccb2fa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -62,8 +62,8 @@ AC_DEFUN([COMPILER_FLAGS], [ with_cflags="$with_cflags -Wswitch-enum" with_cflags="$with_cflags -Wformat -Wformat-security" with_cflags="$with_cflags -DG_DISABLE_DEPRECATED" - with_cflags="$with_cflags -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_28" - with_cflags="$with_cflags -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32" + with_cflags="$with_cflags -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34" + with_cflags="$with_cflags -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34" fi AC_SUBST([WARNING_CFLAGS], $with_cflags) ]) diff --git a/configure.ac b/configure.ac index 7093e41ff714..14bd15293918 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AC_CHECK_DECLS([basename], [], ]) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.34) if (test "${enable_threads}" = "yes"); then AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required])