Attachment 179623 Details for Bug 216803 – patch

[patch] patch

gecode.diff (text/plain), 9.28 KB, created by Demetris Procopiou on 2017-02-04 23:58:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Demetris Procopiou

Created: 2017-02-04 23:58:29 UTC

Size: 9.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433338)
>+++ Makefile	(working copy)
>@@ -2,17 +2,18 @@
> # $FreeBSD$
> 
> PORTNAME=	gecode
>-PORTVERSION=	4.4.0
>+PORTVERSION=	5.0.0
> CATEGORIES=	devel
> MASTER_SITES=	http://www.gecode.org/download/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	dem.procopiou@gmail.com
> COMMENT=	Generic Constraint Development Environment
> 
> LICENSE=	BSL MIT
> LICENSE_COMB=	multi
> 
>-LIB_DEPENDS=	libmpfr.so:math/mpfr
>+LIB_DEPENDS=	libmpfr.so:math/mpfr \
>+		libgmp.so:math/gmp
> 
> BROKEN_aarch64=	Fails to build: error Boost.Numeric.Interval: Please specify rounding control mechanism
> BROKEN_mips64=	Fails to build: error Boost.Numeric.Interval: Please specify rounding control mechanism
>@@ -38,7 +39,7 @@
> 		--with-mpfr-lib=${LOCALBASE}/lib
> USE_LDCONFIG=	yes
> MAKE_JOBS_UNSAFE=yes
>-PLIST_SUB=	SHLIB_VERSION=41
>+PLIST_SUB=	SHLIB_VERSION=43
> 
> OPTIONS_DEFINE=	GIST
> OPTIONS_SUB=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 433338)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (gecode-4.4.0.tar.gz) = 430398d6900b999f92c6329636f3855f2d4e985fed420a6c4d42b46bfc97782a
>-SIZE (gecode-4.4.0.tar.gz) = 2888696
>+TIMESTAMP = 1486249442
>+SHA256 (gecode-5.0.0.tar.gz) = f4ff2fa115fed8c09a049b2d8520363b1f9b1a39d80461f597e29dab2ba9e77b
>+SIZE (gecode-5.0.0.tar.gz) = 3188887
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 433338)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig
>+--- Makefile.in.orig	2016-10-23 12:09:24 UTC
> +++ Makefile.in
>-@@ -812,8 +812,8 @@
>+@@ -851,8 +851,8 @@ endif
>  #
>  
>  
>Index: files/patch-gecode_third-party_boost_numeric_interval_detail_msvc__rounding__control.hpp
>===================================================================
>--- files/patch-gecode_third-party_boost_numeric_interval_detail_msvc__rounding__control.hpp	(nonexistent)
>+++ files/patch-gecode_third-party_boost_numeric_interval_detail_msvc__rounding__control.hpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- gecode/third-party/boost/numeric/interval/detail/msvc_rounding_control.hpp.orig	2014-10-03 13:34:37 UTC
>++++ gecode/third-party/boost/numeric/interval/detail/msvc_rounding_control.hpp
>+@@ -88,7 +88,11 @@ struct x86_rounding
>+   static void get_rounding_mode(rounding_mode& mode)
>+   { mode = msvc2hard(_control87(0, 0)); }
>+   static void set_rounding_mode(const rounding_mode mode)
>++#if defined(_M_X64) || defined(_M_IA64)
>++  { _control87(hard2msvc(mode), _MCW_EM | _MCW_RC ); }
>++#else
>+   { _control87(hard2msvc(mode), _MCW_EM | _MCW_RC | _MCW_PC | _MCW_IC); }
>++#endif
>+   static double to_int(const double& x) { return rint(x); }
>+ };
>+ 
>
>Property changes on: files/patch-gecode_third-party_boost_numeric_interval_detail_msvc__rounding__control.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 433338)
>+++ pkg-plist	(working copy)
>@@ -43,6 +43,10 @@
> include/gecode/float/rel/lq-le.hpp
> include/gecode/float/rel/nq.hpp
> include/gecode/float/rounding.hpp
>+include/gecode/float/trace.hpp
>+include/gecode/float/trace/delta.hpp
>+include/gecode/float/trace/trace-view.hpp
>+include/gecode/float/trace/traits.hpp
> include/gecode/float/transcendental.hh
> include/gecode/float/transcendental/exp-log.hpp
> include/gecode/float/trigonometric.hh
>@@ -144,14 +148,16 @@
> include/gecode/int/count/view-gq.hpp
> include/gecode/int/count/view-lq.hpp
> include/gecode/int/cumulative.hh
>-include/gecode/int/cumulative/basic.hpp
> include/gecode/int/cumulative/edge-finding.hpp
> include/gecode/int/cumulative/limits.hpp
> include/gecode/int/cumulative/man-prop.hpp
> include/gecode/int/cumulative/opt-prop.hpp
> include/gecode/int/cumulative/overload.hpp
>+include/gecode/int/cumulative/post.hpp
>+include/gecode/int/cumulative/subsumption.hpp
> include/gecode/int/cumulative/task-view.hpp
> include/gecode/int/cumulative/task.hpp
>+include/gecode/int/cumulative/time-tabling.hpp
> include/gecode/int/cumulative/tree.hpp
> include/gecode/int/cumulatives.hh
> include/gecode/int/cumulatives/val.hpp
>@@ -159,6 +165,7 @@
> include/gecode/int/distinct/bnd.hpp
> include/gecode/int/distinct/dom-ctrl.hpp
> include/gecode/int/distinct/dom.hpp
>+include/gecode/int/distinct/eqite.hpp
> include/gecode/int/distinct/graph.hpp
> include/gecode/int/distinct/ter-dom.hpp
> include/gecode/int/distinct/val.hpp
>@@ -193,6 +200,7 @@
> include/gecode/int/idx-view.hpp
> include/gecode/int/int-set-1.hpp
> include/gecode/int/int-set-2.hpp
>+include/gecode/int/ipl.hpp
> include/gecode/int/ldsb.hh
> include/gecode/int/ldsb/brancher.hpp
> include/gecode/int/ldsb/sym-imp.hpp
>@@ -252,6 +260,7 @@
> include/gecode/int/support-values.hpp
> include/gecode/int/task.hh
> include/gecode/int/task/array.hpp
>+include/gecode/int/task/event.hpp
> include/gecode/int/task/fwd-to-bwd.hpp
> include/gecode/int/task/iter.hpp
> include/gecode/int/task/man-to-opt.hpp
>@@ -259,6 +268,12 @@
> include/gecode/int/task/purge.hpp
> include/gecode/int/task/sort.hpp
> include/gecode/int/task/tree.hpp
>+include/gecode/int/trace.hpp
>+include/gecode/int/trace/bool-delta.hpp
>+include/gecode/int/trace/bool-trace-view.hpp
>+include/gecode/int/trace/int-delta.hpp
>+include/gecode/int/trace/int-trace-view.hpp
>+include/gecode/int/trace/traits.hpp
> include/gecode/int/unary.hh
> include/gecode/int/unary/detectable.hpp
> include/gecode/int/unary/edge-finding.hpp
>@@ -266,9 +281,11 @@
> include/gecode/int/unary/not-first-not-last.hpp
> include/gecode/int/unary/opt-prop.hpp
> include/gecode/int/unary/overload.hpp
>+include/gecode/int/unary/post.hpp
> include/gecode/int/unary/subsumption.hpp
> include/gecode/int/unary/task-view.hpp
> include/gecode/int/unary/task.hpp
>+include/gecode/int/unary/time-tabling.hpp
> include/gecode/int/unary/tree.hpp
> include/gecode/int/val-set.hh
> include/gecode/int/val-set.hpp
>@@ -358,16 +375,22 @@
> include/gecode/kernel/brancher-view.hpp
> include/gecode/kernel/core.hpp
> include/gecode/kernel/exception.hpp
>-include/gecode/kernel/global-afc.hpp
>+include/gecode/kernel/gpi.hpp
> include/gecode/kernel/macros.hpp
> include/gecode/kernel/memory-config.hpp
> include/gecode/kernel/memory-manager.hpp
> include/gecode/kernel/modevent.hpp
>+include/gecode/kernel/print.hpp
> include/gecode/kernel/propagator.hpp
> include/gecode/kernel/range-list.hpp
> include/gecode/kernel/region.hpp
> include/gecode/kernel/rnd.hpp
> include/gecode/kernel/shared-array.hpp
>+include/gecode/kernel/subscribed-propagators.hpp
>+include/gecode/kernel/trace-filter.hpp
>+include/gecode/kernel/trace-recorder.hpp
>+include/gecode/kernel/trace-traits.hpp
>+include/gecode/kernel/tracer.hpp
> include/gecode/kernel/var-imp.hpp
> include/gecode/kernel/var-type.hpp
> include/gecode/kernel/var.hpp
>@@ -386,25 +409,38 @@
> include/gecode/minimodel/set-rel.hpp
> include/gecode/search.hh
> include/gecode/search/bab.hpp
>+include/gecode/search/base.hpp
>+include/gecode/search/build.hpp
> include/gecode/search/cutoff.hpp
> include/gecode/search/dfs.hpp
>-include/gecode/search/engine-base.hpp
> include/gecode/search/engine.hpp
> include/gecode/search/exception.hpp
>+include/gecode/search/lds.hpp
>+include/gecode/search/meta/dead.hh
> include/gecode/search/meta/nogoods.hh
>+include/gecode/search/meta/parallel/pbs.hh
>+include/gecode/search/meta/parallel/pbs.hpp
> include/gecode/search/meta/rbs.hh
>+include/gecode/search/meta/rbs.hpp
>+include/gecode/search/meta/sequential/pbs.hh
>+include/gecode/search/meta/sequential/pbs.hpp
> include/gecode/search/options.hpp
> include/gecode/search/parallel/bab.hh
> include/gecode/search/parallel/dfs.hh
> include/gecode/search/parallel/engine.hh
> include/gecode/search/parallel/path.hh
>+include/gecode/search/pbs.hpp
> include/gecode/search/rbs.hpp
>+include/gecode/search/relax.hh
>+include/gecode/search/sebs.hpp
> include/gecode/search/sequential/bab.hh
> include/gecode/search/sequential/dfs.hh
>+include/gecode/search/sequential/lds.hh
> include/gecode/search/sequential/path.hh
> include/gecode/search/statistics.hpp
> include/gecode/search/stop.hpp
> include/gecode/search/support.hh
>+include/gecode/search/traits.hpp
> include/gecode/search/worker.hh
> include/gecode/set.hh
> include/gecode/set/array-traits.hpp
>@@ -467,6 +503,10 @@
> include/gecode/set/sequence/common.hpp
> include/gecode/set/sequence/seq-u.hpp
> include/gecode/set/sequence/seq.hpp
>+include/gecode/set/trace.hpp
>+include/gecode/set/trace/delta.hpp
>+include/gecode/set/trace/trace-view.hpp
>+include/gecode/set/trace/traits.hpp
> include/gecode/set/var-imp.hpp
> include/gecode/set/var-imp/delta.hpp
> include/gecode/set/var-imp/integerset.hpp
>@@ -482,6 +522,7 @@
> include/gecode/set/view/set.hpp
> include/gecode/set/view/singleton.hpp
> include/gecode/support.hh
>+include/gecode/support/allocator.hpp
> include/gecode/support/auto-link.hpp
> include/gecode/support/bitset-base.hpp
> include/gecode/support/bitset-offset.hpp
>@@ -635,6 +676,7 @@
> lib/libgecodesupport.so.%%SHLIB_VERSION%%.0
> %%DATADIR%%/mznlib/all_different_int.mzn
> %%DATADIR%%/mznlib/all_equal_int.mzn
>+%%DATADIR%%/mznlib/alldifferent_except_0.mzn
> %%DATADIR%%/mznlib/among.mzn
> %%DATADIR%%/mznlib/arg_max_int.mzn
> %%DATADIR%%/mznlib/arg_min_int.mzn

Actions: View | Diff

Attachments on bug 216803: 179623