Fix broken compilation on gcc-4.1.

(Portage version: 2.1.1)

4 files changed, 53 insertions, 3 deletions

diff --git a/app-mobilephone/sms/ChangeLog b/app-mobilephone/sms/ChangeLog
index 587ad225a45d..4c3197e31e54 100644
--- a/app-mobilephone/sms/ChangeLog
+++ b/app-mobilephone/sms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/sms
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.3 2006/04/13 20:03:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.4 2006/09/24 11:16:40 mrness Exp $
+
+  24 Sep 2006; Alin Nastac <mrness@gentoo.org> +files/sms-2.0.3-gcc41.patch,
+  sms-2.0.3.ebuild:
+  Fix broken compilation on gcc-4.1.
 
   13 Apr 2006; Alin Nastac <mrness@gentoo.org> sms-2.0.3.ebuild:
   Simplify dependencies.
diff --git a/app-mobilephone/sms/files/digest-sms-2.0.3 b/app-mobilephone/sms/files/digest-sms-2.0.3
index 891b91798a71..ad1f2b46408c 100644
--- a/app-mobilephone/sms/files/digest-sms-2.0.3
+++ b/app-mobilephone/sms/files/digest-sms-2.0.3
@@ -1 +1,3 @@
 MD5 d238c15e705aa4999aaf459e2fc1e821 sms-2.0.3.tar.gz 48450
+RMD160 20adede9e00fe844141e1dfb6c2e462433c46626 sms-2.0.3.tar.gz 48450
+SHA256 e7f8792732772e56489232f0e671128e39472609466424d9ac33c1956ebb451f sms-2.0.3.tar.gz 48450
diff --git a/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch b/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch
new file mode 100644
index 000000000000..39c7973ca3f2
--- /dev/null
+++ b/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch
@@ -0,0 +1,38 @@
+diff -Nru sms-2.0.3.orig/lib/mr_curl/mr_curl.cc sms-2.0.3/lib/mr_curl/mr_curl.cc
+--- sms-2.0.3.orig/lib/mr_curl/mr_curl.cc	2005-02-04 02:37:39.000000000 +0200
++++ sms-2.0.3/lib/mr_curl/mr_curl.cc	2006-09-24 13:48:25.725464250 +0300
+@@ -4,6 +4,18 @@
+ 
+ using namespace std;
+ 
++size_t Curl_write_data(const void *ptr, size_t size,
++		size_t nmemb, Curl *curl) {
++	curl->buffer->write((const char*)ptr, size * nmemb);
++	return curl->buffer->bad() ? 0 : size*nmemb;
++}
++
++size_t Curl_write_header(const void *ptr, size_t size,
++		size_t nmemb, Curl *curl) {
++	curl->headers->write((const char*)ptr, size * nmemb);
++	return curl->headers->bad() ? 0 : size*nmemb;
++}
++
+ void FormParser::SetPage(const std::string &new_html)
+ {
+ 	action = "";
+@@ -428,15 +440,3 @@
+ 	SetOpt(CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ 
+-size_t Curl_write_data(const void *ptr, size_t size,
+-		size_t nmemb, Curl *curl) {
+-	curl->buffer->write((const char*)ptr, size * nmemb);
+-	return curl->buffer->bad() ? 0 : size*nmemb;
+-}
+-
+-size_t Curl_write_header(const void *ptr, size_t size,
+-		size_t nmemb, Curl *curl) {
+-	curl->headers->write((const char*)ptr, size * nmemb);
+-	return curl->headers->bad() ? 0 : size*nmemb;
+-}
+-
diff --git a/app-mobilephone/sms/sms-2.0.3.ebuild b/app-mobilephone/sms/sms-2.0.3.ebuild
index 5c129a6e2936..4a9110716895 100644
--- a/app-mobilephone/sms/sms-2.0.3.ebuild
+++ b/app-mobilephone/sms/sms-2.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.3 2006/04/13 20:03:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.4 2006/09/24 11:16:40 mrness Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Command line program for sending SMS to Polish GSM mobile phone users"
 HOMEPAGE="http://ceti.pl/~miki/komputery/sms.html"
@@ -18,6 +18,12 @@ DEPEND="sys-libs/gdbm
 	dev-libs/pcre++
 	net-misc/curl"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_compile() {
 	emake CXX=$(tc-getCXX) CXXFLAGS="${CXXFLAGS} -I./lib" LDFLAGS="-lc" || die "make failed"
 }