projects
/
sigrok-util.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cf8cc4
)
sigrok-cross-android: Revert back to older glib(mm).
author
Uwe Hermann
<uwe@hermann-uwe.de>
Tue, 9 Feb 2016 07:42:14 +0000
(08:42 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Tue, 9 Feb 2016 11:53:43 +0000
(12:53 +0100)
Bumping the glib(mm) versions to 2.47.x seems to have caused a
regression, the Android app would fail to start with a segfault
related to g_match_info_unref() apparently.
Revert back to 2.45.x for now.
cross-compile/android/sigrok-cross-android
patch
|
blob
|
history
diff --git
a/cross-compile/android/sigrok-cross-android
b/cross-compile/android/sigrok-cross-android
index adeee91bcf9b764f62de9e6d86d1458403cc521c..395c5eefaa5175faf6ecdd4fad373ad7ef241965 100755
(executable)
--- a/
cross-compile/android/sigrok-cross-android
+++ b/
cross-compile/android/sigrok-cross-android
@@
-66,10
+66,10
@@
VER_GETTEXT=0.19.7
VER_ZLIB=1.2.8
VER_PCRE=8.38
VER_LIBFFI=3.2.1
-VER_GLIB=2.4
7.5
-VER_GLIB_SHORT=2.4
7
-VER_GLIBMM=2.4
7.4
-VER_GLIBMM_SHORT=2.4
7
+VER_GLIB=2.4
5.4
+VER_GLIB_SHORT=2.4
5
+VER_GLIBMM=2.4
5.41
+VER_GLIBMM_SHORT=2.4
5
VER_LIBSIGCXX=2.6.2
VER_LIBSIGCXX_SHORT=2.6
VER_LIBZIP=1.1