dev-lang/yap: Fix building against GCC 9

Closes: https://bugs.gentoo.org/686048
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch
new file mode 100644 (file)
index 0000000..f16d291
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/686048
+
+./SolverTypes.h:122:20: error: friend declaration of ‘Clause* Clause_new(const V&, bool)’ specifies default arguments and isn’t a definition [-fpermissive]
+  122 |     friend Clause* Clause_new(const V& ps, bool learnt = false);
+      |                    ^~~~~~~~~~
+
+--- a/packages/swi-minisat2/C/SolverTypes.h
++++ b/packages/swi-minisat2/C/SolverTypes.h
+@@ -97,6 +97,9 @@
+ //=================================================================================================
+ // Clause -- a simple class for representing a clause:
+ 
++class Clause;
++template<class V>
++Clause* Clause_new(const V& ps, bool learnt = false);
+ 
+ class Clause {
+     uint32_t size_etc;
+@@ -119,7 +122,7 @@
+ 
+     // -- use this function instead:
+     template<class V>
+-    friend Clause* Clause_new(const V& ps, bool learnt = false);
++    friend Clause* Clause_new(const V& ps, bool learnt);
+ 
+     int          size        ()      const   { return size_etc >> 3; }
+     void         shrink      (int i)         { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }

diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild
index fd653ef29268b142bd8b398d558ca7a54b66769b..3864fe27707b226f282af89738973ed8927a8bd5 100644 (file)
--- a/dev-lang/yap/yap-6.3.3-r1.ebuild
+++ b/dev-lang/yap/yap-6.3.3-r1.ebuild
@@ -29,7 +29,10 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
        doc? ( app-text/texi2html )"
 
-PATCHES=( "${WORKDIR}"/${PV} )
+PATCHES=(
+       "${WORKDIR}"/${PV}
+       "${FILESDIR}"/${PN}-6.3.3-fix-gcc9.patch
+)
 
 src_prepare() {
        default