From a0139217a16ec3f8f050e2c366e6ceaae8502930 Mon Sep 17 00:00:00 2001 From: pcpa Date: Sep 07 2015 01:04:35 +0000 Subject: Correct build failure with rawhide gcc --- diff --git a/sagemath-polybori.patch b/sagemath-polybori.patch new file mode 100644 index 0000000..311a300 --- /dev/null +++ b/sagemath-polybori.patch @@ -0,0 +1,14 @@ +diff -up src/sage/libs/polybori/decl.pxd.orig src/sage/libs/polybori/decl.pxd +--- src/sage/libs/polybori/decl.pxd.orig 2015-09-06 21:05:55.575916057 -0300 ++++ src/sage/libs/polybori/decl.pxd 2015-09-06 21:05:57.745916140 -0300 +@@ -12,8 +12,8 @@ cdef extern from "pb_wrap.h": + pbdp_asc "CTypes::dp_asc" + pbblock_dlex "CTypes::block_dlex" + pbblock_dp_asc "CTypes::block_dp_asc" +- pbdp "17" +- pbblock_dp "19" ++ pbdp "(polybori::COrderEnums::ordercodes)17" ++ pbblock_dp "(polybori::COrderEnums::ordercodes)19" + + cdef enum comparecodes "CCompareEnums::comparecodes": + less_than "CTypes::less_than" diff --git a/sagemath.spec b/sagemath.spec index 73306a4..3fc3741 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -158,6 +158,10 @@ Patch26: %{name}-ntl9.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1243590 Patch27: %{name}-qepcad.patch +# Temporary correction for invalid conversion from +# 'int' to 'polybori::COrderEnums::ordercodes' +Patch28: %{name}-polybori.patch + BuildRequires: 4ti2 BuildRequires: atlas-devel BuildRequires: cddlib-tools @@ -645,6 +649,7 @@ popd %endif %patch26 %patch27 +%patch28 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \ -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \