diff --git a/multimedia/graphics/enblend/files/enblend-4.1.4-gcc6.patch b/multimedia/graphics/enblend/files/enblend-4.1.4-gcc6.patch new file mode 100644 index 0000000000..58349e2e70 --- /dev/null +++ b/multimedia/graphics/enblend/files/enblend-4.1.4-gcc6.patch @@ -0,0 +1,90 @@ +diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx +--- a/include/vigra_ext/impexalpha.hxx Mon Sep 28 09:41:56 2015 +0200 ++++ b/include/vigra_ext/impexalpha.hxx Sun Jan 24 17:05:51 2016 +0100 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2012-2014 Christoph L. Spiel ++ * Copyright (C) 2012-2016 Christoph L. Spiel + * + * This file is part of Enblend. + * +@@ -26,6 +26,9 @@ + #include + #include + ++#ifndef VIGRA_UNIQUE_PTR ++#define VIGRA_UNIQUE_PTR std::auto_ptr ++#endif + + namespace vigra_ext + { +@@ -194,7 +197,7 @@ + AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor, + vigra::VigraTrueType) + { +- std::auto_ptr decoder(vigra::decoder(import_info)); ++ VIGRA_UNIQUE_PTR decoder(vigra::decoder(import_info)); + + switch (pixel_t_of_string(decoder->getPixelType())) + { +@@ -249,7 +252,7 @@ + AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor, + vigra::VigraFalseType) + { +- std::auto_ptr decoder(vigra::decoder(import_info)); ++ VIGRA_UNIQUE_PTR decoder(vigra::decoder(import_info)); + + switch (pixel_t_of_string(decoder->getPixelType())) + { +@@ -467,7 +470,7 @@ + vigra::VigraTrueType) + { + const std::string pixel_type(export_info.getPixelType()); +- std::auto_ptr encoder(vigra::encoder(export_info)); ++ VIGRA_UNIQUE_PTR encoder(vigra::encoder(export_info)); + + encoder->setPixelType(pixel_type); + +@@ -525,7 +528,7 @@ + vigra::VigraFalseType) + { + const std::string pixel_type(export_info.getPixelType()); +- std::auto_ptr encoder(vigra::encoder(export_info)); ++ VIGRA_UNIQUE_PTR encoder(vigra::encoder(export_info)); + + encoder->setPixelType(pixel_type); + +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 + + #include +-#include + + #include + +@@ -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 + } \ No newline at end of file diff --git a/multimedia/graphics/enblend/pspec.xml b/multimedia/graphics/enblend/pspec.xml index 9e865e3ed1..369042a154 100644 --- a/multimedia/graphics/enblend/pspec.xml +++ b/multimedia/graphics/enblend/pspec.xml @@ -28,6 +28,7 @@ gentoo_prepare.patch + enblend-4.1.4-gcc6.patch