From 8fea0387c636d1117eb2bb1311af88684cb11f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 27 May 2020 14:15:45 +0200 Subject: [PATCH] minisat: fix build Patch away the strang friend constructor and instead add a default value to the mkLit() inline function. --- srcpkgs/minisat/patches/friend.patch | 21 +++++++++++++++++++++ srcpkgs/minisat/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/minisat/patches/friend.patch diff --git a/srcpkgs/minisat/patches/friend.patch b/srcpkgs/minisat/patches/friend.patch new file mode 100644 index 00000000000..2aaf4acf318 --- /dev/null +++ b/srcpkgs/minisat/patches/friend.patch @@ -0,0 +1,21 @@ +--- core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 ++++ core/SolverTypes.h 2020-05-27 14:12:09.005969769 +0200 +@@ -46,8 +46,8 @@ + struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ Lit mkLit(Var var, bool sign = false); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template index 84e1432e340..e462c8ba34a 100644 --- a/srcpkgs/minisat/template +++ b/srcpkgs/minisat/template @@ -1,7 +1,7 @@ # Template file for 'minisat' pkgname=minisat version=2.2.0 -revision=1 +revision=2 wrksrc=minisat build_wrksrc=simp build_style=gnu-makefile