font alignment fix #28054

5 files changed, 34 insertions, 25 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 34c2c86153fe..e19d786eb6ab 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,13 +1,18 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.19 2003/08/16 20:22:21 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.20 2003/09/10 04:08:12 vapier Exp $
+
+*xosd-2.2.4-r1 (10 Sep 2003)
+
+  10 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix font alignment #28054.
+
+*xosd-2.2.4 (15 Aug 2003)
 
   16 Aug 2003; Nick Hadaway <raker@gentoo.org> xosd-2.2.4.ebuild:
   Thanks to Jonathan Hitchcock on bug #26710 for noticing that the
   xmms plugin gets installed to the wrong directory.
 
-*xosd-2.2.4 (15 Aug 2003)
-
   15 Aug 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
   xosd-0.7.0.ebuild, xosd-1.0.2.ebuild, xosd-2.0.0.ebuild,
   xosd-2.0.1-r1.ebuild, xosd-2.0.1.ebuild, xosd-2.1.0.ebuild,
diff --git a/x11-libs/xosd/files/2.2.4-font-align.patch b/x11-libs/xosd/files/2.2.4-font-align.patch
new file mode 100644
index 000000000000..701f1859dc05
--- /dev/null
+++ b/x11-libs/xosd/files/2.2.4-font-align.patch
@@ -0,0 +1,24 @@
+--- src/xmms_plugin/xmms_osd.c.orig	2003-09-10 00:02:07.738701608 -0400
++++ src/xmms_plugin/xmms_osd.c	2003-09-10 00:02:25.132057416 -0400
+@@ -261,6 +261,10 @@
+ 	DEBUG("apply_config");
+ 	if (osd)
+ 	{
++		if (xosd_set_font (osd, font) == -1)
++		{
++			DEBUG("invalid font %s", font);
++		}
+ 		xosd_set_colour (osd, colour);
+ 		xosd_set_timeout (osd, timeout);
+ 		xosd_set_vertical_offset (osd, offset);
+@@ -269,10 +273,6 @@
+ 		xosd_set_outline_offset (osd, outline_offset);
+ 		xosd_set_pos (osd, pos);
+ 		xosd_set_align (osd, align);
+-		if (xosd_set_font (osd, font) == -1)
+-		{
+-			DEBUG("invalid font %s", font);
+-		}
+ 	}
+ 	DEBUG("done");
+ }
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.4 b/x11-libs/xosd/files/digest-xosd-2.2.4-r1
index 18a537058d72..18a537058d72 100644
--- a/x11-libs/xosd/files/digest-xosd-2.2.4
+++ b/x11-libs/xosd/files/digest-xosd-2.2.4-r1
diff --git a/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff b/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff
deleted file mode 100644
index 9398d2089422..000000000000
--- a/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/xmms_plugin/xmms_osd.c-orig	2003-07-08 10:11:20.000000000 +1200
-+++ src/xmms_plugin/xmms_osd.c	2003-08-13 16:33:03.000000000 +1200
-@@ -263,6 +263,7 @@
- 	{
- 		xosd_set_colour (osd, colour);
- 		xosd_set_timeout (osd, timeout);
-+		xosd_set_pos (osd, pos);
- 		xosd_set_vertical_offset (osd, offset);
- 		xosd_set_horizontal_offset (osd, h_offset);
- 		xosd_set_shadow_offset (osd, shadow_offset);
---- src/xmms_plugin/xmms_osd.c-orig	2003-07-08 10:11:20.000000000 +1200
-+++ src/xmms_plugin/xmms_osd.c	2003-08-13 16:34:35.000000000 +1200
-@@ -267,7 +267,6 @@
- 		xosd_set_horizontal_offset (osd, h_offset);
- 		xosd_set_shadow_offset (osd, shadow_offset);
- 		xosd_set_outline_offset (osd, outline_offset);
--		xosd_set_pos (osd, pos);
- 		xosd_set_align (osd, align);
- 		if (xosd_set_font (osd, font) == -1)
- 		{
diff --git a/x11-libs/xosd/xosd-2.2.4.ebuild b/x11-libs/xosd/xosd-2.2.4-r1.ebuild
index 2a8f1ada0b3a..b2c1d6adfee1 100644
--- a/x11-libs/xosd/xosd-2.2.4.ebuild
+++ b/x11-libs/xosd/xosd-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4.ebuild,v 1.2 2003/08/16 20:22:21 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4-r1.ebuild,v 1.1 2003/09/10 04:08:12 vapier Exp $
 
 DESCRIPTION="Library for overlaying text/glyphs in X-Windows \
 X-On-Screen-Display plus binary for sending text from command line."
@@ -19,7 +19,7 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/xmms_osd-2.2.4-gentoo.diff
+	epatch ${FILESDIR}/${PV}-font-align.patch
 }
 
 src_compile() {