From 0447e6e0c1a411bd5e59796182dfca83253ca8a2 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Thu, 17 Jan 2008 23:28:57 +0000 Subject: Fix building with newer kernel. Bug #206438 (Portage version: 2.1.3.19) --- games-util/showeq/ChangeLog | 10 +++++++-- games-util/showeq/files/showeq-5.0.0.18-UTS.patch | 26 +++++++++++++++++++++++ games-util/showeq/files/showeq-5.2.4.0-gcc4.patch | 11 ---------- games-util/showeq/files/showeq-5.3.0.0-gcc4.patch | 11 ---------- games-util/showeq/files/showeq-5.6.0.0-UTS.patch | 26 +++++++++++++++++++++++ games-util/showeq/showeq-5.0.0.18.ebuild | 10 ++++++--- games-util/showeq/showeq-5.6.0.0.ebuild | 12 ++++++++--- 7 files changed, 76 insertions(+), 30 deletions(-) create mode 100644 games-util/showeq/files/showeq-5.0.0.18-UTS.patch delete mode 100644 games-util/showeq/files/showeq-5.2.4.0-gcc4.patch delete mode 100644 games-util/showeq/files/showeq-5.3.0.0-gcc4.patch create mode 100644 games-util/showeq/files/showeq-5.6.0.0-UTS.patch (limited to 'games-util') diff --git a/games-util/showeq/ChangeLog b/games-util/showeq/ChangeLog index dd851848ff74..ab1e2f32bea8 100644 --- a/games-util/showeq/ChangeLog +++ b/games-util/showeq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-util/showeq -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.20 2006/12/06 21:16:13 wolf31o2 Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.21 2008/01/17 23:28:56 tupone Exp $ + + 17 Jan 2008; Tupone Alfredo + +files/showeq-5.0.0.18-UTS.patch, -files/showeq-5.2.4.0-gcc4.patch, + -files/showeq-5.3.0.0-gcc4.patch, +files/showeq-5.6.0.0-UTS.patch, + showeq-5.0.0.18.ebuild, showeq-5.6.0.0.ebuild: + Fix building with newer kernel. Bug #206438 by Evil Compile Person 06 Dec 2006; Chris Gianelloni showeq-5.0.0.18.ebuild, showeq-5.2.4.0.ebuild, showeq-5.3.0.0.ebuild: diff --git a/games-util/showeq/files/showeq-5.0.0.18-UTS.patch b/games-util/showeq/files/showeq-5.0.0.18-UTS.patch new file mode 100644 index 000000000000..a72539e52fbc --- /dev/null +++ b/games-util/showeq/files/showeq-5.0.0.18-UTS.patch @@ -0,0 +1,26 @@ +--- src/main.cpp.old 2008-01-17 23:18:47.000000000 +0100 ++++ src/main.cpp 2008-01-17 23:19:00.000000000 +0100 +@@ -740,10 +740,6 @@ + #ifdef QT_VERSION_STR + printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR); + #endif +-#ifdef __linux__ +- printf ("\t\tUsing headers from linux version: %s\n", +- UTS_RELEASE); +-#endif + printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version()); + printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version()); + #ifdef USE_DB3 +--- src/itemdbtool.cpp.old 2008-01-17 23:28:55.000000000 +0100 ++++ src/itemdbtool.cpp 2008-01-17 23:29:09.000000000 +0100 +@@ -444,10 +444,6 @@ + #ifdef QT_VERSION_STR + printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR); + #endif +-#ifdef __linux__ +- printf ("\t\tUsing headers from linux version: %s\n", +- UTS_RELEASE); +-#endif + printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version()); + #ifdef USE_DB3 + printf ("\tUsing DB3: %s\n", DB3Convenience::Version()); diff --git a/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch b/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch deleted file mode 100644 index 7ea5824930f3..000000000000 --- a/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/spawnmonitor.h.old 2006-01-27 23:52:51.000000000 -0700 -+++ src/spawnmonitor.h 2006-01-27 23:53:20.000000000 -0700 -@@ -98,7 +98,7 @@ - { - Q_OBJECT - public: -- SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, -+ SpawnMonitor(const DataLocationMgr* dataLocMgr, - ZoneMgr* zoneMgr, SpawnShell* spawnShell, - QObject* parent = 0, - const char* name = "spawnmonitor" ); diff --git a/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch b/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch deleted file mode 100644 index 7ea5824930f3..000000000000 --- a/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/spawnmonitor.h.old 2006-01-27 23:52:51.000000000 -0700 -+++ src/spawnmonitor.h 2006-01-27 23:53:20.000000000 -0700 -@@ -98,7 +98,7 @@ - { - Q_OBJECT - public: -- SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, -+ SpawnMonitor(const DataLocationMgr* dataLocMgr, - ZoneMgr* zoneMgr, SpawnShell* spawnShell, - QObject* parent = 0, - const char* name = "spawnmonitor" ); diff --git a/games-util/showeq/files/showeq-5.6.0.0-UTS.patch b/games-util/showeq/files/showeq-5.6.0.0-UTS.patch new file mode 100644 index 000000000000..b8ccc97265bb --- /dev/null +++ b/games-util/showeq/files/showeq-5.6.0.0-UTS.patch @@ -0,0 +1,26 @@ +--- src/main.cpp.old 2008-01-18 00:03:18.000000000 +0100 ++++ src/main.cpp 2008-01-18 00:03:31.000000000 +0100 +@@ -763,10 +763,6 @@ + #ifdef QT_VERSION_STR + printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR); + #endif +-#ifdef __linux__ +- printf ("\t\tUsing headers from linux version: %s\n", +- UTS_RELEASE); +-#endif + printf ("\t\tUsing EQItemDB: %s\n", EQItemDB::Version()); + printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version()); + #ifdef USE_DB3 +--- src/itemdbtool.cpp.old 2008-01-18 00:09:30.000000000 +0100 ++++ src/itemdbtool.cpp 2008-01-18 00:09:53.000000000 +0100 +@@ -444,10 +444,6 @@ + #ifdef QT_VERSION_STR + printf ("\t\tUsing Qt version: %s\n", QT_VERSION_STR); + #endif +-#ifdef __linux__ +- printf ("\t\tUsing headers from linux version: %s\n", +- UTS_RELEASE); +-#endif + printf ("\tUsing GDBM: %s\n", GDBMConvenience::Version()); + #ifdef USE_DB3 + printf ("\tUsing DB3: %s\n", DB3Convenience::Version()); diff --git a/games-util/showeq/showeq-5.0.0.18.ebuild b/games-util/showeq/showeq-5.0.0.18.ebuild index 0b1660a038e0..e8bc0f590555 100644 --- a/games-util/showeq/showeq-5.0.0.18.ebuild +++ b/games-util/showeq/showeq-5.0.0.18.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.8 2006/12/06 21:16:13 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.9 2008/01/17 23:28:56 tupone Exp $ inherit kde games @@ -19,7 +19,11 @@ DEPEND="x11-libs/libXt $(qt_min_version 3.1) >=sys-libs/gdbm-1.8.0" -PATCHES="${FILESDIR}/${P}"-gcc4.patch +src_unpack() { + mkdir "${WORKDIR}"/patches + cp "${FILESDIR}"/${P}-*.patch "${WORKDIR}"/patches + kde_src_unpack +} src_compile() { kde_src_compile nothing diff --git a/games-util/showeq/showeq-5.6.0.0.ebuild b/games-util/showeq/showeq-5.6.0.0.ebuild index f8aa31324f3b..7c2c3fbdc6d8 100644 --- a/games-util/showeq/showeq-5.6.0.0.ebuild +++ b/games-util/showeq/showeq-5.6.0.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.6.0.0.ebuild,v 1.1 2006/10/15 22:49:35 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.6.0.0.ebuild,v 1.2 2008/01/17 23:28:56 tupone Exp $ -inherit qt3 games +inherit eutils qt3 games DESCRIPTION="An Everquest monitoring program" HOMEPAGE="http://www.showeq.net/" @@ -17,6 +17,12 @@ DEPEND="virtual/libpcap $(qt_min_version 3.3) >=sys-libs/gdbm-1.8.0" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-UTS.patch +} + src_compile() { egamesconf \ --disable-dependency-tracking \ -- cgit v1.2.3-65-gdbad