Bump 5.0.1's rev to include a patch that addresses a compile-time failure only affecting a limited number of x86_64 users. This has already been fixed upstream for the next release.

(Portage version: 2.1.10.45/cvs/Linux x86_64)

3 files changed, 67 insertions, 2 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 9d8558c9a014..7aa76cac6a3d 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.113 2012/01/30 22:46:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.114 2012/03/12 06:56:40 kumba Exp $
+
+*fwbuilder-5.0.1.3592-r1 (12 Mar 2012)
+
+  12 Mar 2012; Joshua Kinard <kumba@gentoo.org> -fwbuilder-5.0.1.3592.ebuild,
+  +fwbuilder-5.0.1.3592-r1.ebuild,
+  +files/fwbuilder-5.0.1.3592-stdc-format-macros.patch:
+  Bump 5.0.1's rev to include a patch that addresses a compile-time failure
+  only affecting a limited number of x86_64 users. This has already been fixed
+  upstream for the next release.
 
   30 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   fwbuilder-5.0.1.3592.ebuild:
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
new file mode 100644
index 000000000000..3658c10a3eec
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
@@ -0,0 +1,51 @@
+From: Vadim Kurland <vadim@slot.vk.crocodile.org>
+Date: Tue, 14 Feb 2012 04:59:26 +0000 (-0800)
+Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+X-Git-Url: http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
+
+fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+needs to be tested on all build machines.
+---
+
+diff --git a/qmake.inc.in b/qmake.inc.in
+index 6bf27e0..3e31fd6 100644
+--- a/qmake.inc.in
++++ b/qmake.inc.in
+@@ -67,6 +67,9 @@ unix {
+ 
+         CONFIG += warn_on
+ 
++        QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++        QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+     }
+ }
+ 
+diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
+index b4f15bb..a8114cf 100644
+--- a/src/libfwbuilder/qmake.inc.in
++++ b/src/libfwbuilder/qmake.inc.in
+@@ -34,6 +34,9 @@ unix {
+     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
+ 
++    QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++    QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+     exec_prefix = @EXEC_PREFIX@
+     DESTDIR =
+ 
+diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
+index 0a2e7a4..b00ab47 100644
+--- a/src/libfwbuilder/src/fwbuilder/uint128.h
++++ b/src/libfwbuilder/src/fwbuilder/uint128.h
+@@ -36,7 +36,7 @@
+ 
+ #include <stdio.h>
+ 
+-#define __STDC_FORMAT_MACROS
++// #define __STDC_FORMAT_MACROS
+ #include <inttypes.h>   // for sprintf formats for "long long"
+ 
+ // convinience macro
+
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
index b1262416c462..14ddd0f71574 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592.ebuild,v 1.4 2012/01/30 22:52:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild,v 1.1 2012/03/12 06:56:40 kumba Exp $
 
 EAPI="4"
 
@@ -24,6 +24,11 @@ PATCHES=(
 )
 
 src_prepare() {
+	# Fix a compile bug that affects some x86_64 platforms.
+	# Addressed in the upcoming 5.0.2.3596 release.
+	# Closes #395151.
+	epatch "${FILESDIR}/${P}-stdc-format-macros.patch"
+
 	qt4-r2_src_prepare
 	sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743
 	eautoreconf