From 2c490b7fd12012561ad76ef4b757805ee10fbdb6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 21 Jun 2018 21:09:49 +0200 Subject: [PATCH] freeswitch-stable: fix incompatible pointer type Currently compiles fail with: CC libfreeswitch_la-switch_regex.lo src/switch_regex.c: In function 'switch_regex_compile': src/switch_regex.c:40:9: error: return from incompatible pointer type [-Werror=incompatible-pointer-types] return pcre_compile(pattern, options, errorptr, erroroffset, tables); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Makefile:2100: recipe for target 'libfreeswitch_la-switch_regex.lo' failed make[5]: *** [libfreeswitch_la-switch_regex.lo] Error 1 Fix cherry-picked from upstream. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 2 +- .../patches/350-fix-pcre-pointer-type.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/freeswitch-stable/patches/350-fix-pcre-pointer-type.patch diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index e3258c3..be3b6bf 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PRG_NAME:=freeswitch PKG_NAME:=$(PRG_NAME)-stable PKG_VERSION:=1.6.20 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz diff --git a/net/freeswitch-stable/patches/350-fix-pcre-pointer-type.patch b/net/freeswitch-stable/patches/350-fix-pcre-pointer-type.patch new file mode 100644 index 0000000..dbbd0ff --- /dev/null +++ b/net/freeswitch-stable/patches/350-fix-pcre-pointer-type.patch @@ -0,0 +1,11 @@ +--- a/src/switch_regex.c ++++ b/src/switch_regex.c +@@ -37,7 +37,7 @@ SWITCH_DECLARE(switch_regex_t *) switch_ + int options, const char **errorptr, int *erroroffset, const unsigned char *tables) + { + +- return pcre_compile(pattern, options, errorptr, erroroffset, tables); ++ return (switch_regex_t *)pcre_compile(pattern, options, errorptr, erroroffset, tables); + + } +