From:   Szymon Janc <szymon.janc@codecoup.pl>
To:     linux-bluetooth@vger.kernel.org
Cc:     Szymon Janc <szymon.janc@codecoup.pl>
Subject: [PATCH] build: Bump glib dependency to 2.32
Date:   Fri, 19 Apr 2019 12:51:46 +0200
Message-Id: <20190419105146.29272-1-szymon.janc@codecoup.pl>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

make --no-print-directory all-am
  CC       client/main.o
In file included from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
                 from /usr/include/glib-2.0/glib.h:32,
                 from client/main.c:36:
/usr/include/glib-2.0/glib/gthread.h: In function ‘g_rec_mutex_locker_new’:
/usr/include/glib-2.0/glib/gthread.h:390:3: error: ‘g_rec_mutex_lock’ is deprecated: Not available before 2.32 [-Werror=deprecated-declarations]
   g_rec_mutex_lock (rec_mutex);
   ^~~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gthread.h:196:17: note: declared here
 void            g_rec_mutex_lock                (GRecMutex      *rec_mutex);
                 ^~~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gthread.h: In function ‘g_rec_mutex_locker_free’:
/usr/include/glib-2.0/glib/gthread.h:405:3: error: ‘g_rec_mutex_unlock’ is deprecated: Not available before 2.32 [-Werror=deprecated-declarations]
   g_rec_mutex_unlock ((GRecMutex *) locker);
   ^~~~~~~~~~~~~~~~~~
/usr/include/glib-2.0/glib/gthread.h:200:17: note: declared here
 void            g_rec_mutex_unlock              (GRecMutex      *rec_mutex);
                 ^~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:6579: client/main.o] Error 1
---
 acinclude.m4 | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index bc39c6d73..4565f77e3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,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_28"
+		with_cflags="$with_cflags -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
+		with_cflags="$with_cflags -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
 	fi
 	AC_SUBST([WARNING_CFLAGS], $with_cflags)
 ])
diff --git a/configure.ac b/configure.ac
index 0afe1e6db..1b4ef77f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,8 @@ AC_CHECK_LIB(dl, dlopen, dummy=yes,
 
 AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes,
-				AC_MSG_ERROR(GLib >= 2.28 is required))
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes,
+				AC_MSG_ERROR(GLib >= 2.32 is required))
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-- 
2.20.1