diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-04-28 22:46:23 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-04-28 22:46:23 +0000 |
| commit | 6ee59013cc5811a51399799429d4d2e5a4b70e92 (patch) | |
| tree | f2ee0ebad3d630c6a0d89ee497e151fea8220667 /games-board | |
| parent | Added ~sparc keyword wrt bug #131548. (diff) | |
| download | gentoo-2-6ee59013cc5811a51399799429d4d2e5a4b70e92.tar.gz gentoo-2-6ee59013cc5811a51399799429d4d2e5a4b70e92.tar.bz2 gentoo-2-6ee59013cc5811a51399799429d4d2e5a4b70e92.zip | |
Fixing gcc-4.1 compilation
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'games-board')
4 files changed, 95 insertions, 2 deletions
diff --git a/games-board/ggz-kde-client/ChangeLog b/games-board/ggz-kde-client/ChangeLog index 8ab69f5c72eb..4b73cc8d4c79 100644 --- a/games-board/ggz-kde-client/ChangeLog +++ b/games-board/ggz-kde-client/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/ggz-kde-client # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.2 2006/03/24 16:29:06 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.3 2006/04/28 22:46:23 tupone Exp $ + + 28 Apr 2006; <Tupone@gentoo.org> +files/ggz-kde-client-0.0.9-gcc41.patch, + ggz-kde-client-0.0.9.ebuild: + Fixing compilation with gcc-4.1 24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> ggz-kde-client-0.0.9.ebuild: diff --git a/games-board/ggz-kde-client/files/digest-ggz-kde-client-0.0.9 b/games-board/ggz-kde-client/files/digest-ggz-kde-client-0.0.9 index 24065d068079..ea5219cb82c3 100644 --- a/games-board/ggz-kde-client/files/digest-ggz-kde-client-0.0.9 +++ b/games-board/ggz-kde-client/files/digest-ggz-kde-client-0.0.9 @@ -1 +1,3 @@ MD5 2f365d2883d3bf00a800a15a8704abf9 ggz-kde-client-0.0.9.tar.gz 2453121 +RMD160 7661e34a14d265813bd42d3b2ef567913379e036 ggz-kde-client-0.0.9.tar.gz 2453121 +SHA256 1c7b0c71639a0afd4084d13bb8eb85b0b02f71d6477f30f4c7b86cfe1add3ee3 ggz-kde-client-0.0.9.tar.gz 2453121 diff --git a/games-board/ggz-kde-client/files/ggz-kde-client-0.0.9-gcc41.patch b/games-board/ggz-kde-client/files/ggz-kde-client-0.0.9-gcc41.patch new file mode 100644 index 000000000000..fe0e8997deca --- /dev/null +++ b/games-board/ggz-kde-client/files/ggz-kde-client-0.0.9-gcc41.patch @@ -0,0 +1,85 @@ +--- ggz-kde/src/abstract/Makefile.in.old 2006-04-28 23:38:18.000000000 +0200 ++++ ggz-kde/src/abstract/Makefile.in 2006-04-28 23:38:51.000000000 +0200 +@@ -262,7 +262,7 @@ + + AM_CXXFLAGS = @COMPILEOPTIONS@ $(GGZCORE_INCLUDES) + +-INCLUDES = $(ggzcorepp_includes) -I $(top_srcdir)/ggz-kde/src -I $(kde_includes) ++INCLUDES = $(ggzcorepp_includes) -I $(top_srcdir)/ggz-kde/src -I $(qt_includes) -I $(kde_includes) + subdir = ggz-kde/src/abstract + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +--- shadowbridge/shadownet.cpp.old 2006-04-28 23:53:33.000000000 +0200 ++++ shadowbridge/shadownet.cpp 2006-04-28 23:55:20.000000000 +0200 +@@ -132,43 +132,43 @@ + void ShadowNet::slotRead(int sock) + { + QDataStream *s; +- char transmit = '\0'; ++ Q_INT8 transmit = Q_INT8('\0'); + + //cout << "game -> ggzcore: " << sock << endl; + + s = list.at(m_activated); + if((!s) || (!net)) return; + +- *s >> (Q_INT8)transmit; +- *net << (Q_INT8)transmit; ++ *s >> transmit; ++ *net << transmit; + + if(!m_incoming.isEmpty()) + { + emit signalIncoming(m_incoming); + m_incoming = ""; + } +- m_outgoing.append(convert(transmit)); ++ m_outgoing.append(convert(char(transmit))); + } + + void ShadowNet::slotWrite(int sock) + { + QDataStream *s; +- char transmit = '\0'; ++ Q_INT8 transmit = Q_INT8('\0'); + + //cout << "ggzcore -> game " << sock << endl; + + s = list.at(m_activated); + if((!s) || (!net)) return; + +- *net >> (Q_INT8)transmit; +- *s << (Q_INT8)transmit; ++ *net >> transmit; ++ *s << transmit; + + if(!m_outgoing.isEmpty()) + { + emit signalOutgoing(m_outgoing); + m_outgoing = ""; + } +- m_incoming.append(convert(transmit)); ++ m_incoming.append(convert(char(transmit))); + } + + void ShadowNet::slotActivated(int index) +--- kcm_ggz/kcm_ggz.cpp.old 2006-04-29 00:16:59.000000000 +0200 ++++ kcm_ggz/kcm_ggz.cpp 2006-04-29 00:22:39.000000000 +0200 +@@ -15,7 +15,7 @@ + + #include "config.h" + +-typedef KCMGGZPane* (*panefunc)(QWidget *parent = NULL, const char *name = NULL); ++typedef KCMGGZPane* (*panefunc)(QWidget *parent, const char *name); + + KCMGGZ::KCMGGZ(KInstance *instance, QWidget *parent, const char *name) + : KCModule(instance, parent, name) +@@ -50,7 +50,7 @@ + if(func) + { + init = (panefunc)func; +- pane = (*init)(ctl); ++ pane = (*init)(ctl, NULL); + if(pane) + { + panelist.append(pane); diff --git a/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild b/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild index 912d44050f52..e3ebefec9076 100644 --- a/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild +++ b/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild,v 1.2 2006/03/24 16:29:06 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild,v 1.3 2006/04/28 22:46:23 tupone Exp $ inherit kde @@ -16,4 +16,6 @@ IUSE="" DEPEND="~dev-games/ggz-client-libs-${PV}" +PATCHES="${FILESDIR}/${P}-gcc41.patch" + need-kde 3 |