diff options
6 files changed, 86 insertions, 6 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 16dd2a9fb8cc..17a310b38b6a 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.321 2011/07/11 07:47:48 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.322 2011/07/26 12:27:51 polynomial-c Exp $ + + 26 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> + seamonkey-2.0.14-r1.ebuild, + +files/seamonkey-2.0.14-curl7217-includes-fix.patch, seamonkey-2.1.ebuild, + seamonkey-2.2-r1.ebuild, +files/seamonkey-2.2-curl7217-includes-fix.patch: + Fixed compilation with >=curl-7.21.7 (bug #375899). 11 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.2-r1.ebuild: Fixed patchname diff --git a/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch b/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch new file mode 100644 index 000000000000..26b3130f3e0d --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch @@ -0,0 +1,30 @@ +--- comm-1.9.1/mozilla/config/system-headers ++++ comm-1.9.1/mozilla/config/system-headers +@@ -200,7 +200,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-1.9.1/mozilla/js/src/config/system-headers ++++ comm-1.9.1/mozilla/js/src/config/system-headers +@@ -200,7 +200,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -31,7 +31,6 @@ + #include <dlfcn.h> + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> + + #include "common/linux/http_upload.h" + diff --git a/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch b/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch new file mode 100644 index 000000000000..63d9a6ff4762 --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch @@ -0,0 +1,40 @@ +--- comm-release/mozilla/config/system-headers ++++ comm-release/mozilla/config/system-headers +@@ -207,7 +207,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-release/mozilla/js/src/config/system-headers ++++ comm-release/mozilla/js/src/config/system-headers +@@ -207,7 +207,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -33,7 +33,6 @@ + #include <dlfcn.h> + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> + + namespace { + +--- comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc ++++ comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +@@ -29,7 +29,6 @@ + + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> + #include <dlfcn.h> + + #include <iostream> diff --git a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild b/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild index 34c0315fea41..555c1b7f4c40 100644 --- a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.1 2011/06/06 14:41:21 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.2 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="2" WANT_AUTOCONF="2.1" @@ -154,6 +154,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" + epatch "${FILESDIR}"/${PN}-2.0.14-curl7217-includes-fix.patch + if use crypt && use mailclient ; then mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail cd "${S}"/mailnews/extensions/enigmail || die diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild index fd9e993f3e57..c9bd6575e794 100644 --- a/www-client/seamonkey/seamonkey-2.1.ebuild +++ b/www-client/seamonkey/seamonkey-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.4 2011/07/08 16:37:14 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.5 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -138,7 +138,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" - epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff + epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ + "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch # Allow user to apply any additional patches without modifing ebuild epatch_user diff --git a/www-client/seamonkey/seamonkey-2.2-r1.ebuild b/www-client/seamonkey/seamonkey-2.2-r1.ebuild index f708fd95be36..2bf2c341ce8a 100644 --- a/www-client/seamonkey/seamonkey-2.2-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r1.ebuild,v 1.2 2011/07/11 07:47:48 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r1.ebuild,v 1.3 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -153,7 +153,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" - epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff + epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ + "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch # Allow user to apply any additional patches without modifing ebuild epatch_user |