From: Tristan Heaven Date: Mon, 8 Jan 2007 13:54:41 +0000 (+0000) Subject: Patch from Andrei Gerasimenko for displaying boards other than 19x19 correctly, bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=397fc6a732fc46547de0f6c77536bd3f14a1f77c;p=gentoo.git Patch from Andrei Gerasimenko for displaying boards other than 19x19 correctly, bug #160577 Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog index da5e62cef24a..b09836cf401b 100644 --- a/games-board/qgo/ChangeLog +++ b/games-board/qgo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-board/qgo -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.23 2006/12/24 11:07:59 nyhm Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.24 2007/01/08 13:54:41 nyhm Exp $ + +*qgo-1.5.2-r1 (08 Jan 2007) + + 08 Jan 2007; Tristan Heaven + +files/qgo-1.5.2-gatter.patch, +qgo-1.5.2-r1.ebuild: + Patch from Andrei Gerasimenko for displaying boards other than 19x19 + correctly, bug #160577 24 Dec 2006; Tristan Heaven qgo-1.5.2.ebuild: Use games eclass, bug #158515 diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest index c4119e2858c8..ced56fc3c39e 100644 --- a/games-board/qgo/Manifest +++ b/games-board/qgo/Manifest @@ -1,20 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX qgo-1.5.2-gatter.patch 2527 RMD160 8889a7dec92d7b56107ec5644c41068446ca33cb SHA1 735beba7c74fe1ecea205c44b78c2d6ca21a2c4e SHA256 453b0b4c9f24f84847bde4acf17770586ed5130b8e441810b56776171b2e6bb5 +MD5 439e6b4c20924d38f45b7df30bbe324f files/qgo-1.5.2-gatter.patch 2527 +RMD160 8889a7dec92d7b56107ec5644c41068446ca33cb files/qgo-1.5.2-gatter.patch 2527 +SHA256 453b0b4c9f24f84847bde4acf17770586ed5130b8e441810b56776171b2e6bb5 files/qgo-1.5.2-gatter.patch 2527 DIST qgo-1.5.1-r1.tar.gz 2335443 RMD160 e92f12d180bd9aba029670b522b4ae4929f275f6 SHA1 2b0987abc01ac254fc75957bcd5159937df15e3e SHA256 5fad22968e8b4274f0d317fc421b524ecdd21f1e9b14e2bfe407b54e8417b09c DIST qgo-1.5.2.tar.gz 2331728 RMD160 007f29edb04ab5614baf67d3c4cb49194a187383 SHA1 c2b23af325b34e63462615bdbd06a688f2095e4d SHA256 d8d2cb17a8e6a775357e850c35fd36e97fd85295648101ead7640a46d5135d3f EBUILD qgo-1.5.1.ebuild 574 RMD160 5226d018e6560f487f5e3124c49982e06e999367 SHA1 82a5b1489ceb5f089c268d42c3399aec38ed7f36 SHA256 2b87c55a1660c692e7ab02346765b94524b95371863b2dc2c34e092add804096 MD5 0333ae52550cd54311e93d0909f25e76 qgo-1.5.1.ebuild 574 RMD160 5226d018e6560f487f5e3124c49982e06e999367 qgo-1.5.1.ebuild 574 SHA256 2b87c55a1660c692e7ab02346765b94524b95371863b2dc2c34e092add804096 qgo-1.5.1.ebuild 574 +EBUILD qgo-1.5.2-r1.ebuild 879 RMD160 b2a62811a7d4645a04e990598220ac928719c518 SHA1 9a0dfb643ddf26bd9a70e96ef13ac789eb5610eb SHA256 b50b03ea43d25114300aeeb9e5f9a213b1b5224cbc85d8171b6a510828586732 +MD5 d9a3a0ada74ded2a7c7f32af154278be qgo-1.5.2-r1.ebuild 879 +RMD160 b2a62811a7d4645a04e990598220ac928719c518 qgo-1.5.2-r1.ebuild 879 +SHA256 b50b03ea43d25114300aeeb9e5f9a213b1b5224cbc85d8171b6a510828586732 qgo-1.5.2-r1.ebuild 879 EBUILD qgo-1.5.2.ebuild 836 RMD160 752363c6cccab6897e73d49a0cc0887b3524a974 SHA1 eb147529e4d40cbda5139cdeca7cacd4d67e68ae SHA256 c4ee56b3f392158630590739315e42e6ee326442bed33c41c15fcd644c92bd80 MD5 c51f2ed6530bd163aaf50c4e1af82ce3 qgo-1.5.2.ebuild 836 RMD160 752363c6cccab6897e73d49a0cc0887b3524a974 qgo-1.5.2.ebuild 836 SHA256 c4ee56b3f392158630590739315e42e6ee326442bed33c41c15fcd644c92bd80 qgo-1.5.2.ebuild 836 -MISC ChangeLog 2695 RMD160 3389a2f130613afbc2d5f1594d81c4912137fc34 SHA1 ce867c440326c9a5aa424c120bad9c6f97be1e05 SHA256 ab3027b37faa0730548f44e7863dc805f281ffcdb53ef41959ed26d20d93eb9e -MD5 d653dfe49bfc16887c68d9a87e4f23a5 ChangeLog 2695 -RMD160 3389a2f130613afbc2d5f1594d81c4912137fc34 ChangeLog 2695 -SHA256 ab3027b37faa0730548f44e7863dc805f281ffcdb53ef41959ed26d20d93eb9e ChangeLog 2695 +MISC ChangeLog 2924 RMD160 4118d76540217c2e901f5eda4828b8f0d94fa033 SHA1 2281054f0cd8db6a909fc62ba554b99b18c07117 SHA256 9f7900c389509e85fe33fae47135b4f0421c1362c6bf9118954546fc2cc74b66 +MD5 a923cfd926c629a0c9613bf216dd2d2e ChangeLog 2924 +RMD160 4118d76540217c2e901f5eda4828b8f0d94fa033 ChangeLog 2924 +SHA256 9f7900c389509e85fe33fae47135b4f0421c1362c6bf9118954546fc2cc74b66 ChangeLog 2924 MISC metadata.xml 388 RMD160 cd5534eeca1a07a692717586962a4a26545796dd SHA1 8d74cbab2c30bea8f61092c6cfad96f5501d5e09 SHA256 286a1e0a2fc34628235ea89461009dcf86c04ba05c0fcd35aed6fc433af7d1b8 MD5 7be057a9771e6eb03103063d47a366b8 metadata.xml 388 RMD160 cd5534eeca1a07a692717586962a4a26545796dd metadata.xml 388 @@ -25,10 +33,13 @@ SHA256 3220d7657a0ec505822136b00edd6366667caec85e5d8ea4d3e4fdfe1e770819 files/di MD5 4c784e2d64b4202de949a32a6fc64b02 files/digest-qgo-1.5.2 232 RMD160 f116928db1fb30c5a1b17bfb47deccfa616ecdb5 files/digest-qgo-1.5.2 232 SHA256 9b185ec826c26a2d59e8cccfec8fff6c3e90bf8d6c1e3e21eadfa98d0d8fdc06 files/digest-qgo-1.5.2 232 +MD5 4c784e2d64b4202de949a32a6fc64b02 files/digest-qgo-1.5.2-r1 232 +RMD160 f116928db1fb30c5a1b17bfb47deccfa616ecdb5 files/digest-qgo-1.5.2-r1 232 +SHA256 9b185ec826c26a2d59e8cccfec8fff6c3e90bf8d6c1e3e21eadfa98d0d8fdc06 files/digest-qgo-1.5.2-r1 232 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnZzQdz7hIScOURERAmOZAKC1klWL48QreVJB63+a+gzRu3OpzACg5Elr -/Ak9BhIrbyZeN7IQQiPNKuM= -=htXp +iD8DBQFFok0ndz7hIScOURERAmiaAJsHmwHS6pN/u/poh/cOO1v0K6i03wCfXy7M +ysAY2v5ydby40QoHanHDUaA= +=GGb8 -----END PGP SIGNATURE----- diff --git a/games-board/qgo/files/digest-qgo-1.5.2-r1 b/games-board/qgo/files/digest-qgo-1.5.2-r1 new file mode 100644 index 000000000000..3cef7af548dc --- /dev/null +++ b/games-board/qgo/files/digest-qgo-1.5.2-r1 @@ -0,0 +1,3 @@ +MD5 a9767f2572fc8d8c5653726bbce402e0 qgo-1.5.2.tar.gz 2331728 +RMD160 007f29edb04ab5614baf67d3c4cb49194a187383 qgo-1.5.2.tar.gz 2331728 +SHA256 d8d2cb17a8e6a775357e850c35fd36e97fd85295648101ead7640a46d5135d3f qgo-1.5.2.tar.gz 2331728 diff --git a/games-board/qgo/files/qgo-1.5.2-gatter.patch b/games-board/qgo/files/qgo-1.5.2-gatter.patch new file mode 100644 index 000000000000..92c8a0b1ac6c --- /dev/null +++ b/games-board/qgo/files/qgo-1.5.2-gatter.patch @@ -0,0 +1,95 @@ +--- src/board.h.old 2006-09-20 01:58:15.000000000 +0400 ++++ src/board.h 2007-01-06 19:51:26.000000000 +0300 +@@ -37,6 +37,7 @@ + void show (int x, int y); + void resize(int offsetX, int offsetY, int square_size); + void showAll(); ++ void setBoardSize(int v); + + private: + int board_size; +@@ -134,7 +135,7 @@ + void doCountDone(); + void numberMoves() { boardHandler->numberMoves(); } + void markVariations(bool sons) { boardHandler->markVariations(sons); } +- void setBoardSize(int s) { board_size = s; } ++ void setBoardSize(int s) { board_size = s; gatter->setBoardSize(s); } + int getBoardSize() const { return board_size; } + #ifndef NO_DEBUG + void debug(); +--- src/board.cpp.old 2006-10-01 23:23:39.000000000 +0400 ++++ src/board.cpp 2007-01-06 22:27:50.000000000 +0300 +@@ -1406,7 +1406,7 @@ + CHECK_PTR(d); + + int oldsize = board_size; +- board_size = d->size; ++ setBoardSize(d->size); + + // Clear up everything + clearData(); +@@ -1667,14 +1667,44 @@ + } + + /** +-  * Initialises the gatter intersections and hoshis points ++  * Creates a new Gatter instance +   **/ + Gatter::Gatter(QCanvas *Canvas, int size) + { + int i,j; + +- board_size = size; + canvas=Canvas; ++ setBoardSize(size); ++} ++ ++ /** ++  * Initialises the gatter intersections and hoshis points ++  **/ ++void Gatter::setBoardSize(int v) ++{ ++ if (board_size == v) ++ return; ++ ++ int i,j; ++ ++ // remove old elements ++ if (board_size > 0) { ++ for (i=0; i it( hoshisList ); ++ for ( ; it.current(); ++it ) ++ delete it.current(); ++ hoshisList.clear(); ++ } ++ ++ board_size = v; + + VGatter.reserve(board_size); + HGatter.reserve(board_size); +@@ -1740,13 +1770,15 @@ + { + HGatter[i][j]->setPoints(int(offsetX + square_size * ( i - 0.5*(i!=0))), + offsetY + square_size * j, +- int(offsetX + square_size * ( i + 0.5 * (i+1 != board_size))), ++ int(offsetX + square_size * ( i + 0.5 * (i+1 != ++ board_size))), + offsetY + square_size * j ); + + VGatter[i][j]->setPoints(offsetX + square_size * i, + int(offsetY + square_size * ( j - 0.5*(j!=0))), + offsetX + square_size * i, +- int(offsetY + square_size * ( j + 0.5 * (j+1 != board_size)))); ++ int(offsetY + square_size * ( j + 0.5 * (j+1 != ++ board_size)))); + + e=hoshisList.find(board_size*(i+1)+j+1); + if (e) diff --git a/games-board/qgo/qgo-1.5.2-r1.ebuild b/games-board/qgo/qgo-1.5.2-r1.ebuild new file mode 100644 index 000000000000..fa4c3caab810 --- /dev/null +++ b/games-board/qgo/qgo-1.5.2-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.2-r1.ebuild,v 1.1 2007/01/08 13:54:41 nyhm Exp $ + +inherit eutils qt3 games + +DESCRIPTION="A Qt Go client and SGF editor" +HOMEPAGE="http://qgo.sourceforge.net/" +SRC_URI="mirror://sourceforge/qgo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="$(qt_min_version 3.3)" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i 's:$(datadir):/usr/share:' \ + templates/Makefile.in \ + || die "sed Makefile.in failed" + sed -i "s:/usr/share:${GAMES_DATADIR}:" \ + templates/*.desktop \ + || die "sed .desktop failed" + epatch "${FILESDIR}"/${P}-gatter.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README TODO + prepgamesdirs +}