summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/exiv2/ChangeLog6
-rw-r--r--media-gfx/exiv2/exiv2-0.19.ebuild4
-rw-r--r--media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch19
3 files changed, 27 insertions, 2 deletions
diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 40c4a763caa8..b0647e3c8ff1 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/exiv2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.80 2010/01/23 16:46:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.81 2010/01/24 13:09:20 swegener Exp $
+
+ 24 Jan 2010; Sven Wegener <swegener@gentoo.org> exiv2-0.19.ebuild,
+ +files/exiv2-0.19-syntax-fix.patch:
+ Include a syntax fix from upstream, bug #302026.
*exiv2-0.19 (23 Jan 2010)
diff --git a/media-gfx/exiv2/exiv2-0.19.ebuild b/media-gfx/exiv2/exiv2-0.19.ebuild
index 31eacb938d9f..46539e34bda3 100644
--- a/media-gfx/exiv2/exiv2-0.19.ebuild
+++ b/media-gfx/exiv2/exiv2-0.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.19.ebuild,v 1.1 2010/01/23 16:46:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.19.ebuild,v 1.2 2010/01/24 13:09:20 swegener Exp $
EAPI="2"
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-syntax-fix.patch
+
if use unicode; then
for i in doc/cmd.txt; do
echo ">>> Converting "${i}" to UTF-8"
diff --git a/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch b/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch
new file mode 100644
index 000000000000..9f217fdae648
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.19-syntax-fix.patch
@@ -0,0 +1,19 @@
+------------------------------------------------------------------------
+r1990 | ahuggel | 2010-01-02 02:15:28 +0100 (Sat, 02 Jan 2010) | 1 line
+
+Minor fix. (Fulvio Senore)
+------------------------------------------------------------------------
+
+Index: exiv2/src/value.cpp
+===================================================================
+--- exiv2/src/value.cpp (revision 1989)
++++ exiv2/src/value.cpp (revision 1990)
+@@ -160,7 +160,7 @@
+ DataBuf Value::dataArea() const
+ {
+ return DataBuf(0, 0);
+- };
++ }
+
+ DataValue::DataValue(TypeId typeId) : Value(typeId)
+ {