From b3b6ae5cd3b94efe724ec1fc3bd3f066555cf00e Mon Sep 17 00:00:00 2001 From: Mark Loeser Date: Tue, 6 Jun 2006 03:36:50 +0000 Subject: [PATCH] Add patch to fix compilation with gcc-4.1 by Stephen Bridges ; bug #132453 Package-Manager: portage-2.1_rc3-r2 --- media-plugins/mythgame/ChangeLog | 7 +++++- .../mythgame/files/mythgame-0.19-gcc41.patch | 11 ++++++++++ media-plugins/mythgame/mythgame-0.19.ebuild | 9 ++++++-- media-plugins/mythphone/ChangeLog | 7 +++++- .../files/mythphone-0.19-gcc41.patch | 22 +++++++++++++++++++ media-plugins/mythphone/mythphone-0.19.ebuild | 9 ++++++-- media-plugins/mythvideo/ChangeLog | 7 +++++- .../files/mythvideo-0.19-gcc41.patch | 22 +++++++++++++++++++ media-plugins/mythvideo/mythvideo-0.19.ebuild | 9 ++++++-- 9 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 media-plugins/mythgame/files/mythgame-0.19-gcc41.patch create mode 100644 media-plugins/mythphone/files/mythphone-0.19-gcc41.patch create mode 100644 media-plugins/mythvideo/files/mythvideo-0.19-gcc41.patch diff --git a/media-plugins/mythgame/ChangeLog b/media-plugins/mythgame/ChangeLog index 67b0be0d5f12..622f548e46a7 100644 --- a/media-plugins/mythgame/ChangeLog +++ b/media-plugins/mythgame/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/mythgame # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythgame/ChangeLog,v 1.31 2006/05/29 06:05:46 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythgame/ChangeLog,v 1.32 2006/06/06 03:35:57 halcy0n Exp $ + + 06 Jun 2006; Mark Loeser + +files/mythgame-0.19-gcc41.patch, mythgame-0.19.ebuild: + Add patch to fix compilation with gcc-4.1 by Stephen Bridges ; bug #132453 29 May 2006; Doug Goldstein -mythgame-0.18.1.ebuild: getting rid of old stuff diff --git a/media-plugins/mythgame/files/mythgame-0.19-gcc41.patch b/media-plugins/mythgame/files/mythgame-0.19-gcc41.patch new file mode 100644 index 000000000000..f4e465b05ee9 --- /dev/null +++ b/media-plugins/mythgame/files/mythgame-0.19-gcc41.patch @@ -0,0 +1,11 @@ +--- mythplugins-0.19/mythgame/mythgame/gamehandler.h.orig 2006-05-06 10:33:44.000000000 +0100 ++++ mythplugins-0.19/mythgame/mythgame/gamehandler.h 2006-05-06 10:33:59.000000000 +0100 +@@ -106,7 +106,7 @@ + + protected: + static GameHandler* GetHandler(RomInfo *rominfo); +- static GameHandler* GameHandler::GetHandlerByName(QString systemname); ++ static GameHandler* GetHandlerByName(QString systemname); + + bool rebuild; + int spandisks; diff --git a/media-plugins/mythgame/mythgame-0.19.ebuild b/media-plugins/mythgame/mythgame-0.19.ebuild index d6b36904576c..e434cb3aeec1 100644 --- a/media-plugins/mythgame/mythgame-0.19.ebuild +++ b/media-plugins/mythgame/mythgame-0.19.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythgame/mythgame-0.19.ebuild,v 1.2 2006/02/12 10:32:10 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythgame/mythgame-0.19.ebuild,v 1.3 2006/06/06 03:35:57 halcy0n Exp $ -inherit mythtv-plugins +inherit eutils mythtv-plugins DESCRIPTION="Game emulator module for MythTV." HOMEPAGE="http://www.mythtv.org/" @@ -15,6 +15,11 @@ KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="sys-libs/zlib" DEPEND="${RDEPEND}" +src_unpack() { + mythtv-plugins_src_unpack + epatch "${FILESDIR}"/${P}-gcc41.patch +} + src_install () { mythtv-plugins_src_install || die "install failed" diff --git a/media-plugins/mythphone/ChangeLog b/media-plugins/mythphone/ChangeLog index b485e5039425..145d2a5c7f28 100644 --- a/media-plugins/mythphone/ChangeLog +++ b/media-plugins/mythphone/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/mythphone # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythphone/ChangeLog,v 1.12 2006/05/29 06:03:24 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythphone/ChangeLog,v 1.13 2006/06/06 03:36:27 halcy0n Exp $ + + 06 Jun 2006; Mark Loeser + +files/mythphone-0.19-gcc41.patch, mythphone-0.19.ebuild: + Add patch to fix compilation with gcc-4.1 by Stephen Bridges ; bug #132453 29 May 2006; Doug Goldstein -mythphone-0.18.1.ebuild: getting rid of old stuff diff --git a/media-plugins/mythphone/files/mythphone-0.19-gcc41.patch b/media-plugins/mythphone/files/mythphone-0.19-gcc41.patch new file mode 100644 index 000000000000..62469573ec5f --- /dev/null +++ b/media-plugins/mythphone/files/mythphone-0.19-gcc41.patch @@ -0,0 +1,22 @@ +--- mythplugins-0.19/mythphone/mythphone/sipfsm.orig.h 2006-05-06 15:00:23.000000000 +0100 ++++ mythplugins-0.19/mythphone/mythphone/sipfsm.h 2006-05-06 15:00:58.000000000 +0100 +@@ -618,7 +618,7 @@ + SipWatcher *CreateWatcherFsm(QString Url); + SipIM *CreateIMFsm(QString Url="", QString callIdStr=""); + void StopWatchers(); +- void SipFsm::KickWatcher(SipUrl *Url); ++ void KickWatcher(SipUrl *Url); + void SendIM(QString destUrl, QString CallId, QString imMsg); + int numCalls(); + int getPrimaryCall() { return primaryCall; }; +--- mythplugins-0.19/mythphone/mythphone/vxml.orig.h 2006-05-06 15:01:16.000000000 +0100 ++++ mythplugins-0.19/mythphone/mythphone/vxml.h 2006-05-06 15:01:33.000000000 +0100 +@@ -10,7 +10,7 @@ + { + public: + vxmlVariable(QString N, QString V); +- vxmlVariable::vxmlVariable(QString N, short *wav, int S); ++ vxmlVariable(QString N, short *wav, int S); + virtual ~vxmlVariable() {}; + bool isType(QString t) { return (t == Type); }; + QString getName() { return Name; }; diff --git a/media-plugins/mythphone/mythphone-0.19.ebuild b/media-plugins/mythphone/mythphone-0.19.ebuild index 1ab2b52b7dfa..2cfee2c9426e 100644 --- a/media-plugins/mythphone/mythphone-0.19.ebuild +++ b/media-plugins/mythphone/mythphone-0.19.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythphone/mythphone-0.19.ebuild,v 1.1 2006/02/12 10:36:17 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythphone/mythphone-0.19.ebuild,v 1.2 2006/06/06 03:36:27 halcy0n Exp $ -inherit mythtv-plugins +inherit eutils mythtv-plugins DESCRIPTION="Phone and video calls with SIP." HOMEPAGE="http://www.mythtv.org/" @@ -16,3 +16,8 @@ RDEPEND="festival? ( app-accessibility/festival )" DEPEND="${DEPEND}" MTVCONF=$(use_enable festival) + +src_unpack() { + mythtv-plugins_src_unpack + epatch "${FILESDIR}"/${P}-gcc41.patch +} diff --git a/media-plugins/mythvideo/ChangeLog b/media-plugins/mythvideo/ChangeLog index 6416380cce14..8f4c6ad07557 100644 --- a/media-plugins/mythvideo/ChangeLog +++ b/media-plugins/mythvideo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/mythvideo # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/ChangeLog,v 1.34 2006/05/29 06:01:32 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/ChangeLog,v 1.35 2006/06/06 03:36:50 halcy0n Exp $ + + 06 Jun 2006; Mark Loeser + +files/mythvideo-0.19-gcc41.patch, mythvideo-0.19.ebuild: + Add patch to fix compilation with gcc-4.1 by Stephen Bridges ; bug #132453 29 May 2006; Doug Goldstein -mythvideo-0.18.1.ebuild, mythvideo-0.19.ebuild: diff --git a/media-plugins/mythvideo/files/mythvideo-0.19-gcc41.patch b/media-plugins/mythvideo/files/mythvideo-0.19-gcc41.patch new file mode 100644 index 000000000000..8a393f5d1d05 --- /dev/null +++ b/media-plugins/mythvideo/files/mythvideo-0.19-gcc41.patch @@ -0,0 +1,22 @@ +--- mythplugins-0.19/mythvideo/mythvideo/videoselected.h.orig 2006-05-06 10:42:17.000000000 +0100 ++++ mythplugins-0.19/mythvideo/mythvideo/videoselected.h 2006-05-06 10:42:32.000000000 +0100 +@@ -35,7 +35,7 @@ + VideoSelected(VideoList *lvideolist, + MythMainWindow *parent, const char *name = 0, int index = 0); + ~VideoSelected(); +- void VideoSelected::processEvents() { qApp->processEvents(); } ++ void processEvents() { qApp->processEvents(); } + + + protected slots: +--- mythplugins-0.19/mythvideo/mythvideo/videomanager.h.orig 2006-05-06 10:38:53.000000000 +0100 ++++ mythplugins-0.19/mythvideo/mythvideo/videomanager.h 2006-05-06 10:39:23.000000000 +0100 +@@ -30,7 +30,7 @@ + public: + VideoManager(MythMainWindow *parent, const char *name = 0); + ~VideoManager(void); +- void VideoManager::processEvents() { qApp->processEvents(); } ++ void processEvents() { qApp->processEvents(); } + + public slots: + void slotManualIMDB(); diff --git a/media-plugins/mythvideo/mythvideo-0.19.ebuild b/media-plugins/mythvideo/mythvideo-0.19.ebuild index 58c0ade7a4d9..fb19d54c564e 100644 --- a/media-plugins/mythvideo/mythvideo-0.19.ebuild +++ b/media-plugins/mythvideo/mythvideo-0.19.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/mythvideo-0.19.ebuild,v 1.3 2006/05/29 06:01:32 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/mythvideo-0.19.ebuild,v 1.4 2006/06/06 03:36:50 halcy0n Exp $ -inherit mythtv-plugins +inherit eutils mythtv-plugins DESCRIPTION="Video player module for MythTV." HOMEPAGE="http://www.mythtv.org/" @@ -18,3 +18,8 @@ RDEPEND="dev-perl/libwww-perl dev-perl/XML-Simple media-video/mplayer" DEPEND="${RDEPEND}" + +src_unpack() { + mythtv-plugins_src_unpack + epatch "${FILESDIR}"/${P}-gcc41.patch +} -- 2.26.2