build: require glib >= 2.60
PATCH 1/1 build: require glib >= 2.60
Build failure in the latest version has occurred with glib 2.56.4.
src/simutil.c: In function ‘validate_utf8_tlv’:src/simutil.c:779:9: error: implicit declaration of function ‘g_utf8_validate_len’; did you mean ‘g_utf8_validate’? [-Werror=implicit-function-declaration]
return g_utf8_validate_len((const char *)tlv + 2, len, NULL);
^~~~~~~~~~~~~~~~~~~
g_utf8_validateAccording to glib documentation, "g_utf8_validate_len" is supported since 2.60
So, I sent this patch.
Regards,
JongSeok Won
--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configure.ac +2 -2
@@ -63,8 +63,8 @@ AC_CHECK_FUNC(signalfd, dummy=yes, AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes, - AC_MSG_ERROR(GLib >= 2.32 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.60, dummy=yes, + AC_MSG_ERROR(GLib >= 2.60 is required)) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) --
Hi,
configure.ac AC_CHECK_FUNC(signalfd, dummy=yes, · line 67
Quoted 4 lines
configure.ac +2
-2-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes, - AC_MSG_ERROR(GLib >= 2.32 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.60, dummy=yes, + AC_MSG_ERROR(GLib >= 2.60 is required))
This patch doesn't apply:
denkenz(a)localhost ~/ofono-master $ git am ~/merge/\[PATCH\]\ build\:\ require\
glib\ \>\=\ 2.60.eml
Applying: build: require glib >= 2.60
error: corrupt patch at line 12
Patch failed at 0001 build: require glib >= 2.60
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Looks like it is whitespace-mangled or otherwise damaged for some reason.
Regards,
-Denis
Hi, Denis
I had a mistake while making patch. So, I'll re-send the patch of V2.
Best regards
JongSeok Won
2021년 3월 5일 (금) 오후 11:49, Denis Kenzior <[email protected]>님이 작성:
Quoted 24 lines
Hi,
configure.ac AC_CHECK_FUNC(signalfd, dummy=yes, · line 67
Quoted 4 lines
configure.ac +2
-2-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes, - AC_MSG_ERROR(GLib >= 2.32 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.60, dummy=yes, + AC_MSG_ERROR(GLib >= 2.60 is required))This patch doesn't apply:
denkenz(a)localhost ~/ofono-master $ git am ~/merge/\[PATCH\]\ build\:\
require\
glib\ \>\=\ 2.60.eml
Applying: build: require glib >= 2.60
error: corrupt patch at line 12
Patch failed at 0001 build: require glib >= 2.60
hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".Looks like it is whitespace-mangled or otherwise damaged for some reason.
Regards,
-Denis
PATCH 1/1 build: require glib >= 2.60
g_utf8_validate_len() is support after glib 2.60
--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configure.ac +2 -2
@@ -63,8 +63,8 @@ AC_CHECK_FUNC(signalfd, dummy=yes, AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes, - AC_MSG_ERROR(GLib >= 2.32 is required)) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.60, dummy=yes, + AC_MSG_ERROR(GLib >= 2.60 is required)) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS)
Signature · 1 line
2.17.1
Denis Kenzior
AppliedQuoted 5 lines · JongSeok Won
g_utf8_validate_len()is support after glib 2.60--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Regards,
-Denis