Fixed bug #136675 (gcc-4).

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 36 insertions, 16 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index d50b5f98ac66..00ef5a32f4a9 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.54 2006/06/12 19:06:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.55 2006/06/22 21:49:56 kugelfang Exp $
+
+  22 Jun 2006; Danny van Dyk <kugelfang@gentoo.org>
+  +files/xosd-2.2.8-libxosd.patch, xosd-2.2.8-r1.ebuild:
+  Fixed bug #136675 (gcc-4).
 
   12 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> xosd-2.2.14-r1.ebuild:
   Add confcache restriction, probabably build system's fault. Thanks to Bo
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index e18eb2b3eb96..446e496c6848 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -13,6 +13,10 @@ AUX xosd-2.2.14-m4.patch 242 RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 SHA
 MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
 RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 files/xosd-2.2.14-m4.patch 242
 SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015 files/xosd-2.2.14-m4.patch 242
+AUX xosd-2.2.8-libxosd.patch 465 RMD160 ba9b27aa2b92e4d4e8938359144d96c5ebda04e5 SHA1 d7c7bb53e99efde568c436a127575fddca745c2c SHA256 cf3ab0a0d29e6da56335bea6b05ace7ad48e27d1c6a354c79176595c24a75041
+MD5 08fc933b679435968b31820a9754639a files/xosd-2.2.8-libxosd.patch 465
+RMD160 ba9b27aa2b92e4d4e8938359144d96c5ebda04e5 files/xosd-2.2.8-libxosd.patch 465
+SHA256 cf3ab0a0d29e6da56335bea6b05ace7ad48e27d1c6a354c79176595c24a75041 files/xosd-2.2.8-libxosd.patch 465
 DIST xosd-2.2.10.tar.bz2 285927 RMD160 78c92a47f1b56e69a6e36771e5d68e38b9f47954 SHA1 13d1482adaed6391702548bc18ec61a70ca5e985 SHA256 117c6f0f9a0b09802700ec2fee09a088cf09d3e63fe11f998f8aaed53f3e3d21
 DIST xosd-2.2.8.tar.bz2 281156 RMD160 a5ec252699c03b324857ae7d1e32c6c34fe3fc6a SHA1 c8261cb6bfc957ba4a91e6b1d118d23e8180882e SHA256 5e582e6f8ec8595b743302712d595f32eac9d65bfaa4b1dcb1d01b419ff9e422
 DIST xosd-gentoo-m4-1.tar.bz2 5043 RMD160 6b464fe90adcee353064db37634bde7255dd0426 SHA1 0e00123455bd5bb8221613d6ee0895b607f21c0d SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f
@@ -26,14 +30,14 @@ EBUILD xosd-2.2.14-r1.ebuild 1616 RMD160 78be507971afb0cb23faec7db0eaeb3bc33f369
 MD5 333b6d897ff18a6c15aff773c2d2521a xosd-2.2.14-r1.ebuild 1616
 RMD160 78be507971afb0cb23faec7db0eaeb3bc33f369c xosd-2.2.14-r1.ebuild 1616
 SHA256 e55c2d97fcfaba544e479b10ac616d60415c0a5d925bb9a0c9292abbec3ea942 xosd-2.2.14-r1.ebuild 1616
