From c9dadcd65854eb7ea0018d7a1f392cd8fe0ed0ab Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sun, 15 May 2016 16:21:01 +0200
Subject: [PATCH] sigrok-cross-android: Fix a glib build issue.

Bump glib to a more recent upstream version (2.48.1), which happens to fix
the following build issue:

  m4macros/glib-gettext.m4:39: error: m4_copy: won't overwrite defined macro: glib_DEFUN

Also bump to the respective glibmm 2.48.1 version. This, in turn,
requires a newer libsigc++, so bump that to 2.9.2 as well.
---
 cross-compile/android/sigrok-cross-android | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 351b420..4b72952 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -66,12 +66,12 @@ VER_GETTEXT=0.19.7
 VER_ZLIB=1.2.8
 VER_PCRE=8.38
 VER_LIBFFI=3.2.1
-VER_GLIB=2.45.4
-VER_GLIB_SHORT=2.45
-VER_GLIBMM=2.45.41
-VER_GLIBMM_SHORT=2.45
-VER_LIBSIGCXX=2.6.2
-VER_LIBSIGCXX_SHORT=2.6
+VER_GLIB=2.48.1
+VER_GLIB_SHORT=2.48
+VER_GLIBMM=2.48.1
+VER_GLIBMM_SHORT=2.48
+VER_LIBSIGCXX=2.9.2
+VER_LIBSIGCXX_SHORT=2.9
 VER_LIBZIP=1.1
 VER_LIBFTDI1=1.2
 VER_LIBUSB=1.0.19
-- 
2.30.2