From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 2 Jan 2011 00:54:07 +0000 (+0000)
Subject: [packages] imspector: remove iconv workarounds
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3457f7a12216204e14c482dfcc1bafd60e63fcb0

[packages] imspector: remove iconv workarounds


SVN-Revision: 24876
---

diff --git a/net/imspector/patches/100-iconv_const.patch b/net/imspector/patches/100-iconv_const.patch
deleted file mode 100644
index 42571751b8..0000000000
--- a/net/imspector/patches/100-iconv_const.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/icqprotocolplugin.cpp
-+++ b/icqprotocolplugin.cpp
-@@ -668,7 +668,7 @@ int getmessage(GET_ARGS, std::string &me
- 					char converted_string[BUFFER_SIZE];
- 					memset(converted_string, 0, BUFFER_SIZE);
- 					
--					char *inbuf = string;
-+					const char *inbuf = string;
- 					char *outbuf = converted_string;
- 					size_t inbytesleft = mylength - 4;
- 					size_t outbytesleft = BUFFER_SIZE - 1; /* Trailing \0 */
diff --git a/net/imspector/patches/110-iconv_link.patch b/net/imspector/patches/110-iconv_link.patch
deleted file mode 100644
index d755884b1a..0000000000
--- a/net/imspector/patches/110-iconv_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,7 @@ libimspector.so: $(LIBIMSPECTOR_OBJS)
- msnprotocolplugin.so: msnprotocolplugin.o libimspector.so
- 	$(CXX) msnprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
- icqprotocolplugin.so: icqprotocolplugin.o libimspector.so
--	$(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
-+	$(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) -L$(PREFIX)/lib/libiconv/lib -liconv
- yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so
- 	$(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
- ircprotocolplugin.so: ircprotocolplugin.o libimspector.so