Hello community,
here is the log from the commit of package minisat for openSUSE:Factory checked
in at 2019-07-31 14:36:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/minisat (Old)
and /work/SRC/openSUSE:Factory/.minisat.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minisat"
Wed Jul 31 14:36:23 2019 rev:2 rq:719993 version:2.2.0+20130925
Changes:
--------
--- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2017-03-10
21:45:57.597391776 +0100
+++ /work/SRC/openSUSE:Factory/.minisat.new.4126/minisat.changes
2019-07-31 14:36:25.289865450 +0200
@@ -1,0 +2,6 @@
+Mon Jul 29 01:10:45 UTC 2019 - Simon Puchert <simonpuch...@alice.de>
+
+- Add friend-declaration.patch:
+ * Fix the illegal friend declaration that caused a build failure.
+
+-------------------------------------------------------------------
New:
----
friend-declaration.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ minisat.spec ++++++
--- /var/tmp/diff_new_pack.x6FQBV/_old 2019-07-31 14:36:26.201864984 +0200
+++ /var/tmp/diff_new_pack.x6FQBV/_new 2019-07-31 14:36:26.201864984 +0200
@@ -25,6 +25,7 @@
Group: Development/Tools/Other
Source0: %{name}-%{version}.tar.xz
Patch0: Makefile_lib_rule.patch
+Patch1: friend-declaration.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: zlib-devel
@@ -63,6 +64,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CXXFLAGS="%optflags"
++++++ friend-declaration.patch ++++++
diff -Nur
minisat-2.2.0+20130925/minisat-2.2.0+20130925/minisat/core/SolverTypes.h
minisat-2.2.0+20130925-p/minisat-2.2.0+20130925/minisat/core/SolverTypes.h
--- a/minisat/core/SolverTypes.h 2013-09-25 14:16:18.000000000 +0200
+++ b/minisat/core/SolverTypes.h 2019-07-29 02:55:41.499558102 +0200
@@ -52,7 +52,7 @@
int x;
// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ friend Lit mkLit(Var var, bool sign);
bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -60,7 +60,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; }
