Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 8 Feb 2018 07:48:49 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461202 - head/graphics/enblend/files
Message-ID:  <201802080748.w187mncO046381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: danfe
Date: Thu Feb  8 07:48:49 2018
New Revision: 461202
URL: https://svnweb.freebsd.org/changeset/ports/461202

Log:
  Unbreak the build against recent Clang by backporting two patches from the
  upstream (issue #1537368):
  
    - Unconditional usage of std::auto_ptr<> in "vigra_ext" code:
      http://hg.code.sf.net/p/enblend/code/rev/467a73754dbb
  
    - Get rid of `boost::assign::map_list_of' (additional patch):
      http://hg.code.sf.net/p/enblend/code/rev/73e6f16de80a
  
  PR:	225557

Added:
  head/graphics/enblend/files/
  head/graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx   (contents, props changed)
  head/graphics/enblend/files/patch-src_filespec.cc   (contents, props changed)

Added: head/graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/enblend/files/patch-include_vigra__ext_impexalpha.hxx	Thu Feb  8 07:48:49 2018	(r461202)
@@ -0,0 +1,57 @@
+# HG changeset patch
+# User Chris <cspiel@users.sourceforge.net>
+# Date 1453651551 -3600
+# Node ID 467a73754dbb0e269f1b515bc2ef6664ab328bfa
+# Parent  6aec0cc8d22a6fa617f983e676df68d75ffabbcf
+Fix issue #1537368: Unconditional usage of std::auto_ptr<>
+in "vigra_ext" code.
+
+diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx
+--- include/vigra_ext/impexalpha.hxx.orig	2015-08-07 14:45:05 UTC
++++ include/vigra_ext/impexalpha.hxx
+@@ -26,6 +26,9 @@
+ #include <vigra/imageinfo.hxx>
+ #include <vigra/impex.hxx>
+ 
++#ifndef VIGRA_UNIQUE_PTR
++#define VIGRA_UNIQUE_PTR std::auto_ptr
++#endif
+ 
+ namespace vigra_ext
+ {
+@@ -194,7 +197,7 @@ namespace vigra_ext
+                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
+                          vigra::VigraTrueType)
+         {
+-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
++            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
+ 
+             switch (pixel_t_of_string(decoder->getPixelType()))
+             {
+@@ -249,7 +252,7 @@ namespace vigra_ext
+                          AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
+                          vigra::VigraFalseType)
+         {
+-            std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
++            VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
+ 
+             switch (pixel_t_of_string(decoder->getPixelType()))
+             {
+@@ -467,7 +470,7 @@ namespace vigra_ext
+                          vigra::VigraTrueType)
+         {
+             const std::string pixel_type(export_info.getPixelType());
+-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
++            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
+ 
+             encoder->setPixelType(pixel_type);
+ 
+@@ -525,7 +528,7 @@ namespace vigra_ext
+                          vigra::VigraFalseType)
+         {
+             const std::string pixel_type(export_info.getPixelType());
+-            std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
++            VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
+ 
+             encoder->setPixelType(pixel_type);
+ 

Added: head/graphics/enblend/files/patch-src_filespec.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/enblend/files/patch-src_filespec.cc	Thu Feb  8 07:48:49 2018	(r461202)
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Chris <cspiel@users.sourceforge.net>
+# Date 1455528030 -3600
+# 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
+--- src/filespec.cc.orig	2015-08-07 14:45:02 UTC
++++ src/filespec.cc
+@@ -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 @@ class Globbing
+ public:
+     Globbing() : algorithm_name_("literal"), algorithm_(NULL)
+     {
+-        installed_algorithms_ =
+-            boost::assign::map_list_of
+-            ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
+-            ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
+-#ifndef _WIN32
+-            ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
+-#endif
+-            ;
+-
++        installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm);
++        installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm);
+         setup_alias("literal", "none");
++
+ #ifndef _WIN32
++        installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm);
+         setup_alias("shell", "sh");
+ #endif
+     }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802080748.w187mncO046381>