[SCM] clam/master: Imported Debian patch 1.4.0-5.2

[jcowgill-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d71a0cad310666f30bb98166e9953c910d39d776
Author: Jay Berkenbilt <qjb at debian.org>
Date:   Sat Feb 15 17:27:09 2014 -0500

    Imported Debian patch 1.4.0-5.2

diff --git a/debian/changelog b/debian/changelog
index e590246..0c7ac30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clam (1.4.0-5.2) unstable; urgency=low
+
+  * Non maintainer upload
+  * Fix FTBFS: TIME_UTC compilation error (Closes: #701257)
+  * Fix FTBFS: gcc 4.8 template expansion error
+  * Support Xerces C 3 (Closes: #733071)
+
+ -- Jay Berkenbilt <qjb at debian.org>  Sat, 15 Feb 2014 17:27:09 -0500
+
 clam (1.4.0-5.1) unstable; urgency=low
 
   * Non maintainer upload
diff --git a/debian/control b/debian/control
index e7f144a..6b7dfc1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 	libasound2-dev,
 	libjack-dev,
 	libfftw3-dev,
-	libxerces-c2-dev,
+	libxerces-c-dev,
 	ladspa-sdk,
 	libogg-dev,
 	libsndfile1-dev,
diff --git a/debian/patches/gcc48.patch b/debian/patches/gcc48.patch
new file mode 100644
index 0000000..1635ef0
--- /dev/null
+++ b/debian/patches/gcc48.patch
@@ -0,0 +1,16 @@
+Description: support Xerces-c 3
+Origin: upstream
+        svn diff -c15306
+
+Index: clam-1.4.0/src/Flow/Ports/OutPort.hxx
+===================================================================
+--- clam-1.4.0.orig/src/Flow/Ports/OutPort.hxx	2014-02-15 16:36:01.654895560 -0500
++++ clam-1.4.0/src/Flow/Ports/OutPort.hxx	2014-02-15 17:15:31.955139980 -0500
+@@ -28,6 +28,7 @@
+ #include <string>
+ #include "InPort.hxx"
+ #include "InPortPublisher.hxx"
++#include "TypeInfo.hxx"
+ 
+ namespace CLAM
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 5880754..07f2e21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 ftbfs_NULL
+gcc48.patch
+time_utc.patch
+xerces-c-3.patch
diff --git a/debian/patches/time_utc.patch b/debian/patches/time_utc.patch
new file mode 100644
index 0000000..b48a36e
--- /dev/null
+++ b/debian/patches/time_utc.patch
@@ -0,0 +1,21 @@
+Description: fix FTBFS with TIME_UTC difinition
+Origin: upstream
+        svn diff -r 15397:15398
+Bug-Debian: http://bugs.debian.org/701257
+
+Index: clam-1.4.0/src/System/Threads/xtime.hxx
+===================================================================
+--- clam-1.4.0.orig/src/System/Threads/xtime.hxx	2014-02-15 17:00:47.975907239 -0500
++++ clam-1.4.0/src/System/Threads/xtime.hxx	2014-02-15 17:02:27.892272416 -0500
+@@ -30,6 +30,11 @@
+ #endif
+ #include <pthread.h>
+ 
++// KLUDGE: C11 defines TIME_UTC as macro in time.h
++#ifdef TIME_UTC
++#undef TIME_UTC
++#endif
++
+ namespace CLAM
+ {
+ 
diff --git a/debian/patches/xerces-c-3.patch b/debian/patches/xerces-c-3.patch
new file mode 100644
index 0000000..205a9db
--- /dev/null
+++ b/debian/patches/xerces-c-3.patch
@@ -0,0 +1,64 @@
+Description: support Xerces-c 3
+Origin: upstream
+        svn diff -c14272
+Bug-Debian: http://bugs.debian.org/733071
+
+Index: clam-1.4.0/src/Storage/XML/XercesDomWriter.cxx
+===================================================================
+--- clam-1.4.0.orig/src/Storage/XML/XercesDomWriter.cxx	2014-02-15 16:36:34.074990685 -0500
++++ clam-1.4.0/src/Storage/XML/XercesDomWriter.cxx	2014-02-15 17:00:40.499879918 -0500
+@@ -26,7 +26,8 @@
+ #include <xercesc/dom/DOMImplementation.hpp>
+ #include <xercesc/dom/DOMImplementationLS.hpp>
+ #include <xercesc/dom/DOMImplementationRegistry.hpp>
+-#include <xercesc/dom/DOMWriter.hpp>
++#include <xercesc/dom/DOMLSSerializer.hpp>
++#include <xercesc/dom/DOMLSOutput.hpp>
+ #include <xercesc/framework/MemBufFormatTarget.hpp>
+ #include <string>
+ #include <sstream>
+@@ -38,23 +39,30 @@
+ 		XercesInitializer::require();
+ 		const XMLCh * propertyCanonical = xercesc::XMLUni::fgDOMWRTCanonicalForm;
+ 		const XMLCh * propertyPrettyPrint = xercesc::XMLUni::fgDOMWRTFormatPrettyPrint;
+-		xercesc::DOMImplementation *impl = 
++		xercesc::DOMImplementationLS *impl = 
++			(xercesc::DOMImplementationLS*)
+ 			xercesc::DOMImplementationRegistry::getDOMImplementation(U("LS"));
+-		xercesc::DOMWriter *xercesWriter = 
+-			((xercesc::DOMImplementationLS*)impl)->createDOMWriter();
++		xercesc::DOMLSSerializer *serializer = impl->createLSSerializer();
++		xercesc::DOMLSOutput     *output     = impl->createLSOutput();
+ 
+-		if (xercesWriter->canSetFeature(propertyPrettyPrint, mShouldIndent))
+-			xercesWriter->setFeature(propertyPrettyPrint, mShouldIndent);
+-		if (xercesWriter->canSetFeature(propertyCanonical, mShouldCanonicalize))
+-			xercesWriter->setFeature(propertyCanonical, mShouldCanonicalize);
+-
+-		xercesc::MemBufFormatTarget * xercesTarget = new xercesc::MemBufFormatTarget();
+-		xercesWriter->writeNode(xercesTarget, *node);
+-		const char * buffer = (char *) xercesTarget->getRawBuffer();
+-		const unsigned bufferLen = xercesTarget->getLen();
++		output->setEncoding(U("UTF-8"));
++
++		xercesc::DOMConfiguration* serializerConfig = serializer->getDomConfig();
++
++		if (serializerConfig->canSetParameter(propertyPrettyPrint, mShouldIndent))
++			serializerConfig->setParameter(propertyPrettyPrint, mShouldIndent);
++		if (serializerConfig->canSetParameter(propertyCanonical, mShouldCanonicalize))
++			serializerConfig->setParameter(propertyCanonical, mShouldCanonicalize);
++
++		xercesc::MemBufFormatTarget formatTarget;
++		output->setByteStream(&formatTarget);
++		serializer->write(node, output);
++
++		const char * buffer = (char *) formatTarget.getRawBuffer();
++		const unsigned bufferLen = formatTarget.getLen();
+ 		target << std::string(buffer,bufferLen);
+-		delete xercesWriter;
+-		delete xercesTarget;
++		serializer->release();
++		output->release();
+ 	}
+ 
+ }

-- 
clam packaging