diff --git a/Fix-without-lsp-issue-379.patch b/Fix-without-lsp-issue-379.patch new file mode 100644 index 0000000..2f70cd0 --- /dev/null +++ b/Fix-without-lsp-issue-379.patch @@ -0,0 +1,50 @@ +From 29caaed5ead5a62787475286afd22e40585b8bb8 Mon Sep 17 00:00:00 2001 +From: John Bowman +Date: Wed, 14 Jun 2023 22:36:35 -0600 +Subject: [PATCH] Fix --without-lsp (issue #379). + +--- + common.h | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/common.h b/common.h +index 13f8be106..6ee3d971f 100644 +--- a/common.h ++++ b/common.h +@@ -17,28 +17,27 @@ + #include "config.h" + #endif + +-#ifdef HAVE_LSP + #if __cplusplus < 201703L ++ ++#ifdef HAVE_LSP + #include + #include + using boost::optional; + #define nullopt boost::none + using boost::make_optional; + #else +-#include +-using std::optional; +-using std::nullopt; +-using std::make_optional; +-#endif +- +-#else +-#if __cplusplus < 201703L + #include "optional.hpp" + #define boost nonstd + using nonstd::optional; + using nonstd::nullopt; + using nonstd::make_optional; + #endif ++ ++#else ++#include ++using std::optional; ++using std::nullopt; ++using std::make_optional; + #endif + + using std::make_pair; diff --git a/asymptote-2.08-info-path-fix.patch b/asymptote-2.08-info-path-fix.patch index 934b431..fb5cc5f 100644 --- a/asymptote-2.08-info-path-fix.patch +++ b/asymptote-2.08-info-path-fix.patch @@ -1,8 +1,8 @@ -diff -up asymptote-2.08/doc/asymptote.texi.BAD asymptote-2.08/doc/asymptote.texi ---- asymptote-2.08/doc/asymptote.texi.BAD 2011-03-08 11:42:17.349734001 -0500 -+++ asymptote-2.08/doc/asymptote.texi 2011-03-08 11:42:21.462734066 -0500 -@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir - +diff -up asymptote-2.73/doc/asymptote.texi.path-fix asymptote-2.73/doc/asymptote.texi +--- asymptote-2.73/doc/asymptote.texi.path-fix 2021-12-29 17:46:54.043168884 -0500 ++++ asymptote-2.73/doc/asymptote.texi 2021-12-29 17:47:38.943464729 -0500 +@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir + @dircategory Languages @direntry -* asymptote: (asymptote/asymptote). Vector graphics language. diff --git a/asymptote-2.43-libtirpc.patch b/asymptote-2.43-libtirpc.patch index 318bf12..5ea9ac0 100644 --- a/asymptote-2.43-libtirpc.patch +++ b/asymptote-2.43-libtirpc.patch @@ -1,20 +1,21 @@ -diff -up asymptote-2.45/configure.ac.libtirpc asymptote-2.45/configure.ac ---- asymptote-2.45/configure.ac.libtirpc 2018-07-24 13:10:39.495098939 -0400 -+++ asymptote-2.45/configure.ac 2018-07-24 13:13:03.640110265 -0400 -@@ -282,6 +282,16 @@ AC_CHECK_HEADERS([fenv.h stddef.h libint - AC_CHECK_HEADERS(fpu_control.h) - AC_CHECK_FUNCS([feenableexcept]) +diff -up asymptote-2.81/configure.ac.libtirpc asymptote-2.81/configure.ac +--- asymptote-2.81/configure.ac.libtirpc 2022-06-01 16:58:58.770519207 -0400 ++++ asymptote-2.81/configure.ac 2022-06-01 17:00:46.644262786 -0400 +@@ -405,6 +405,17 @@ case "$OSTYPE" in + ;; + esac +PKG_PROG_PKG_CONFIG([0.9.0]) +AS_IF( + [test "$enable_tirpc" != "no"], + [PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4], + [LIBS="${LIBS} ${TIRPC_LIBS} " -+ CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS}" ++ CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS} " + AC_DEFINE([HAVE_LIBTIRPC], [1], + [Define to 1 if you have and wish to use libtirpc.])], + [AS_IF([test "$enable_tirpc" != "no"], [AC_MSG_ERROR([libtirpc not found.])], + [LIBTIRPC=""])])]) - ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "xstream.h"])], [AC_SEARCH_LIBS([xdrstdio_create],[nsl tirpc]) + AC_DEFINE(HAVE_RPC_RPC_H,1, diff --git a/asymptote-2.67-settings.patch b/asymptote-2.67-settings.patch index 2a9dc91..bd99b1b 100644 --- a/asymptote-2.67-settings.patch +++ b/asymptote-2.67-settings.patch @@ -1,15 +1,11 @@ -diff -up asymptote-2.67/settings.cc.settings asymptote-2.67/settings.cc ---- asymptote-2.67/settings.cc.settings 2020-08-06 11:49:53.902137481 -0400 -+++ asymptote-2.67/settings.cc 2020-08-06 11:51:55.500637009 -0400 -@@ -100,9 +100,9 @@ string defaultPSViewer="open"; - string defaultPDFViewer="open"; - string defaultHTMLViewer="open"; +diff -up asymptote-2.84/settings.cc.settings asymptote-2.84/settings.cc +--- asymptote-2.84/settings.cc.settings 2023-01-27 10:10:29.726992629 -0500 ++++ asymptote-2.84/settings.cc 2023-01-27 10:11:49.213842466 -0500 +@@ -103,7 +103,7 @@ string defaultHTMLViewer="open"; #else --string defaultPSViewer="gv"; --string defaultPDFViewer="acroread"; + string defaultPSViewer="evince"; + string defaultPDFViewer="evince"; -string defaultHTMLViewer="google-chrome"; -+string defaultPSViewer="evince"; -+string defaultPDFViewer="evince"; +string defaultHTMLViewer="xdg-open"; #endif string defaultGhostscript="gs"; diff --git a/asymptote-2.70-remove-old-setpdfwrite.patch b/asymptote-2.70-remove-old-setpdfwrite.patch deleted file mode 100644 index 5e1c197..0000000 --- a/asymptote-2.70-remove-old-setpdfwrite.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -urNB asymptote-2.70-orig/patches/dvipdf asymptote-2.70/patches/dvipdf ---- asymptote-2.70-orig/patches/dvipdf 2021-06-16 09:46:49.248321403 +0200 -+++ asymptote-2.70/patches/dvipdf 2021-06-16 10:22:29.276677871 +0200 -@@ -50,5 +50,5 @@ - - # We have to include the options twice because -I only takes effect if it - # appears before other options. --exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - -+exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c 3000000 setvmthreshold - - diff --git a/asymptote-2.70.src.tgz b/asymptote-2.70.src.tgz deleted file mode 100644 index b6fa1f6..0000000 Binary files a/asymptote-2.70.src.tgz and /dev/null differ diff --git a/asymptote-2.86.src.tgz b/asymptote-2.86.src.tgz new file mode 100644 index 0000000..813989d Binary files /dev/null and b/asymptote-2.86.src.tgz differ diff --git a/asymptote.spec b/asymptote.spec index cfebfb4..1630b01 100644 --- a/asymptote.spec +++ b/asymptote.spec @@ -3,8 +3,8 @@ %global optflags %{optflags} -DGLM_ENABLE_EXPERIMENTAL Name: asymptote -Version: 2.70 -Release: 2 +Version: 2.86 +Release: 1 Summary: Descriptive vector graphics language License: LGPLv3+ URL: http://asymptote.sourceforge.net/ @@ -21,14 +21,15 @@ Patch4: asymptote-2.43-libtirpc.patch # only conflicts on s390x Patch5: asymptote-2.52-const-memrchr.patch Patch6: asymptote-2.63-freeglut.patch -# removes .setpdfwrite from ghostscript call in dvipdf (#1968328) -Patch7: asymptote-2.70-remove-old-setpdfwrite.patch +# https://github.com/vectorgraphics/asymptote/commit/29caaed5ead5a62787475286afd22e40585b8bb8 +Patch7: Fix-without-lsp-issue-379.patch BuildRequires: gcc-c++, ncurses-devel, readline-devel, fftw-devel >= 3.0, gc-devel >= 6.8 BuildRequires: gsl-devel, tex(latex), tex(epsf.tex), tex(cm-super-t1.enc), tex(parskip.sty) BuildRequires: ghostscript, texinfo-tex, ImageMagick, desktop-file-utils, freeglut-devel BuildRequires: zlib-devel, libtool, mesa-libOSMesa-devel, emacs, libtirpc-devel BuildRequires: ghostscript-tools-dvipdf, glm-devel, make +BuildRequires: bison, flex, tex(media9.sty), tex(ocgbase.sty) Requires: emacs-filesystem >= %{_emacs_version} # Cleanup Provides: emacs-%{name} = %{version}-%{release} @@ -140,6 +141,9 @@ texhash >/dev/null 2>&1 || : %{_emacs_sitelispdir}/%{name}/*.el %changelog +* Thu Nov 30 2023 yaoxin - 2.86-1 +- Upgrade to 2.86 + * Mon Aug 07 2023 chenchen - 2.70-2 - Add a space between the -ltirpc -lgsl option