Browse Source

updated asymptote

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5239 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
3b7cd22af5

+ 60 - 0
a/asymptote/asymptote-2.00-settings-vine-vl6.patch

@@ -0,0 +1,60 @@
+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;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="evince";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++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
+   bool getOption() {
+     string str=optarg;
+     
+-    if(str == "latex" || str == "pdflatex" || str == "xelatex" ||
++    if(str == "eplatex" || str == "platex" || 
++       str == "latex" || str == "pdflatex" || str == "xelatex" ||
+        str == "tex" || str == "pdftex" || 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",
++                              "eplatex|platex|latex|pdflatex|xelatex|tex|pdftex|context|none",
+                               "latex"));
+ 
+   addOption(new boolSetting("twice", 0,
+@@ -1269,7 +1270,7 @@ void initSettings() {
+   addOption(new envSetting("gs", defaultGhostscript));
+   addOption(new envSetting("texpath", ""));
+   addOption(new envSetting("texcommand", ""));
+-  addOption(new envSetting("dvips", "dvips"));
++  addOption(new envSetting("dvips", "pdvips"));
+   addOption(new envSetting("dvisvgm", "dvisvgm"));
+   addOption(new envSetting("convert", "convert"));
+   addOption(new envSetting("display", defaultDisplay));
+@@ -1423,7 +1424,8 @@ bool pdf(const string& texengine) {
+ }
+ 
+ bool latex(const string& texengine) {
+-  return texengine == "latex" || texengine == "pdflatex" || 
++  return texengine == "eplatex" || texengine == "platex" || 
++    texengine == "latex" || texengine == "pdflatex" || 
+     texengine == "xelatex";
+ }
+ 
+
+Diff finished.  Sat Jun  4 15:54:23 2011

+ 51 - 0
a/asymptote/asymptote-2.00-settings-vine-vl7.patch

@@ -0,0 +1,51 @@
+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;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="evince";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++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
+   bool getOption() {
+     string str=optarg;
+     
+-    if(str == "latex" || str == "pdflatex" || str == "xelatex" ||
++    if(str == "platex" || 
++       str == "latex" || str == "pdflatex" || str == "xelatex" ||
+        str == "tex" || str == "pdftex" || 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

+ 14 - 4
a/asymptote/asymptote-vl.spec

@@ -9,7 +9,7 @@
 %define emacspkg asy-mode
 
 Name:           asymptote
-Version:        2.10
+Version:        2.15
 Release:        1%{?_dist_release}
 Summary:        Descriptive vector graphics language
 Summary(ja):    MetaPost に触発されたスクリプトベースのベクターグラフィック言語
@@ -27,11 +27,15 @@ Source12:	%{emacspkg}-remove.sh
 #Source13:	%{name}-init.el
 
 #Patch0:         asymptote-2.00-settings.patch
-Patch0:         asymptote-2.00-settings-vine.patch
-Patch1:		asymptote-1.63-gcc44.patch
+%if %{?_dist_release} == "vl6"
+Patch0:         asymptote-2.00-settings-vine-vl6.patch
+%else
+Patch0:         asymptote-2.00-settings-vine-vl7.patch
+%endif
 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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  ncurses-devel
@@ -111,7 +115,6 @@ Emacs mode for editing Asymptote source code
 %prep
 %setup -q
 %patch0 -p1 -b .settings
-%patch1 -p1 -b .gcc44
 %patch2 -p1 -b .DSO
 %patch3 -p1 -b .path-fix
 %{__sed} -i 's/\r//' doc/CAD1.asy
@@ -264,6 +267,13 @@ fi
 
 
 %changelog
+* Sat Dec  3 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2.15-1
+- new upstream release
+- added asymptote-2.00-settings-vine-vl7.patch (vl7)
+  - For vl6, renamed asymptote-2.00-settings-vine.patch as 
+    asymptote-2.00-settings-vine-vl6.patch
+- TeX Live 2011
+
 * Sat Jun 04 2011 Munehiro Yamamoto <munepi@vinelinux.org> - 2.10-1
 - new upstream release