Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linknx: Update iconv patch to work with libiconv-full

Browse source 
libiconv-full requires a const char for its second parameter. Otherwise
-fpermissive error is thrown.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from ee94a1e912)
This commit is contained in:
Rosen Penev 2019-06-28 16:01:04 -07:00
parent 31ede9e5b0
commit abf1bfb20a
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/linknx/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=linknx
PKG_VERSION:=0.0.1.37
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-${PKG_VERSION}.tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/linknx/linknx/tar.gz/$(PKG_VERSION)?

31
net/linknx/patches/010-iconv.patch
View file

@ -1,3 +1,18 @@
From 8c025865f7cc57761d2227b897ba3980090391c2 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 24 Jun 2019 14:13:34 -0700
Subject: [PATCH] Use AM_ICONV for properly supporting libiconv
AM_ICONV does multiple things like checking the function parameters to
avoid const problems.
---
configure.ac | 1 +
src/Makefile.am | 2 +-
src/objectcontroller.cpp | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 22f242c..23582cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ PKG_CONFIG=`which pkg-config`
@ -8,6 +23,8 @@
AC_CHECK_PTHSEM(2.0.4,yes,yes,no)
AC_CHECK_HEADER(argp.h,,[AC_MSG_ERROR([argp_parse not found])])
AC_SEARCH_LIBS(argp_parse,argp,,[AC_MSG_ERROR([argp_parse not found])])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a4f493..6e0dc03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,5 +7,5 @@ B64_CFLAGS=
@ -17,3 +34,17 @@
-linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
+linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(LIBICONV) $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h
diff --git a/src/objectcontroller.cpp b/src/objectcontroller.cpp
index fb2fc3a..7622491 100644
--- a/src/objectcontroller.cpp
+++ b/src/objectcontroller.cpp
@@ -2925,7 +2925,7 @@ std::string StringObjectValue::transcode(const std::string &source, const std::s
iconv_t conversionDescriptor = iconv_open((targetEncoding + "//TRANSLIT").c_str(), sourceEncoding.c_str());
char cSource[source.size()];
memcpy(cSource, source.c_str(), source.size() + 1);
- char *sourceStart = &cSource[0];
+ ICONV_CONST char *sourceStart = &cSource[0];
size_t sourceLength = source.size();
const size_t targetLength = source.size() * 5; // Should be pretty enough even in worst cases.
char targetChars[targetLength];