Control: tags 811857 + patch Dear maintainer,
I've prepared an NMU for synaptic (versioned as 0.83+nmu1) and
uploaded it under the zero-day NMU rules as this FTBFS was blocking
the auto-xapian-core transition.
The patch applied was cherry-picked from your git repo.
Cheers,
Olly
diff -Nru synaptic-0.83/debian/changelog synaptic-0.83+nmu1/debian/changelog
--- synaptic-0.83/debian/changelog 2016-01-11 22:20:13.000000000 +1300
+++ synaptic-0.83+nmu1/debian/changelog 2016-10-02 09:50:57.000000000 +1300
@@ -1,3 +1,11 @@
+synaptic (0.83+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC6 (Closes: #811857)
+ + New patch 99_fix_build_with_gcc6, cherry-picked from git.
+
+ -- Olly Betts <o...@survex.com> Sun, 02 Oct 2016 09:50:57 +1300
+
synaptic (0.83) unstable; urgency=medium
[ xuzhen ]
diff -Nru synaptic-0.83/debian/patches/00list synaptic-0.83+nmu1/debian/patches/00list
--- synaptic-0.83/debian/patches/00list 2016-01-11 22:22:42.000000000 +1300
+++ synaptic-0.83+nmu1/debian/patches/00list 2016-10-02 09:50:57.000000000 +1300
@@ -0,0 +1 @@
+99_fix_build_with_gcc6
diff -Nru synaptic-0.83/debian/patches/00list.Debian synaptic-0.83+nmu1/debian/patches/00list.Debian
--- synaptic-0.83/debian/patches/00list.Debian 2016-01-11 22:20:13.000000000 +1300
+++ synaptic-0.83+nmu1/debian/patches/00list.Debian 2016-10-02 09:49:29.000000000 +1300
@@ -0,0 +1 @@
+99_fix_build_with_gcc6
diff -Nru synaptic-0.83/debian/patches/99_fix_build_with_gcc6.dpatch synaptic-0.83+nmu1/debian/patches/99_fix_build_with_gcc6.dpatch
--- synaptic-0.83/debian/patches/99_fix_build_with_gcc6.dpatch 1970-01-01 12:00:00.000000000 +1200
+++ synaptic-0.83+nmu1/debian/patches/99_fix_build_with_gcc6.dpatch 2016-10-02 09:50:39.000000000 +1300
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_fix_build_with_gcc6.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: commit a18b8e55c78f735446db69010872b66e8fbd5ff4
+## DP: Author: Michael Vogt <m...@ubuntu.com>
+## DP: Date: Thu Jan 21 16:59:53 2016 +0100
+## DP:
+## DP: Fix build with gcc6
+## DP:
+## DP: The make_pair() functions does not take a template parameter
+## DP: anymore.
+## DP:
+## DP: Thanks: Martin Michlmayer
+## DP: Closes: #811857
+
+@DPATCH@
+diff --git a/gtk/rglogview.cc b/gtk/rglogview.cc
+index b55bc8da..317457d2 100644
+--- a/gtk/rglogview.cc
++++ b/gtk/rglogview.cc
+@@ -23,6 +23,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <map>
++#include <utility>
+ #include <apt-pkg/fileutl.h>
+
+ #include "config.h"
+@@ -86,7 +87,7 @@ void RGLogView::readLogs()
+ COLUMN_LOG_TYPE, LOG_TYPE_TOPLEVEL,
+ -1);
+ g_free(sort_key);
+- history_map.insert(make_pair<int,GtkTreeIter>(history_key,month_iter));
++ history_map.insert(std::make_pair(history_key,month_iter));
+ } else {
+ month_iter = history_map[history_key];
+ }
signature.asc
Description: PGP signature
