summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-misc/wsmake/ChangeLog8
-rw-r--r--www-misc/wsmake/Manifest13
-rw-r--r--www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch33
-rw-r--r--www-misc/wsmake/wsmake-0.6.4.ebuild8
4 files changed, 50 insertions, 12 deletions
diff --git a/www-misc/wsmake/ChangeLog b/www-misc/wsmake/ChangeLog
index fd96f48d2c19..992e1cf96780 100644
--- a/www-misc/wsmake/ChangeLog
+++ b/www-misc/wsmake/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-misc/wsmake
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/ChangeLog,v 1.5 2008/04/21 18:21:48 phreak Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/ChangeLog,v 1.6 2009/01/30 01:29:41 dirtyepic Exp $
+
+ 30 Jan 2009; Ryan Hill <dirtyepic@gentoo.org>
+ +files/wsmake-0.6.4-gcc43.patch, wsmake-0.6.4.ebuild:
+ Fix building with GCC-4.3, bug #251745. Patch contributed by mipas.
21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
index 47f9c444dbc1..f7ff863fd9e8 100644
--- a/www-misc/wsmake/Manifest
+++ b/www-misc/wsmake/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX wsmake-0.6.4-bv.diff 308 RMD160 c7475a273b96d645b596257aa5b388ba9ce97f26 SHA1 60895a1aadfb4207fdaf2a4d492cc126e0e727d9 SHA256 f4db7881039ebb6e259c374b6b2d10945108bbc16a69322a3e6d5ec8f97377a9
+AUX wsmake-0.6.4-gcc43.patch 771 RMD160 2b6396e86ce40dda430c1d9279ee9035657a25bb SHA1 76307b0a307c7e79da2faae48c9eab3ef0886a27 SHA256 55c223f6213922a06f90d8cbb93f73eef229eaf10cb3647f4b5aa9f3836bafcf
DIST wsmake-0.6.4.tar.bz2 351688 RMD160 cfb48e73191b63cfb57fe318de8111d4feb11666 SHA1 7bd163c0f76f1ad768458964cebdf495a3fa18ce SHA256 884ca4e635d454776888526cf94f6af6639f76b317aa10f9f6d651d9208188d6
-EBUILD wsmake-0.6.4.ebuild 887 RMD160 6e126971e0273745758b7b2c956ea7561a689db3 SHA1 f833eee09dc76ce08b199f151712b1b796f5c386 SHA256 7b69116c8eabc36d76efe65af0cc87ed78e4a78299619706902dfd39fd972ce8
-MISC ChangeLog 1105 RMD160 fe0111aad0da6e31c43abfb8b076520e6dd41d2c SHA1 f9e0cee5a520ccea930d9149dce4198606ee9e21 SHA256 afbf3bf8bdd34d6a05afd057cc7fa238e865192bd13e2d9a57987b27f3db10fe
+EBUILD wsmake-0.6.4.ebuild 878 RMD160 a37b6566409123f2d552c5e2396d606f10579c39 SHA1 86444f7355e21b4b8de4872f6b9676689c20cd43 SHA256 2df4d594471917a4da606b6b40ab39642b42c58b5027d3e32601cf7b05f44dcd
+MISC ChangeLog 1283 RMD160 82c370dd942cab0befeaa341902d2c2b8e903258 SHA1 c0a4bed180d0e59a8c9a5831d687825be7875a8e SHA256 44f947c3880e8fb4ca46d226e04acb6d9a12c0ef1103669a556134c86a3536f5
MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFIDNtCyuNVb5qfaOYRAiANAKCxvSUnjqDujqF9IwBM+Pagb3usVwCcDetr
-vN8JkjAwqMcBL7LSuDf8w4s=
-=8b/V
+iEYEARECAAYFAkmCWE8ACgkQiqiDRvmkBmLQswCgu4ZH5eNL4UkUMk5TYm0NomI8
+agQAnAhgBiZGKSZyYtbOzVQLkzHr+XRX
+=ecid
-----END PGP SIGNATURE-----
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
new file mode 100644
index 000000000000..0ecfe62003f5
--- /dev/null
+++ b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/show_bug.cgi?id=251745
+https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982
+
+--- libwsmake/wsSubTag.cpp
++++ libwsmake/wsSubTag.cpp.new
+@@ -22,6 +22,7 @@
+ ***********************************************************************/
+ #include <cstdio>
+ #include <cstring>
++#include <cstdlib>
+
+ #include <unistd.h>
+ #ifdef HAVE_SYS_WAIT_H
+--- libwsmake/wsWebPage.cpp
++++ libwsmake/wsWebPage.cpp.new
+@@ -23,6 +23,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <ctime>
++#include <cstdlib>
+
+ #include "wsmake.h"
+
+--- libwsmake/wsUtil.cpp
++++ libwsmake/wsUtil.cpp.new
+@@ -28,6 +28,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <cstring>
++#include <cstdlib>
+
+ #ifdef HAVE_UTIME_H
+ #include <utime.h>
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
index 4cd48a139e38..996cfd46d926 100644
--- a/www-misc/wsmake/wsmake-0.6.4.ebuild
+++ b/www-misc/wsmake/wsmake-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/wsmake-0.6.4.ebuild,v 1.5 2007/07/15 05:58:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/wsmake/wsmake-0.6.4.ebuild,v 1.6 2009/01/30 01:29:41 dirtyepic Exp $
inherit eutils
@@ -15,8 +15,8 @@ IUSE=""
src_unpack () {
unpack ${A} && cd "${S}"
- #Apply patch to allow compiling
- epatch "${FILESDIR}/${P}-bv.diff" || die "epatch failed."
+ epatch "${FILESDIR}"/${P}-bv.diff
+ epatch "${FILESDIR}"/${P}-gcc43.patch # 251745
}
src_compile () {