summaryrefslogtreecommitdiff
path: root/packages/graphics
diff options
context:
space:
mode:
authorAvatar Bernd Steinhauser <berniyh@exherbo.org> 2011-01-08 16:52:29 +0100
committerAvatar Bernd Steinhauser <berniyh@exherbo.org> 2011-01-08 17:16:37 +0100
commit8ea7d306695cd15ee9d10715542908620a780856 (patch)
tree336dcc7be4b20f1f30bfd10819ebd6eeff32771b /packages/graphics
parent8afccfbfefed3e28975cefc2d4c8f885e8743573 (diff)
downloadmedia-8ea7d306695cd15ee9d10715542908620a780856.tar.gz
media-8ea7d306695cd15ee9d10715542908620a780856.tar.xz
Bump exiv2 to version 0.21.
Diffstat (limited to 'packages/graphics')
-rw-r--r--packages/graphics/exiv2/exiv2-0.21.exheres-0 (renamed from packages/graphics/exiv2/exiv2-0.19.exheres-0)4
-rw-r--r--packages/graphics/exiv2/files/Fixed-signature-of-XmpParser--registerNs.patch21
2 files changed, 25 insertions, 0 deletions
diff --git a/packages/graphics/exiv2/exiv2-0.19.exheres-0 b/packages/graphics/exiv2/exiv2-0.21.exheres-0
index 958484ae..38fac511 100644
--- a/packages/graphics/exiv2/exiv2-0.19.exheres-0
+++ b/packages/graphics/exiv2/exiv2-0.21.exheres-0
@@ -26,6 +26,10 @@ DEPENDENCIES="
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( xmp )
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/Fixed-signature-of-XmpParser--registerNs.patch
+)
+
UPSTREAM_CHANGELOG="http://www.exiv2.org/changelog.html"
UPSTREAM_RELEASE_NOTES="http://www.exiv2.org/whatsnew.html"
diff --git a/packages/graphics/exiv2/files/Fixed-signature-of-XmpParser--registerNs.patch b/packages/graphics/exiv2/files/Fixed-signature-of-XmpParser--registerNs.patch
new file mode 100644
index 00000000..a7511f98
--- /dev/null
+++ b/packages/graphics/exiv2/files/Fixed-signature-of-XmpParser--registerNs.patch
@@ -0,0 +1,21 @@
+Source: Upstream
+Upstream: Yes
+Reason: Fails to compile with xmp support disabled
+
+Index: trunk/src/xmp.cpp
+===================================================================
+--- trunk/src/xmp.cpp (revision 2420)
++++ trunk/src/xmp.cpp (revision 2421)
+@@ -420,11 +420,10 @@
+ }
+ } // XmpParser::registerNs
+ #else
+- bool XmpParser::registerNs(const std::string& /*ns*/,
++ void XmpParser::registerNs(const std::string& /*ns*/,
+ const std::string& /*prefix*/)
+ {
+ initialize();
+- return true;
+ } // XmpParser::registerNs
+ #endif
+