Fixing font loading problem. Bug #162048

Package-Manager: portage-2.1.4.5

4 files changed, 123 insertions, 2 deletions

diff --git a/games-puzzle/xblockout/ChangeLog b/games-puzzle/xblockout/ChangeLog
index 563369e8bcb0..ec7cbf8362fc 100644
--- a/games-puzzle/xblockout/ChangeLog
+++ b/games-puzzle/xblockout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/xblockout
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.18 2008/07/22 18:55:08 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.19 2008/10/27 22:42:20 tupone Exp $
+
+*xblockout-1.1.5-r1 (27 Oct 2008)
+
+  27 Oct 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/xblockout-1.1.5-font.patch, +xblockout-1.1.5-r1.ebuild:
+  Fixing font loading problem. Bug #162048 by NorthLite
+  amd64 added again.
 
   22 Jul 2008; Santiago M. Mola <coldwind@gentoo.org>
   xblockout-1.1.5.ebuild:
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 852506b09c0f..1acdcc01cc51 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xblockout-1.1.5-font.patch 1531 RMD160 a7b20c32c3ed040a54ac519a187b9678bf7244e9 SHA1 44f588250fbc5246089c94939ccfcf4360f41181 SHA256 fd1707ce1775804469fec94d71ec97263686324164f50be7aeb3f88e1402e9be
 DIST xbl-1.1.5.tar.gz 136508 RMD160 30cf9f6b1c251b267f0ebe0b85f349e9dce3dd44 SHA1 14503060ccf82d23430fe08e78ba4998723ec174 SHA256 5628e4a70709e3d996f4adf635a1760d96fad3ded0dd32d32205bdccde1e2cad
+EBUILD xblockout-1.1.5-r1.ebuild 1231 RMD160 57cdede39d54794c5d35e52ed2b856ad6a0adaf3 SHA1 8700575663e86703e4d7665366c845b1fc011279 SHA256 6e3706447e43e075f175479e6e9fb28e70ace661c927a0fe00262ae7b411ad1d
 EBUILD xblockout-1.1.5.ebuild 1207 RMD160 27db1d63e591aea7dcab5fa88f27cc857a914acb SHA1 8e7e52037afcd3e65d8f980a9b011daff61fdcda SHA256 989de74d041be793df74d466e3b0d85cd34e11abca96d5c275fc948e8484df6c
-MISC ChangeLog 2371 RMD160 7a40f592fa890db5b640896e054633195c194a10 SHA1 520c17a3c77f2bc84a190ec8a8430790cc526ffd SHA256 347a7c042cfb64fb96a9db9918935095c743f8c5550d07d552d868d8d427c01e
+MISC ChangeLog 2597 RMD160 ff4d1afac626d33214e090876c85fbb48e68fe66 SHA1 d11003647766ea5c39f07668397f7b466e2337ff SHA256 9419e18e6df6cf38c394f7e41ee1faecd5ac037b43959121717e14b074cde189
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkGQ9cACgkQmAYtPIR1e6S/ZwCfT9M6tXZA+ixTJR9yqCFdxesH
+5KAAoKqQoBPj+kWsglvnZcwQ6ahtrwvn
+=oKjA
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch
new file mode 100644
index 000000000000..bb0302963bdc
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch
@@ -0,0 +1,46 @@
+--- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
++++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
+@@ -408,19 +408,17 @@
+   XCharStruct overall_return ;
+ 
+   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
+-  m->font = XLoadFont( x->display , opt->thefont ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font=%s\n", opt->thefont) ;
+     }
+-  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++  if ( m->xfont==0 )
+     {
+       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
+       m->xfont = XLoadQueryFont( x->display , 
+ 				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      m->font = XLoadFont( x->display , 
+-			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++      m->font = m->xfont->fid;
++      if ( m->xfont==0 )
+ 	{
+ 	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
+ 	  fprintf(stderr,"Have you A font?\n");
+@@ -428,17 +426,17 @@
+ 	  exit(1) ;
+ 	}
+     }
++  m->font = m->xfont->fid;
+   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
+-  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
+     }
+-  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
++  if ( m->xfont2==0 )
+     {
+-      m->font2 = m->font ;
+       m->xfont2 = m->xfont ;
+     }
++  m->font2 = m->xfont2->fid;
+ 
+   xgc.background = x->back_pixel ;
+   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;
diff --git a/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild b/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..b7c83c95810a
--- /dev/null
+++ b/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild,v 1.1 2008/10/27 22:42:20 tupone Exp $
+
+inherit flag-o-matic eutils games
+
+DESCRIPTION="X Window block dropping game in 3 Dimension"
+HOMEPAGE="http://www710.univ-lyon1.fr/ftp/xbl/xbl.html"
+SRC_URI="http://www710.univ-lyon1.fr/~exco/XBL/xbl-${PV}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXext"
+
+S=${WORKDIR}/xbl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-font.patch
+
+	sed -i \
+		-e 's:-lm:-lm -lX11:' \
+		-e '/DGROUP_GID/d' \
+		-e "s:-g$:${CFLAGS}:" \
+		Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	# Don't know about other archs. --slarti
+	use amd64 && filter-flags "-fweb"
+
+	egamesconf || die
+	emake \
+		USE_SETGID= \
+		SCOREDIR="${GAMES_DATADIR}/${PN}" \
+		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	newgamesbin bl xbl || die "newgamesbin failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	newins Xbl.ad Xbl || die "doins failed"
+
+	newman xbl.man xbl.6
+	dodoc README xbl-README
+	dohtml *.html *.gif
+
+	prepgamesdirs
+}