[arch-commits] Commit in exiv2/trunk (PKGBUILD exiv2_gcc-4.3.diff)

[Pierre Schmitz]

    Date: Wednesday, March 25, 2009 @ 12:14:51
  Author: pierre
Revision: 31301

upgpkg: exiv2 0.18-1

Modified:
  exiv2/trunk/PKGBUILD
Deleted:
  exiv2/trunk/exiv2_gcc-4.3.diff

--------------------+
 PKGBUILD           |   11 +++++------
 exiv2_gcc-4.3.diff |   39 ---------------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-25 14:05:40 UTC (rev 31300)
+++ PKGBUILD	2009-03-25 16:14:51 UTC (rev 31301)
@@ -2,21 +2,20 @@
 # Maintainer: tobias <tobias at arhlinux.org>
 
 pkgname=exiv2
-pkgver=0.17.1
+pkgver=0.18
 pkgrel=1
 pkgdesc="Exif and Iptc metadata manipulation library and tools."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://exiv2.org"
 license=('GPL2')
 depends=('gcc-libs' 'zlib' 'expat')
 options=('!libtool')
 source=(http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('52a602f4f0d9e89b7084ac795b7547ac')
+md5sums=('03044792525ae0a1b109df5a53b858fb')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  #patch -Np1 -i ../exiv2_gcc-4.3.diff || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 }

Deleted: exiv2_gcc-4.3.diff
===================================================================
--- exiv2_gcc-4.3.diff	2009-03-25 14:05:40 UTC (rev 31300)
+++ exiv2_gcc-4.3.diff	2009-03-25 16:14:51 UTC (rev 31301)
@@ -1,39 +0,0 @@
---- a/xmpsdk/src/XMPCore_Impl.hpp
-+++ b/xmpsdk/src/XMPCore_Impl.hpp
-@@ -24,6 +24,7 @@
- #include <map>
- 
- #include <cassert>
-+#include <cstring>
- 
- #if XMP_MacBuild
- 	#include <Multiprocessing.h>
-@@ -89,7 +90,7 @@
- #define kHexDigits "0123456789ABCDEF"
- 
- #define XMP_LitMatch(s,l)		(std::strcmp((s),(l)) == 0)
--#define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
-+#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
- 	// *** Use the above macros!
- 
- #define kTab ((char)0x09)
-@@ -369,7 +370,7 @@
- IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
- {
- 	bool isPrefix = false;
--	XMP_StringLen prefixLen = std::strlen(prefix);
-+	XMP_StringLen prefixLen = strlen(prefix);
- 	if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
- 		char separator = fullPath[prefixLen];
- 		if ( (separator == 0) || (separator == '/') ||
---- a/xmpsdk/src/XMPMeta.cpp
-+++ b/xmpsdk/src/XMPMeta.cpp
-@@ -20,6 +20,8 @@
- #include "UnicodeInlines.incl_cpp"
- #include "UnicodeConversions.hpp"
- 
-+#include <cstring>
-+
- #if XMP_DebugBuild
- 	#include <iostream>
- #endif