From e1a774392fd3907d6199f4714147a8721517bc2e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Oct 16 2019 18:13:42 +0000 Subject: merge fix --- diff --git a/asymptote-2.53-freeglut.patch b/asymptote-2.53-freeglut.patch new file mode 100644 index 0000000..d33befc --- /dev/null +++ b/asymptote-2.53-freeglut.patch @@ -0,0 +1,20 @@ +--- glrender.h~ 2019-08-20 23:51:14.000000000 -0500 ++++ glrender.h 2019-09-18 12:28:09.126648853 -0500 +@@ -27,7 +27,7 @@ + #define GL_SILENCE_DEPRECATION + #include + #ifdef HAVE_LIBGLUT +-#include ++#include + #endif + #ifdef HAVE_LIBOSMESA + #include +@@ -40,7 +40,7 @@ + #include + #endif + #ifdef HAVE_LIBGLUT +-#include ++#include + #endif + #ifdef HAVE_LIBOSMESA + #include diff --git a/asymptote.spec b/asymptote.spec index ab59843..5762647 100644 --- a/asymptote.spec +++ b/asymptote.spec @@ -20,6 +20,7 @@ Patch4: asymptote-2.43-libtirpc.patch # memrchr value does not match hardcoded one in /usr/include/string.h # only conflicts on s390x Patch5: asymptote-2.52-const-memrchr.patch +Patch6: asymptote-2.53-freeglut.patch BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -85,6 +86,7 @@ that LaTeX does for scientific text. %patch3 -p1 -b .path-fix %patch4 -p1 -b .libtirpc %patch5 -p1 -b .const-memrchr +%patch6 -p0 -b .glut %{__sed} -i 's/\r//' doc/CAD1.asy # convert to UTF-8 @@ -96,11 +98,6 @@ autoreconf -i %configure --enable-gc=system --with-docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}/} --with-latex=%{_texmf}/tex/latex --with-context=%{_texmf}/tex/context/ make %{?_smp_mflags} cd doc/ -%if 0%{?fedora} < 18 -# We're hacking around the fact that the asymptote.sty generated doesn't work with Fedora's old latex -make asy-latex.pdf -cp %{SOURCE3} asymptote.sty -%endif make all %install @@ -185,6 +182,9 @@ texhash >/dev/null 2>&1 || : * Wed Oct 16 2019 Tom Callaway - 2.57-1 - update to 2.57 +* Tue Oct 01 2019 Gwyn Ciesla - 2.55-2 +- Rebuilt for new freeglut. + * Mon Sep 30 2019 Tom Callaway - 2.55-1 - update to 2.55 - fix missing numpy dependendency