Browse Source

asymptote: rebuild with current VineSeed environment

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12272 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 4 years ago
parent
commit
9240ead85d

+ 11 - 0
a/asymptote/asymptote-1.91-fix-implicit-DSO-linking-libGL.patch

@@ -0,0 +1,11 @@
+diff -up asymptote-1.91/configure.ac.BAD asymptote-1.91/configure.ac
+--- asymptote-1.91/configure.ac.BAD	2010-02-19 13:53:39.000474697 -0500
++++ asymptote-1.91/configure.ac	2010-02-19 13:54:06.820617338 -0500
+@@ -217,6 +217,7 @@ AC_MSG_ERROR([*** Please install libz on
+ AC_CHECK_LIB([pthread], [pthread_create])
+ AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
+ AC_CHECK_LIB([rt], [sched_yield])
++AC_CHECK_LIB([GL], [glDepthMask])
+ 
+ AC_ARG_ENABLE(readline,
+ [AS_HELP_STRING(--enable-readline[[[=yes]]],enable GNU Readline Library)])

+ 8 - 33
a/asymptote/asymptote-2.00-settings-vine-vl7.patch

@@ -1,7 +1,6 @@
-diff -up asymptote-2.00/settings.cc.orig asymptote-2.00/settings.cc
---- asymptote-2.00/settings.cc.orig	2010-06-24 02:57:58.000000000 -0400
-+++ asymptote-2.00/settings.cc	2010-06-28 10:07:44.747973803 -0400
-@@ -89,11 +89,11 @@ bool msdos=false;
+--- settings.cc.orig	2016-11-15 10:39:44.419656094 +0900
++++ settings.cc	2016-11-15 10:41:51.958651237 +0900
+@@ -91,11 +91,11 @@
  string HOME="HOME";
  string docdir=ASYMPTOTE_DOCDIR;
  const char pathSeparator=':';
@@ -14,38 +13,14 @@ diff -up asymptote-2.00/settings.cc.orig asymptote-2.00/settings.cc
 +string defaultPDFViewer="evince";
  #endif  
  string defaultGhostscript="gs";
- string defaultDisplay="display";
-diff -up asymptote-2.10/settings.cc\~ asymptote-2.10/settings.cc
---- asymptote-2.10/settings.cc~	2011-06-04 15:35:00.435593642 +0900
-+++ asymptote-2.10/settings.cc	2011-06-04 15:54:16.059823589 +0900
-@@ -695,7 +695,8 @@ struct engineSetting : public argumentSe
+ string defaultGhostscriptLibrary="/usr/lib/libgs.so";
+@@ -707,7 +707,8 @@
    bool getOption() {
      string str=optarg;
      
 -    if(str == "latex" || str == "pdflatex" || str == "xelatex" ||
-+    if(str == "platex" || 
++    if(str == "platex" ||
 +       str == "latex" || str == "pdflatex" || str == "xelatex" ||
-        str == "tex" || str == "pdftex" || str == "context" || str == "none") {
+        str == "tex" || str == "pdftex" || str == "luatex" ||
+        str == "lualatex" || str == "context" || str == "none") {
        value=str;
-       return true;
-@@ -1131,7 +1132,7 @@ void initSettings() {
-   addOption(new boolSetting("keepaux", 0,
-                             "Keep intermediate LaTeX .aux files"));
-   addOption(new engineSetting("tex", 0, "engine",
--                              "latex|pdflatex|xelatex|tex|pdftex|context|none",
-+                              "platex|latex|pdflatex|xelatex|tex|pdftex|context|none",
-                               "latex"));
- 
-   addOption(new boolSetting("twice", 0,
-@@ -1423,7 +1424,8 @@ bool pdf(const string& texengine) {
- }
- 
- bool latex(const string& texengine) {
--  return texengine == "latex" || texengine == "pdflatex" || 
-+  return texengine == "platex" || 
-+    texengine == "latex" || texengine == "pdflatex" || 
-     texengine == "xelatex";
- }
- 
-
-Diff finished.  Sat Jun  4 15:54:23 2011

+ 12 - 0
a/asymptote/asymptote-2.08-info-path-fix.patch

@@ -0,0 +1,12 @@
+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
+      
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+ 
+ @titlepage

+ 11 - 0
a/asymptote/asymptote-bfnnconv.pl.patch

@@ -0,0 +1,11 @@
+--- doc/FAQ/bfnnconv.pl.orig	2019-10-14 23:33:30.375260525 +0900
++++ doc/FAQ/bfnnconv.pl	2019-10-14 23:33:55.564604234 +0900
+@@ -61,7 +61,7 @@
+ 
+ open(U,">$prefix.xrefdb-new");
+ 
+-for $x (@outputs) { require("m-$x.pl"); }
++for $x (@outputs) { require("./m-$x.pl"); }
+ 
+ &call('init');
+ 

+ 13 - 0
a/asymptote/asymptote-gc-fix.patch

@@ -0,0 +1,13 @@
+--- main.cc.orig	2019-10-14 20:22:59.936629138 +0900
++++ main.cc	2019-10-14 20:23:51.800403048 +0900
+@@ -214,3 +214,10 @@
+ #endif  
+   asymain(&args);
+ }
++
++#ifdef USEGC
++GC_API void GC_CALL GC_throw_bad_alloc() {
++  std::bad_alloc();
++}
++#endif
++

+ 21 - 3
a/asymptote/asymptote-vl.spec

@@ -10,7 +10,7 @@
 
 Name:           asymptote
 Version:        2.38
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Descriptive vector graphics language
 Summary(ja):    MetaPost に触発されたスクリプトベースのベクターグラフィック言語
 
@@ -36,6 +36,13 @@ Patch2:		asymptote-1.91-fix-implicit-DSO-linking-libGL.patch
 # This doesn't need to go upstream. We put the info file in the topdir, not a subdir, so we need this fix.
 Patch3:		asymptote-2.08-info-path-fix.patch
 
+# https://bugs.archlinux.org/task/60678
+# https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f
+Patch4:		asymptote-gc-fix.patch
+
+# https://github.com/vectorgraphics/asymptote/issues/47
+Patch5:		asymptote-bfnnconv.pl.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  ncurses-devel
@@ -58,7 +65,8 @@ BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  freeglut-devel
 BuildRequires:  zlib-devel
-BuildRequires:	libtool
+BuildRequires:  libtool
+BuildRequires:  mesa-libEGL-devel
 
 Requires:       texlive-common
 
@@ -126,6 +134,10 @@ Emacs mode for editing Asymptote source code
 %patch0 -b .settings
 %patch2 -p1 -b .DSO
 %patch3 -p1 -b .path-fix
+%if %{?_dist_release} >= "vl7"
+%patch4 -b .gc-fix
+%patch5 -b .manual-fix
+%endif
 %{__sed} -i 's/\r//' doc/CAD1.asy
 
 # convert to UTF-8
@@ -276,9 +288,15 @@ fi
 
 
 %changelog
+* Mon Oct 14 2019 Toshiaki Ara <ara_t@384.jp> 2.38-3
+- rebuild under current VineSeed environment
+- add BuildRequires: mesa-libEGL-devel
+- change BuildRequires: texlive-collection-plainextra to texlive-collection-plaingeneric
+- add Patch4 for 'GC_throw_bad_alloc()'
+- add Patch5 for building manuals
+
 * Sun Jun 03 2018 Toshiaki Ara <ara_t@384.jp> 2.38-2
 - build under gsl-2.4
-- change BuildRequires: texlive-collection-plaingeneric
 
 * Tue Nov 15 2016 Toshiaki Ara <ara_t@384.jp> 2.38-1
 - new upstream release