Added a patch that fixes wrong return value checking. Closes bug #72481.

diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog
index 39d943dbca1b4a8cc27e8f0a006c3c9cbab062e7..de50ede3a35ce950ab7bd137458a5c200ae5a2de 100644 (file)
--- a/net-irc/xchatosd/ChangeLog
+++ b/net-irc/xchatosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchatosd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.4 2004/10/01 01:14:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.5 2004/12/04 22:44:57 swegener Exp $
+
+  04 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  +files/5.12-return-values.patch, xchatosd-5.12.ebuild:
+  Added a patch that fixes wrong return value checking. Closes bug #72481.
 
   01 Oct 2004; Sven Wegener <swegener@gentoo.org> xchatosd-5.12.ebuild:
   Marked stable on x86.

diff --git a/net-irc/xchatosd/Manifest b/net-irc/xchatosd/Manifest
index 2c92d4fc2d87f07c4c557b59a88dd6679a2f3d7e..2d987c7291a37d469e958040087fd1e11842991f 100644 (file)
--- a/net-irc/xchatosd/Manifest
+++ b/net-irc/xchatosd/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 29cf72065904cb2356c2cb8104196f2e ChangeLog 653
+MD5 8bb7c5cd82642700f132fa51f2f0b272 xchatosd-5.12.ebuild 1076
+MD5 60b08f410c0cf347b33a510346b53c90 ChangeLog 836
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 5d06e4470165a0beeae0fcdec6748e0e xchatosd-5.12.ebuild 1013
 MD5 81c1e430042db312cd8ebfcde85c3a25 files/digest-xchatosd-5.12 63
+MD5 aa8f7d8a41446470ada6599787802bd1 files/5.12-return-values.patch 1486
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBXK+cI1lqEGTUzyQRAp+1AKCNMPGmEzh2SN5PSqWGmcQrvuwJVwCgkKb8
-tuprHFC0jFEpd+lIsN7ftd4=
-=VpO1
+iD8DBQFBsj3wI1lqEGTUzyQRAj2nAJ4jX6ifyNplCOOTbiVzgQGQsYgy/wCgqWlr
+sbq7mXgzyijGcHT0mbFGfsY=
+=Rews
 -----END PGP SIGNATURE-----

diff --git a/net-irc/xchatosd/files/5.12-return-values.patch b/net-irc/xchatosd/files/5.12-return-values.patch
new file mode 100644 (file)
index 0000000..5c82d62
--- /dev/null
+++ b/net-irc/xchatosd/files/5.12-return-values.patch
@@ -0,0 +1,39 @@
+diff -Nur xchatosd-5.12.orig/xchatosd.c xchatosd-5.12/xchatosd.c
+--- xchatosd-5.12.orig/xchatosd.c      2004-12-04 23:30:10.621652464 +0100
++++ xchatosd-5.12/xchatosd.c   2004-12-04 23:31:10.636339349 +0100
+@@ -192,16 +192,25 @@
+       }
+       int status = 0;
+ 
+-      status += xosd_set_pos(osd, conf.pos);
+-      status += xosd_set_vertical_offset(osd, conf.voffset);
+-      status += xosd_set_horizontal_offset(osd, conf.hoffset);
+-      status += xosd_set_align(osd, conf.align);
+-      status += xosd_set_shadow_offset(osd, conf.shadow_offset);
+-      status += xosd_set_timeout(osd, conf.timeout);
+-      status += xosd_set_font(osd, conf.font);
+-      status += xosd_set_colour(osd, conf.color);
+-      status += xosd_display(osd, 0, XOSD_string, MSG_Hello);
+-      return status;
++      status = xosd_set_pos(osd, conf.pos);
++      if (-1 == status) return -1;
++      status = xosd_set_vertical_offset(osd, conf.voffset);
++      if (-1 == status) return -1;
++      status = xosd_set_horizontal_offset(osd, conf.hoffset);
++      if (-1 == status) return -1;
++      status = xosd_set_align(osd, conf.align);
++      if (-1 == status) return -1;
++      status = xosd_set_shadow_offset(osd, conf.shadow_offset);
++      if (-1 == status) return -1;
++      status = xosd_set_timeout(osd, conf.timeout);
++      if (-1 == status) return -1;
++      status = xosd_set_font(osd, conf.font);
++      if (-1 == status) return -1;
++      status = xosd_set_colour(osd, conf.color);
++      if (-1 == status) return -1;
++      status = xosd_display(osd, 0, XOSD_string, MSG_Hello);
++      if (-1 == status) return -1;
++      return 0;
+ }
+ 
+ #ifdef ICONV_LIB

diff --git a/net-irc/xchatosd/xchatosd-5.12.ebuild b/net-irc/xchatosd/xchatosd-5.12.ebuild
index bd44d9af7bed5ab24d6e951f62c4916d31a858e4..06dfa228fd2bde218c6e59c2b2dca641d7c60a94 100644 (file)
--- a/net-irc/xchatosd/xchatosd-5.12.ebuild
+++ b/net-irc/xchatosd/xchatosd-5.12.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.12.ebuild,v 1.4 2004/10/01 01:14:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.12.ebuild,v 1.5 2004/12/04 22:44:57 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="On-Screen Display for XChat"
 HOMEPAGE="http://sourceforge.net/projects/xchatosd/"
@@ -19,6 +21,8 @@ src_unpack() {
        unpack ${A}
        cd ${S}
 
+       epatch ${FILESDIR}/${PV}-return-values.patch
+
        # We have our own include file in /usr/include/xchat
        einfo "Updating xchat-plugin.h from /usr/include/xchat/xchat-plugin.h"
        cp -f ${ROOT}/usr/include/xchat/xchat-plugin.h xchat-plugin.h