Merge pull request #444 from dkgroot/master

<net/asterisk-chan-sccp>: Update to v4.3.2-epsilon
This commit is contained in:
Jiri Slachta 2019-07-31 21:43:12 +02:00 committed by GitHub
commit 038dc388e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 42 deletions

View file

@ -9,14 +9,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=chan-sccp
PKG_VERSION:=v4.3.2-20190411
PKG_RELEASE:=2
PKG_VERSION:=v4.3.2-20190730
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=da59f2f073502645b34b458392a1fb11465f48cc
PKG_MIRROR_HASH:=a449c3384b92ff79b2db4d6b4e8dc7a3fb668f4c0f1a65baa198578b0b953ab8
PKG_SOURCE_VERSION:=08c9457b131e2e7fea92b2dfea786abfd171a5fe
PKG_MIRROR_HASH:=be86af36c2ba4524d392fab1b88e4f4ceaaea6678dd814443ae5636337ed4c77
PKG_SOURCE_PROTO:=git
PKG_FIXUP:=autoreconf

View file

@ -1,38 +0,0 @@
commit 1febe062d5ba93747ff8788ce0309c6174e3a08b
Author: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Mon May 6 21:07:48 2019 +0200
Add missing header to sccp_utils.c
With newer gcc versions (8.3 tested) compile of sccp_utils.c fails with:
CC libsccp_la-sccp_utils.lo
sccp_utils.c: In function 'sccp_utf8_columnwidth':
sccp_utils.c:1846:2: warning: implicit declaration of function 'setlocale'; did you mean 'ast_setlocale'? [-Wimplicit-function-declaration]
setlocale(LC_ALL, "");
^~~~~~~~~
ast_setlocale
sccp_utils.c:1846:12: error: 'LC_ALL' undeclared (first use in this function); did you mean 'AI_ALL'?
setlocale(LC_ALL, "");
^~~~~~
AI_ALL
sccp_utils.c:1846:12: note: each undeclared identifier is reported only once for each function it appears in
Makefile:852: recipe for target 'libsccp_la-sccp_utils.lo' failed
make[7]: *** [libsccp_la-sccp_utils.lo] Error 1
Fix this by adding the missing header.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
diff --git a/src/sccp_utils.c b/src/sccp_utils.c
index df043d1a..f917c0c9 100644
--- a/src/sccp_utils.c
+++ b/src/sccp_utils.c
@@ -10,6 +10,7 @@
*
*/
+#include <locale.h>
#include "config.h"
#include "common.h"
#include "sccp_channel.h"