From 0523508f6df8cd5e1e47127b8c261f85948db893 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 7 May 2006 10:33:32 +0000 Subject: Fix building with gcc-4.1 and include order when debugging is enabled, bug #131282. (Portage version: 2.1_pre10-r3) --- net-nntp/nzbget/ChangeLog | 10 ++++++++-- net-nntp/nzbget/files/0.2.3-gcc41.patch | 12 ++++++++++++ net-nntp/nzbget/files/0.2.3-include-order.patch | 15 +++++++++++++++ net-nntp/nzbget/files/digest-nzbget-0.2.2 | 2 ++ net-nntp/nzbget/files/digest-nzbget-0.2.3 | 2 ++ net-nntp/nzbget/nzbget-0.2.2.ebuild | 15 ++++++++++++--- net-nntp/nzbget/nzbget-0.2.3.ebuild | 15 ++++++++++++--- 7 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 net-nntp/nzbget/files/0.2.3-gcc41.patch create mode 100644 net-nntp/nzbget/files/0.2.3-include-order.patch (limited to 'net-nntp/nzbget') diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog index cc8133c1cd8d..960fce54642c 100644 --- a/net-nntp/nzbget/ChangeLog +++ b/net-nntp/nzbget/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-nntp/nzbget -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.7 2005/09/13 13:34:42 swegener Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.8 2006/05/07 10:33:32 swegener Exp $ + + 07 May 2006; Sven Wegener +files/0.2.3-gcc41.patch, + +files/0.2.3-include-order.patch, nzbget-0.2.2.ebuild, + nzbget-0.2.3.ebuild: + Fix building with gcc-4.1 and include order when debugging is enabled, bug + #131282. *nzbget-0.2.3 (13 Sep 2005) diff --git a/net-nntp/nzbget/files/0.2.3-gcc41.patch b/net-nntp/nzbget/files/0.2.3-gcc41.patch new file mode 100644 index 000000000000..ce2caebc9eab --- /dev/null +++ b/net-nntp/nzbget/files/0.2.3-gcc41.patch @@ -0,0 +1,12 @@ +diff -ur nzbget-0.2.3-orig/ArticleDownloader.cpp nzbget-0.2.3/ArticleDownloader.cpp +--- nzbget-0.2.3-orig/ArticleDownloader.cpp 2006-05-02 01:18:35.127138980 +0000 ++++ nzbget-0.2.3/ArticleDownloader.cpp 2006-05-02 01:18:50.731853304 +0000 +@@ -184,7 +184,7 @@ + line = pConnection->ReadLine(); + + // Have we encountered a timeout? +- if( (int)line == EOF ) ++ if( (long)line == EOF ) + { + perror( "pConnection->ReadLine() encountered error" ); + m_pJob->SetStatus(JOBSTATUS_FAILED); diff --git a/net-nntp/nzbget/files/0.2.3-include-order.patch b/net-nntp/nzbget/files/0.2.3-include-order.patch new file mode 100644 index 000000000000..9ec88afe682b --- /dev/null +++ b/net-nntp/nzbget/files/0.2.3-include-order.patch @@ -0,0 +1,15 @@ +diff -Nur nzbget-0.2.3.orig/global.cpp nzbget-0.2.3/global.cpp +--- nzbget-0.2.3.orig/global.cpp 2005-09-02 07:00:41.000000000 +0000 ++++ nzbget-0.2.3/global.cpp 2006-05-07 10:21:34.604571751 +0000 +@@ -23,10 +23,10 @@ + */ + + ++#include "config.h" + #include "Frontend.h" + #include "Options.h" + #include "global.h" +-#include "config.h" + #include "GlobalControl.h" + + #include diff --git a/net-nntp/nzbget/files/digest-nzbget-0.2.2 b/net-nntp/nzbget/files/digest-nzbget-0.2.2 index f90cd80a2434..2007e83420d1 100644 --- a/net-nntp/nzbget/files/digest-nzbget-0.2.2 +++ b/net-nntp/nzbget/files/digest-nzbget-0.2.2 @@ -1 +1,3 @@ MD5 377baa033ea8be97422034fd6b3179d6 nzbget-0.2.2.tar.gz 191998 +RMD160 56cbf77ecf8fa54ad12c930f48d750adf5830106 nzbget-0.2.2.tar.gz 191998 +SHA256 4d9773c82eb6b9029e7e40c58fe41c4f89a1ea41b2dfa9f8a7aba8c631365639 nzbget-0.2.2.tar.gz 191998 diff --git a/net-nntp/nzbget/files/digest-nzbget-0.2.3 b/net-nntp/nzbget/files/digest-nzbget-0.2.3 index bbe24d4a2516..164832939023 100644 --- a/net-nntp/nzbget/files/digest-nzbget-0.2.3 +++ b/net-nntp/nzbget/files/digest-nzbget-0.2.3 @@ -1 +1,3 @@ MD5 25554537c7641bd36f573a5f7c89b449 nzbget-0.2.3.tar.gz 202660 +RMD160 3d519bc0f8aff5e03b52edb16509954e020285b6 nzbget-0.2.3.tar.gz 202660 +SHA256 9bedeb890f7ef49d466f95d76ffea1d4d22788d6dc760c96c6433bff3ff1f6b6 nzbget-0.2.3.tar.gz 202660 diff --git a/net-nntp/nzbget/nzbget-0.2.2.ebuild b/net-nntp/nzbget/nzbget-0.2.2.ebuild index 2accf1edb5db..5f3714cfd34d 100644 --- a/net-nntp/nzbget/nzbget-0.2.2.ebuild +++ b/net-nntp/nzbget/nzbget-0.2.2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.2.ebuild,v 1.2 2005/09/13 13:34:42 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.2.ebuild,v 1.3 2006/05/07 10:33:32 swegener Exp $ + +inherit eutils autotools DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files" HOMEPAGE="http://nzbget.sourceforge.net/" @@ -12,9 +14,16 @@ IUSE="debug" DEPEND="dev-libs/libxml2" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/0.2.3-include-order.patch + epatch "${FILESDIR}"/0.2.3-gcc41.patch +} + src_compile() { econf $(use_enable debug) || die "econf failed" - # Bad configure script is forcing CFLAGS, so we pass our own emake CFLAGS="-I. -DHAVE_CONFIG_H -D_GNU_SOURCE ${CFLAGS}" || die "emake failed" } diff --git a/net-nntp/nzbget/nzbget-0.2.3.ebuild b/net-nntp/nzbget/nzbget-0.2.3.ebuild index 9fef6286367f..0731941d2418 100644 --- a/net-nntp/nzbget/nzbget-0.2.3.ebuild +++ b/net-nntp/nzbget/nzbget-0.2.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.3.ebuild,v 1.1 2005/09/13 13:34:42 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.3.ebuild,v 1.2 2006/05/07 10:33:32 swegener Exp $ + +inherit eutils DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files" HOMEPAGE="http://nzbget.sourceforge.net/" @@ -12,9 +14,16 @@ IUSE="debug" DEPEND="dev-libs/libxml2" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/0.2.3-include-order.patch + epatch "${FILESDIR}"/0.2.3-gcc41.patch +} + src_compile() { econf $(use_enable debug) || die "econf failed" - # Bad configure script is forcing CFLAGS, so we pass our own emake CFLAGS="-I. -DHAVE_CONFIG_H -D_GNU_SOURCE ${CFLAGS}" || die "emake failed" } -- cgit v1.2.3-65-gdbad