Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/files/
Date: Sat, 27 Feb 2021 15:38:11
Message-Id: 1614440162.101ebf24046c76fe8cb779a2b8de9ac2904b9598.conikost@gentoo
1 commit: 101ebf24046c76fe8cb779a2b8de9ac2904b9598
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Feb 25 17:35:35 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 15:36:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101ebf24
7
8 sci-mathematics/maxima: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/19652
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 sci-mathematics/maxima/files/ecls-2.patch | 35 --------------------------
16 sci-mathematics/maxima/files/texinfo-0.patch | 12 ---------
17 sci-mathematics/maxima/files/xdg-utils-0.patch | 35 --------------------------
18 3 files changed, 82 deletions(-)
19
20 diff --git a/sci-mathematics/maxima/files/ecls-2.patch b/sci-mathematics/maxima/files/ecls-2.patch
21 deleted file mode 100644
22 index d9af8c373ca..00000000000
23 --- a/sci-mathematics/maxima/files/ecls-2.patch
24 +++ /dev/null
25 @@ -1,35 +0,0 @@
26 -diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
27 ---- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600
28 -+++ maxima-5.37.1/src/maxima.in 2015-09-03 16:33:30.913866985 +0600
29 -@@ -188,3 +188,3 @@
30 - elif [ "$MAXIMA_LISP" = "ecl" ]; then
31 -- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -- "$@"
32 -+ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -norc -- "$@"
33 -
34 -diff -r -U1 maxima-5.37.1.orig/src/maxima.system maxima-5.37.1/src/maxima.system
35 ---- maxima-5.37.1.orig/src/maxima.system 2015-09-01 02:26:13.000000000 +0600
36 -+++ maxima-5.37.1/src/maxima.system 2015-09-03 16:42:47.071843596 +0600
37 -@@ -61,2 +61,10 @@
38 - #+ecl
39 -+(defun split-ld-flags-for-ecl (string &aux space)
40 -+ (setf string (string-trim '(#\Space) string))
41 -+ (if (setf space (position #\Space string))
42 -+ (cons (subseq string 0 space)
43 -+ (split-ld-flags-for-ecl (subseq string (1+ space))))
44 -+ (cons string nil)))
45 -+
46 -+#+ecl
47 - (defun build-maxima-lib ()
48 -@@ -77,2 +85,7 @@
49 - files)))
50 -+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj
51 -+ :ld-flags
52 -+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
53 -+ (find-package "MAXIMA")))))
54 -+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))))
55 - (c::build-program "binary-ecl/maxima" :lisp-files obj
56 -@@ -81,3 +94,3 @@
57 - (find-package "MAXIMA")))))
58 -- (if (and x (not (string= x ""))) (list x)))
59 -+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x)))
60 - :epilogue-code '(progn (require :defsystem)
61
62 diff --git a/sci-mathematics/maxima/files/texinfo-0.patch b/sci-mathematics/maxima/files/texinfo-0.patch
63 deleted file mode 100644
64 index 9b8782dffce..00000000000
65 --- a/sci-mathematics/maxima/files/texinfo-0.patch
66 +++ /dev/null
67 @@ -1,12 +0,0 @@
68 -Fix build with texinfo-6.7.
69 -https://bugs.gentoo.org/697494
70 -
71 ---- maxima-5.43.0.orig/interfaces/emacs/imaxima/imaxima.texi
72 -+++ maxima-5.43.0/interfaces/emacs/imaxima/imaxima.texi
73 -@@ -1,5 +1,6 @@
74 - \input texinfo @c -*-texinfo-*-
75 - @c %**start of header
76 -+@documentencoding ISO-8859-1
77 - @setfilename imaxima.info
78 - @settitle Imaxima Manual
79 - @paragraphindent 0
80
81 diff --git a/sci-mathematics/maxima/files/xdg-utils-0.patch b/sci-mathematics/maxima/files/xdg-utils-0.patch
82 deleted file mode 100644
83 index 876fe6fcd46..00000000000
84 --- a/sci-mathematics/maxima/files/xdg-utils-0.patch
85 +++ /dev/null
86 @@ -1,35 +0,0 @@
87 ---- interfaces/emacs/misc/bookmode.el.orig 2008-02-07 12:42:18.008472937 +0000
88 -+++ interfaces/emacs/misc/bookmode.el 2008-02-07 12:43:02.531010132 +0000
89 -@@ -680,7 +680,7 @@
90 -
91 - (and tem
92 - (list (concat "View "(nth 1 tem))
93 -- 'call-process "ghostview" nil nil nil
94 -+ 'call-process "xdg-open" nil nil nil
95 - (expand-file-name(nth 1 tem))
96 - ))
97 - (list "Cancel")
98 -@@ -705,7 +705,7 @@
99 - (concat
100 - (cond ((looking-at "%PS") "")
101 - (t "gzip -dc | "))
102 -- "ghostview -")
103 -+ "xdg-open -")
104 -
105 - )))
106 -
107 ---- interfaces/xmaxima/Tkmaxima/Constants.tcl.orig 2008-02-07 12:42:47.294141832 +0000
108 -+++ interfaces/xmaxima/Tkmaxima/Constants.tcl 2008-02-07 12:43:02.539010587 +0000
109 -@@ -143,9 +143,9 @@
110 - image/gif netmath
111 - image/png netmath
112 - image/jpeg netmath
113 -- application/postscript "ghostview -safer %s"
114 -- application/pdf "acroread %s"
115 -- application/x-dvi "xdvi %s"
116 -+ application/postscript "xdg-open -safer %s"
117 -+ application/pdf "xdg-open %s"
118 -+ application/x-dvi "xdg-open %s"
119 - }
120 - set maxima_priv(imagecounter) 0
121 -