Control: tags -1 patch
Hi,
On Mon, 3 Jun 2013 09:19:24 +0200
Sebastian Ramacher <sramac...@debian.org> wrote:
> > Well, the bug should be already fixed upstream. We changed the name of
> > the macro.
>
> Cool. Could you point me to the revision that renamed the macro?
Probably this one
>r15398 | dgarcia | 2013-03-12 09:28:38 +0900 (2013年03月12日 (火)) | 2 lines
>
> * undefining TIME_UTC to resolve dbts #701257
Index: CLAM/src/System/Threads/xtime.hxx
===================================================================
--- CLAM/src/System/Threads/xtime.hxx (revision 15397)
+++ CLAM/src/System/Threads/xtime.hxx (revision 15398)
@@ -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
{
And I've succeeded to build a package, debdiff attached.
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
diff -Nru clam-1.4.0/debian/changelog clam-1.4.0/debian/changelog
--- clam-1.4.0/debian/changelog 2012-05-29 13:48:54.000000000 +0900
+++ clam-1.4.0/debian/changelog 2014-02-07 23:06:11.000000000 +0900
@@ -1,3 +1,11 @@
+clam (1.4.0-5.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches
+ - add bug701257_ignore_TIME_UTC.patch (Closes: #701257)
+
+ -- Hideki Yamane <henr...@debian.org> Fri, 07 Feb 2014 23:06:09 +0900
+
clam (1.4.0-5.1) unstable; urgency=low
* Non maintainer upload
diff -Nru clam-1.4.0/debian/patches/bug701257_ignore_TIME_UTC.patch clam-1.4.0/debian/patches/bug701257_ignore_TIME_UTC.patch
--- clam-1.4.0/debian/patches/bug701257_ignore_TIME_UTC.patch 1970-01-01 09:00:00.000000000 +0900
+++ clam-1.4.0/debian/patches/bug701257_ignore_TIME_UTC.patch 2014-02-07 23:05:34.000000000 +0900
@@ -0,0 +1,20 @@
+Description: fix FTBFS with TIME_UTC difinition
+Origin: upstream
+ svn diff -r 15397:15398
+Bug-Debian: http://bugs.debian.org/701257
+Last-Update: 2014-02-07
+
+--- clam-1.4.0.orig/src/System/Threads/xtime.hxx
++++ clam-1.4.0/src/System/Threads/xtime.hxx
+@@ -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 -Nru clam-1.4.0/debian/patches/series clam-1.4.0/debian/patches/series
--- clam-1.4.0/debian/patches/series 2011-05-17 08:58:16.000000000 +0900
+++ clam-1.4.0/debian/patches/series 2014-02-07 23:04:06.000000000 +0900
@@ -1 +1,2 @@
ftbfs_NULL
+bug701257_ignore_TIME_UTC.patch
