summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-25 19:47:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-25 19:47:19 +0000
commit661d9232350874478af2b6238a27daca1d77d824 (patch)
treecf5617a50202b45ecd8d81eeaad6ce88092abd46 /x11-plugins
parentAdd patch to fix compilation with gcc-4.4; bug #276510 (diff)
downloadhistorical-661d9232350874478af2b6238a27daca1d77d824.tar.gz
historical-661d9232350874478af2b6238a27daca1d77d824.tar.bz2
historical-661d9232350874478af2b6238a27daca1d77d824.zip
Fix building with GCC 4.4 wrt #274000.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmmsens/ChangeLog8
-rw-r--r--x11-plugins/wmmsens/Manifest15
-rw-r--r--x11-plugins/wmmsens/files/wmmsens-0.29.8-gcc44.patch11
-rw-r--r--x11-plugins/wmmsens/wmmsens-0.29.8.ebuild9
4 files changed, 25 insertions, 18 deletions
diff --git a/x11-plugins/wmmsens/ChangeLog b/x11-plugins/wmmsens/ChangeLog
index 0481f8d18476..fb6d62c2dab1 100644
--- a/x11-plugins/wmmsens/ChangeLog
+++ b/x11-plugins/wmmsens/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/wmmsens
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.12 2008/06/28 07:11:39 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/ChangeLog,v 1.13 2009/07/25 19:47:15 ssuominen Exp $
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> wmmsens-0.29.8.ebuild,
+ +files/wmmsens-0.29.8-gcc44.patch:
+ Fix building with GCC 4.4 wrt #274000.
28 Jun 2008; Markus Meier <maekke@gentoo.org> wmmsens-0.29.8.ebuild:
x86 stable, bug #229587
diff --git a/x11-plugins/wmmsens/Manifest b/x11-plugins/wmmsens/Manifest
index cf41c0fd13e7..8f4db719dfc8 100644
--- a/x11-plugins/wmmsens/Manifest
+++ b/x11-plugins/wmmsens/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX wmmsens-0.29.8-gcc44.patch 314 RMD160 6b5c160874cd3101f81dc32f277fd8968b4db383 SHA1 cbb09105e0cac4992720c80c9299c2e5e8921cdf SHA256 138e6a174905df30857f29737391fde7ed34bbdcf2e79402f1b45c03cefe9e9e
DIST wmmsens-0.29.6.tar.gz 30817 RMD160 99f7d3f3411939b0ae21c2a738a6f5def12ab076 SHA1 f1583a0240dbbe73868433b17dc8f35ac726b8c5 SHA256 12369824e64cea36dfb0a7fdce3319b6ed8ee25f07181f3a44c2c9d928a6574c
DIST wmmsens-0.29.8.tar.gz 31752 RMD160 f0bc5b588f1cc8e147ceece4ef54d469ccc86ce6 SHA1 b172f94165f9fc3b048ec8b34caaf26abe7d484f SHA256 9f8df3ec729aba92e045ff7f593cbf61024f750589ea943b2516661b8b6729a9
EBUILD wmmsens-0.29.6.ebuild 997 RMD160 6acbfe2f6e41853ade9b39117ddd29021ea2ceb0 SHA1 084acea77742d2dce73be51ae76b1222b2f85278 SHA256 b8822879b13c773f4a467e22b80263d42d498c0e5a31cf549671c501e9e7e220
-EBUILD wmmsens-0.29.8.ebuild 973 RMD160 1b79048b399702beda43cff22ce1c19c152130f3 SHA1 c12875b048799fd28907a807273d9698502d287b SHA256 114e87a2e0c35ac13a2b5bdddaa98e941bce655edd90eae0cf2f550b8dd6956c
-MISC ChangeLog 1418 RMD160 20cc4885b6625a82d397e7d88834f8dc4696c595 SHA1 da9764401de2ed73c16e63f00b937b81d342d786 SHA256 80a3f691443aaaf45c67ec7f5fe1b10f46175df38fad7d481a65000ec270c519
+EBUILD wmmsens-0.29.8.ebuild 1021 RMD160 aa74be4f7dc030dce0ede3e01772afbaba9514bd SHA1 d15307e67d8b12fe37f8c56de8578c8999732a96 SHA256 42d26cecc7295b23845f02473f30f659b8ac891ed39acc49debe8a852d719702
+MISC ChangeLog 1577 RMD160 e4581ffcfd715ac3230e128b3cc3e67cb66e12b8 SHA1 bc48f29d618a4089c13b94f3310262a60110580e SHA256 76162f526a6e36a634c5e0d23c8f1e3cd83176faa290211a84f7e5a368bcf69b
MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhl5GwACgkQkKaRLQcq0GJKVQCeMjfeVtVI8Yzz3zIdYpyeUuGR
-T1gAoJBf64a2vKXeL5zkEjfqr30ccoBl
-=PbRD
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmsens/files/wmmsens-0.29.8-gcc44.patch b/x11-plugins/wmmsens/files/wmmsens-0.29.8-gcc44.patch
new file mode 100644
index 000000000000..90fc4b18690d
--- /dev/null
+++ b/x11-plugins/wmmsens/files/wmmsens-0.29.8-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur wmmsens-0.29.8.orig/src/main.c wmmsens-0.29.8/src/main.c
+--- wmmsens-0.29.8.orig/src/main.c 2005-07-05 01:18:21.000000000 +0300
++++ wmmsens-0.29.8/src/main.c 2009-07-25 22:45:56.000000000 +0300
+@@ -119,6 +119,7 @@
+ //
+ //
+
++#include <cstdlib>
+ #include <iostream>
+ #include <iomanip>
+ #include <fstream>
diff --git a/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild b/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild
index 59c0ac50c451..87d3c5d1bbe6 100644
--- a/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild
+++ b/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild,v 1.2 2008/06/28 07:11:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmsens/wmmsens-0.29.8.ebuild,v 1.3 2009/07/25 19:47:15 ssuominen Exp $
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="a dockapp for monitoring hardware sensors (sys-apps/lm_sensors)"
HOMEPAGE="http://www.digressed.net/wmmsens"
@@ -10,7 +10,7 @@ SRC_URI="http://www.digressed.net/${PN}/src/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="sys-apps/lm_sensors
@@ -24,6 +24,7 @@ S=${WORKDIR}/${P}/src
src_unpack() {
unpack ${A}
+ epatch "${FILESDIR}"/${P}-gcc44.patch
sed -e 's:$(OBJS) $(LDFLAGS):$(LDFLAGS) $(OBJS) $(LIBS):g' \
-e 's:LDFLAGS = -L/usr/X11R6/lib:LIBS =:' -e '/DELETE/q' \
-i "${S}"/Makefile