-EBUILD xosd-2.2.8-r1.ebuild 1144 RMD160 da4d9141d90f646c6938aafbcdf21166868743bc SHA1 f22f407f4030173b79719ae1f153efc7c9f3adb2 SHA256 0217919e21f047049c5d402df32df5fdb640b088bd6618c58aa9bc7ec8174e93
-MD5 bb3a182987473e7a1274f3e7652c485c xosd-2.2.8-r1.ebuild 1144
-RMD160 da4d9141d90f646c6938aafbcdf21166868743bc xosd-2.2.8-r1.ebuild 1144
-SHA256 0217919e21f047049c5d402df32df5fdb640b088bd6618c58aa9bc7ec8174e93 xosd-2.2.8-r1.ebuild 1144
-MISC ChangeLog 7386 RMD160 46a0043eaa56c9c74e3620dc995cceaa5a329325 SHA1 c989fd6c7d2fe6d694eddbe100e338a44f3ef97d SHA256 25c77587a366d2badbfe0aa21a8206a18341dbcee0ab3249c0fd96a204b71636
-MD5 a16e622b897a9e393a5faa77bb0e0bcb ChangeLog 7386
-RMD160 46a0043eaa56c9c74e3620dc995cceaa5a329325 ChangeLog 7386
-SHA256 25c77587a366d2badbfe0aa21a8206a18341dbcee0ab3249c0fd96a204b71636 ChangeLog 7386
+EBUILD xosd-2.2.8-r1.ebuild 1190 RMD160 36517905170bb7ded2bd28ffec36528d384fed10 SHA1 32a4166d9e5b8b815ce2855d630219552bd6062c SHA256 03f085b3d33594dfdd6fa6da8e57b8ca0e5f450d3ac9a75ea4552a4af3ec7252
+MD5 e9d469a806759c2ab87bbea576049ab5 xosd-2.2.8-r1.ebuild 1190
+RMD160 36517905170bb7ded2bd28ffec36528d384fed10 xosd-2.2.8-r1.ebuild 1190
+SHA256 03f085b3d33594dfdd6fa6da8e57b8ca0e5f450d3ac9a75ea4552a4af3ec7252 xosd-2.2.8-r1.ebuild 1190
+MISC ChangeLog 7525 RMD160 19a6bad80c36e7f5deb27f35a6c7a1ae39b87e51 SHA1 0de60a376fc2a8ebfe1bb5aa8c649ebbc5a8f170 SHA256 aa6a52b87f1fd243f04e34cc8f3a2a25fb157389d3f408c59a2971e4afe7b837
+MD5 43765f3e4d0a5e4ae111edac4620a58d ChangeLog 7525
+RMD160 19a6bad80c36e7f5deb27f35a6c7a1ae39b87e51 ChangeLog 7525
+SHA256 aa6a52b87f1fd243f04e34cc8f3a2a25fb157389d3f408c59a2971e4afe7b837 ChangeLog 7525
 MISC metadata.xml 253 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 SHA1 3a8933b91cfe570a857153b2774464411b845b7d SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
@@ -48,9 +52,9 @@ MD5 208156b10521262aa1c37677c710c9cd files/digest-xosd-2.2.8-r1 235
 RMD160 f751608b3a8f6c021f9e56e116acf41d0838d161 files/digest-xosd-2.2.8-r1 235
 SHA256 c33403732545fb95f2207b2803906b85ea3297d3a071c70fc5474bb0aefa1397 files/digest-xosd-2.2.8-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEjbtaAiZjviIA2XgRAjinAKCuUoc0Gb9bYXVuvsD2ofnhX4zJbQCggxPp
-e951XcHzvOqBLXAn0P1YU8c=
-=TWBZ
+iD8DBQFEmxO25mJXAu5GbtIRAr9EAJ0ezh1xJSxYr94Ih3xVO/TcAlTuqwCdHr0v
+MfgZ59fVgp8vVWPvT1gsYnA=
+=v3sI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xosd/files/xosd-2.2.8-libxosd.patch b/x11-libs/xosd/files/xosd-2.2.8-libxosd.patch
new file mode 100644
index 000000000000..313fde78adb9
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.8-libxosd.patch
@@ -0,0 +1,11 @@
+--- src/libxosd/xosd.c.orig	2006-06-22 23:42:29.000000000 +0200
++++ src/libxosd/xosd.c	2006-06-22 23:44:56.000000000 +0200
+@@ -68,7 +68,7 @@
+ 
+ const char *osd_default_font =
+   "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
+-static const char *osd_default_colour = "green";
++const char *osd_default_colour = "green";
+ 
+ // const char* osd_default_font="adobe-helvetica-bold-r-*-*-10-*";
+ // const char* osd_default_font="-adobe-helvetica-bold-r-*-*-10-*";
diff --git a/x11-libs/xosd/xosd-2.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
index efd118687579..568fdfdac17e 100644
--- a/x11-libs/xosd/xosd-2.2.8-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.9 2006/01/08 01:37:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.10 2006/06/22 21:49:56 kugelfang Exp $
 
 inherit eutils
 
@@ -26,7 +26,8 @@ DEPEND="|| ( (
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-xmms-trackpos.patch
+	epatch "${FILESDIR}"/${PV}-xmms-trackpos.patch
+	epatch "${FILESDIR}"/${P}-libxosd.patch
 }
 
 src_compile() {