Commit e060ceb7 authored by Andreas Metzler's avatar Andreas Metzler

enblend-enfuse 4.1.5

New upstream version.
+ really fixes gcc-6 build (#811869), drop previously added patches.
parent a24688c0
enblend-enfuse (4.1.4+dfsg-6) UNRELEASED; urgency=medium
enblend-enfuse (4.1.5+dfsg-1) UNRELEASED; urgency=medium
* Pull 32_73e6f16de80a_Get_rid_of__boost__assign__map_list.diff from
upstream HG (4.1.5 branch), which really fixes the gcc-6 build
(#811869).
* New upstream version.
+ really fixes gcc-6 build (#811869), drop previously added patches.
-- Andreas Metzler <ametzler@debian.org> Mon, 15 Feb 2016 19:06:27 +0100
......
# HG changeset patch
# User Chris <cspiel@users.sourceforge.net>
# Date 1455528030 -3600
# Mon Feb 15 10:20:30 2016 +0100
# Branch stable-4_1
# Node ID 73e6f16de80a94175db61f82ad10d4cd96790e85
# Parent 596efbff27a8271a4c20184163e72b5914e334bf
Fix issue #1537368 (additional patch): Get rid of `boost::assign::map_list_of'.
diff -r 596efbff27a8 -r 73e6f16de80a src/filespec.cc
--- a/src/filespec.cc Sun Jan 24 17:06:09 2016 +0100
+++ b/src/filespec.cc Mon Feb 15 10:20:30 2016 +0100
@@ -37,7 +37,6 @@
#include <cctype>
#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/assign/list_of.hpp>
#include <vigra/imageinfo.hxx>
@@ -412,17 +411,12 @@
public:
Globbing() : algorithm_name_("literal"), algorithm_(NULL)
{
- installed_algorithms_ =
- boost::assign::map_list_of
- ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
- ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
+ installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm);
+ installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm);
+ setup_alias("literal", "none");
+
#ifndef _WIN32
- ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
-#endif
- ;
-
- setup_alias("literal", "none");
-#ifndef _WIN32
+ installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm);
setup_alias("shell", "sh");
#endif
}
20_reproducible_sig.diff
31_467a73754dbb_Fix_issue__1537368__Unconditional_usage_of_std__auto_ptr__.diff
32_73e6f16de80a_Get_rid_of__boost__assign__map_list.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment