rev 9834 - in kde-extras/exiv2/trunk/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-03-23 14:49:31 +0000 (Sun, 23 Mar 2008)
New Revision: 9834

Added:
   kde-extras/exiv2/trunk/debian/patches/02_gcc4.3.diff
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/patches/series
Log:
  * Team upload to address FTBFS with GCC 4.3.
  * Apply patch by Cyril Brulebois to fix FTBFS with GCC 4.3.
    (Closes: #466901)



Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2008-03-23 14:08:31 UTC (rev 9833)
+++ kde-extras/exiv2/trunk/debian/changelog	2008-03-23 14:49:31 UTC (rev 9834)
@@ -1,3 +1,13 @@
+exiv2 (0.16-4) unstable; urgency=low
+
+  [Ana Beatriz Guerrero Lopez]
+  
+  * Team upload to address FTBFS with GCC 4.3.
+  * Apply patch by Cyril Brulebois to fix FTBFS with GCC 4.3.
+    (Closes: #466901)
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 23 Mar 2008 15:42:16 +0100
+
 exiv2 (0.16-3) unstable; urgency=low
 
   * Remove Conflicts/Replaces libexiv2-0 for libexiv2-2. (Closes: #463852)

Added: kde-extras/exiv2/trunk/debian/patches/02_gcc4.3.diff
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/02_gcc4.3.diff	                        (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/02_gcc4.3.diff	2008-03-23 14:49:31 UTC (rev 9834)
@@ -0,0 +1,39 @@
+--- 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

Modified: kde-extras/exiv2/trunk/debian/patches/series
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/series	2008-03-23 14:08:31 UTC (rev 9833)
+++ kde-extras/exiv2/trunk/debian/patches/series	2008-03-23 14:49:31 UTC (rev 9834)
@@ -1 +1,2 @@
 01_gcc4.3.diff
+02_gcc4.3.diff