* [gentoo-commits] repo/gentoo:master commit in: games-board/qgo/files/, games-board/qgo/
@ 2016-08-02 16:59 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-08-02 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 1f3d6c812f8740d48632aef6b9933a5b596e2443
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 16:59:27 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 16:59:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3d6c81
games-board/qgo: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
.../qgo/files/qgo-1.5.4_p20100322-buffer.patch | 4 +-
.../qgo/files/qgo-1.5.4_p20100322-gcc45.patch | 24 +++++------
.../qgo/files/qgo-1.5.4_p20100322-qt47.patch | 16 ++++----
games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild | 48 ++++++++++++++++++++++
4 files changed, 70 insertions(+), 22 deletions(-)
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
index cb0f015..bdf94eb 100644
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
@@ -1,5 +1,5 @@
---- src/network/tygemconnection.cpp.orig 2014-10-29 23:49:21.436929924 -0400
-+++ src/network/tygemconnection.cpp 2014-10-29 23:50:43.481183852 -0400
+--- a/src/network/tygemconnection.cpp 2014-10-29 23:49:21.436929924 -0400
++++ b/src/network/tygemconnection.cpp 2014-10-29 23:50:43.481183852 -0400
@@ -4768,7 +4768,7 @@
unsigned int i;
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
index 53c8509..a02fae6 100644
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
@@ -1,5 +1,5 @@
---- src/board/board.cpp.old 2010-06-01 08:20:32.000000000 +0200
-+++ src/board/board.cpp 2010-06-01 08:20:54.000000000 +0200
+--- a/src/board/board.cpp 2010-06-01 08:20:32.000000000 +0200
++++ b/src/board/board.cpp 2010-06-01 08:20:54.000000000 +0200
@@ -347,7 +347,7 @@
}
@@ -9,8 +9,8 @@
}
---- src/board/clockdisplay.cpp.old 2010-06-01 08:31:10.000000000 +0200
-+++ src/board/clockdisplay.cpp 2010-06-01 08:31:38.000000000 +0200
+--- a/src/board/clockdisplay.cpp 2010-06-01 08:31:10.000000000 +0200
++++ b/src/board/clockdisplay.cpp 2010-06-01 08:31:38.000000000 +0200
@@ -274,13 +274,13 @@
if(b_time > 3600 || w_time > 3600)
@@ -29,8 +29,8 @@
}
switch(timeSystem)
---- src/gtp/qgtp.cpp.old 2010-06-01 08:34:09.000000000 +0200
-+++ src/gtp/qgtp.cpp 2010-06-01 08:34:28.000000000 +0200
+--- a/src/gtp/qgtp.cpp 2010-06-01 08:34:09.000000000 +0200
++++ b/src/gtp/qgtp.cpp 2010-06-01 08:34:28.000000000 +0200
@@ -341,7 +341,7 @@
_cpt++;
@@ -40,8 +40,8 @@
// int j= programProcess->waitForBytesWritten ( 100 );
---- src/board/imagehandler.cpp.old 2010-06-01 08:34:55.000000000 +0200
-+++ src/board/imagehandler.cpp 2010-06-01 08:35:17.000000000 +0200
+--- a/src/board/imagehandler.cpp 2010-06-01 08:34:55.000000000 +0200
++++ b/src/board/imagehandler.cpp 2010-06-01 08:35:17.000000000 +0200
@@ -93,8 +93,8 @@
{
altGhostPixmaps = new QList<QPixmap>();//::QList();
@@ -53,8 +53,8 @@
if (alt1.isNull() || alt2.isNull())
qFatal("Could not load alt_ghost pixmaps.");
---- src/board/mark.cpp.old 2010-06-01 08:36:39.000000000 +0200
-+++ src/board/mark.cpp 2010-06-01 08:36:51.000000000 +0200
+--- a/src/board/mark.cpp 2010-06-01 08:36:39.000000000 +0200
++++ b/src/board/mark.cpp 2010-06-01 08:36:51.000000000 +0200
@@ -109,7 +109,7 @@
setPen(QPen(col, 2));
// else
@@ -64,8 +64,8 @@
// setPen(QPen(col, 1));
setSize(s, s);
---- src/network/gamedialog.cpp.old 2010-06-01 08:45:26.000000000 +0200
-+++ src/network/gamedialog.cpp 2010-06-01 08:45:40.000000000 +0200
+--- a/src/network/gamedialog.cpp 2010-06-01 08:45:26.000000000 +0200
++++ b/src/network/gamedialog.cpp 2010-06-01 08:45:40.000000000 +0200
@@ -1123,7 +1123,7 @@
* probably FIXME, I just wonder why its like that in the first place */
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
index bf8bfee..203bf48 100644
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
@@ -1,5 +1,5 @@
---- src/network/playergamelistings.h.old 2010-11-08 13:49:25.000000000 +0100
-+++ src/network/playergamelistings.h 2010-11-08 13:52:24.000000000 +0100
+--- a/src/network/playergamelistings.h 2010-11-08 13:49:25.000000000 +0100
++++ b/src/network/playergamelistings.h 2010-11-08 13:52:24.000000000 +0100
@@ -66,21 +66,21 @@
bool hidden;
PlayerListing() : id(0),
@@ -39,8 +39,8 @@
flags(IN_PROGRESS),
rated(0),
owner_id(0),
---- src/board/board.h.old 2010-11-08 13:57:26.000000000 +0100
-+++ src/board/board.h 2010-11-08 13:58:17.000000000 +0100
+--- a/src/board/board.h 2010-11-08 13:57:26.000000000 +0100
++++ b/src/board/board.h 2010-11-08 13:58:17.000000000 +0100
@@ -50,7 +50,7 @@
void removeGhosts();
@@ -50,8 +50,8 @@
Mark* hasMark(int x, int y);
void removeMark(int x, int y, bool update = false);
void removeDeadMarks();
---- src/board/boardwindow.h.old 2010-11-08 14:21:19.000000000 +0100
-+++ src/board/boardwindow.h 2010-11-08 14:21:39.000000000 +0100
+--- a/src/board/boardwindow.h 2010-11-08 14:21:19.000000000 +0100
++++ b/src/board/boardwindow.h 2010-11-08 14:21:39.000000000 +0100
@@ -45,7 +45,7 @@
~BoardWindow();
@@ -61,8 +61,8 @@
bool doSave(QString fileName, bool force);
QString getCandidateFileName();
---- src/sgf/sgfparser.h.old 2010-11-08 14:29:05.000000000 +0100
-+++ src/sgf/sgfparser.h 2010-11-08 14:29:27.000000000 +0100
+--- a/src/sgf/sgfparser.h 2010-11-08 14:29:05.000000000 +0100
++++ b/src/sgf/sgfparser.h 2010-11-08 14:29:27.000000000 +0100
@@ -51,7 +51,7 @@
*/
protected:
diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
new file mode 100644
index 0000000..68ec877
--- /dev/null
+++ b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils qmake-utils
+
+DESCRIPTION="An ancient boardgame, very common in Japan, China and Korea"
+HOMEPAGE="http://qgo.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ media-libs/alsa-lib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc45.patch
+ "${FILESDIR}"/${P}-qt47.patch
+ "${FILESDIR}"/${P}-buffer.patch
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e 's:$(QTDIR)/bin/lrelease:lrelease:' \
+ src/src.pro || die
+}
+
+src_configure() {
+ eqmake4 qgo2.pro
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ dodoc AUTHORS
+
+ insinto /usr/share/${PN}/languages
+ doins src/translations/*.qm
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/qgo/files/, games-board/qgo/
@ 2017-10-02 18:38 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2017-10-02 18:38 UTC (permalink / raw
To: gentoo-commits
commit: fe21daa00cecd075617683145692cde6319c6654
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 2 18:37:37 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 2 18:38:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe21daa0
games-board/qgo: Fix narrowing conversion error, bug 598406
Closes: https://bugs.gentoo.org/598406
Package-Manager: Portage-2.3.10, Repoman-2.3.3
games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch | 12 ++++++++++++
games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild | 3 ++-
games-board/qgo/qgo-1.5.4_p20100322.ebuild | 5 +++--
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
new file mode 100644
index 00000000000..52b4ec2faaf
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
@@ -0,0 +1,12 @@
+diff -ruN qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp
+--- qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp 2010-02-26 19:43:41.000000000 +0100
++++ qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp 2017-10-02 20:33:32.661506058 +0200
+@@ -534,7 +534,7 @@
+ }
+
+ // this is the initial packet
+- char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
++ unsigned char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
+ if(write((const char *)packet, 8) < 0)
+ qWarning("*** failed sending init packet to reconnected host");
+ return 0;
diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
index fa8cca440e9..7c65e182f47 100644
--- a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc45.patch
"${FILESDIR}"/${P}-qt47.patch
"${FILESDIR}"/${P}-buffer.patch
+ "${FILESDIR}"/${P}-gcc6.patch
)
src_prepare() {
diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
index 26945ecb19f..e0a6618cbb4 100644
--- a/games-board/qgo/qgo-1.5.4_p20100322.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -33,7 +33,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-gcc45.patch \
"${FILESDIR}"/${P}-qt47.patch \
- "${FILESDIR}"/${P}-buffer.patch
+ "${FILESDIR}"/${P}-buffer.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-02 18:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-02 18:38 [gentoo-commits] repo/gentoo:master commit in: games-board/qgo/files/, games-board/qgo/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2016-08-02 16:59 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox