summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2013-02-19 18:45:27 +0000
committerRyan Hill <dirtyepic@gentoo.org>2013-02-19 18:45:27 +0000
commit67a182baf1740aa43010280d3dee868196190460 (patch)
tree06295be0b0a6a754600476582e1ddda764de3406 /media-gfx/gimmage
parentVersion bump, added 0.5 and 0.5.1. (diff)
downloadgentoo-2-67a182baf1740aa43010280d3dee868196190460.tar.gz
gentoo-2-67a182baf1740aa43010280d3dee868196190460.tar.bz2
gentoo-2-67a182baf1740aa43010280d3dee868196190460.zip
Fix build with GCC 4.7 (bug #422453).
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Diffstat (limited to 'media-gfx/gimmage')
-rw-r--r--media-gfx/gimmage/ChangeLog8
-rw-r--r--media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch19
-rw-r--r--media-gfx/gimmage/gimmage-0.2.3.ebuild7
3 files changed, 29 insertions, 5 deletions
diff --git a/media-gfx/gimmage/ChangeLog b/media-gfx/gimmage/ChangeLog
index 487f71c72453..f5ae45a07d54 100644
--- a/media-gfx/gimmage/ChangeLog
+++ b/media-gfx/gimmage/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/gimmage
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.17 2012/05/05 07:00:25 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.18 2013/02/19 18:45:27 dirtyepic Exp $
+
+ 19 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> gimmage-0.2.3.ebuild,
+ +files/gimmage-0.2.3-gcc47.patch:
+ Fix build with GCC 4.7 (bug #422453).
05 May 2012; Jeff Horelick <jdhore@gentoo.org> gimmage-0.2.3.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch b/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
new file mode 100644
index 000000000000..bc39028cf161
--- /dev/null
+++ b/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/422453
+
+error: 'get_current_dir_name' was not declared in this scope
+
+
+ src/FileManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/FileManager.cpp
++++ b/src/FileManager.cpp
+@@ -30,7 +30,7 @@ Copyright 2006 Bartek Kostrzewa
+
+ extern "C" {
+ #include <libintl.h>
+-// #include <unistd.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ }
+
diff --git a/media-gfx/gimmage/gimmage-0.2.3.ebuild b/media-gfx/gimmage/gimmage-0.2.3.ebuild
index de34cd9b9a53..980cc139770c 100644
--- a/media-gfx/gimmage/gimmage-0.2.3.ebuild
+++ b/media-gfx/gimmage/gimmage-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.11 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.12 2013/02/19 18:45:27 dirtyepic Exp $
EAPI=2
inherit autotools eutils
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-desktop-entry.patch
+ "${FILESDIR}"/${P}-desktop-entry.patch \
+ "${FILESDIR}"/${P}-gcc47.patch
eautoreconf
}