[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/

[David Seifert]

commit:     952ccad88687bd307a8bb0df235030de197d2317
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Nov 18 12:40:21 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 18:03:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ccad8

app-editors/xemacs: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6225

 .../files/xemacs-21.5.29-optimization-bug.patch    | 14 ---------
 .../files/xemacs-21.5.33-no-mule-build.patch       | 33 ----------------------
 2 files changed, 47 deletions(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch b/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2ab..00000000000
--- a/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
---- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
-+++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);

diff --git a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
deleted file mode 100644
index 17e572044fa..00000000000
--- a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r a2912073be85 lisp/paragraphs.el
---- a/lisp/paragraphs.el	Wed Jun 19 09:30:30 2013 -0600
-+++ b/lisp/paragraphs.el	Sat Jun 22 13:27:48 2013 +0200
-@@ -180,7 +180,10 @@
-   :type '(choice regexp (const :tag "Use default value" nil)))
- (put 'sentence-end 'safe-local-variable 'string-or-null-p)
- 
--(defcustom sentence-end-base "[.?!][]\"'”)}]*"
-+(defcustom sentence-end-base
-+  (concat "[.?!][]\"'"
-+	  (if (featurep 'mule) (string (unicode-to-char #x201D)) "")
-+	  ")}]*")
-   "Regexp matching the basic end of a sentence, not including following space."
-   :group 'paragraphs
-   :type 'string
-@@ -201,14 +204,14 @@
- in between.  See Info node `(elisp)Standard Regexps'."
-   (or sentence-end
-       ;; We accept non-break space along with space.
--      (concat (if sentence-end-without-period "\\w[ \u00a0][ \u00a0]\\|")
-+      (concat (if sentence-end-without-period "\\w[ \240][ \240]\\|")
- 	      "\\("
- 	      sentence-end-base
-               (if sentence-end-double-space
--                  "\\($\\|[ \u00a0]$\\|\t\\|[ \u00a0][ \u00a0]\\)" "\\($\\|[\t \u00a0]\\)")
-+                  "\\($\\|[ \240]$\\|\t\\|[ \240][ \240]\\)" "\\($\\|[\t \240]\\)")
-               "\\|[" sentence-end-without-space "]+"
- 	      "\\)"
--              "[ \u00a0\t\n]*")))
-+              "[ \240\t\n]*")))
- 
- (defcustom page-delimiter "^\014"
-   "*Regexp describing line-beginnings that separate pages."

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/

[Mats Lidell]

commit:     920bcdeb3bb2a3ce72082eed4bf2c09ce6705bfe
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 17:18:17 2024 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 17:30:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920bcdeb

app-editors/xemacs: Use command -v

Update patch to not use type -P, due to not posix required, and skip
looking around the file system if there is a makeinfo that meets the
requirement.

Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>

 app-editors/xemacs/files/xemacs-21.5.35-which.patch | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.35-which.patch b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
index cf8b554490fc..1c93aa0e19d7 100644
--- a/app-editors/xemacs/files/xemacs-21.5.35-which.patch
+++ b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
@@ -1,12 +1,23 @@
 diff -r 22f2684b1b82 configure.ac
 --- a/configure.ac	Mon Sep 23 16:24:03 2024 +0100
-+++ b/configure.ac	Thu Sep 26 07:57:11 2024 +0200
-@@ -2518,7 +2518,7 @@
++++ b/configure.ac	Sat Sep 28 14:09:56 2024 +0200
+@@ -2518,16 +2518,16 @@
  dnl We need a recent version of makeinfo
  AC_MSG_CHECKING([for makeinfo >= 4.12])
  MAKEINFO=
 -for prog in `which -a makeinfo`; do
-+for prog in `type -P makeinfo`; do
++if prog=`command -v makeinfo`
++then
    mi_verstr=[`$prog --version | sed -n '1s/^.* \([0-9][0-9.]*\)$/\1/p'`]
    mi_major=`echo $mi_verstr | cut -d. -f1`
    mi_minor=`echo $mi_verstr | cut -d. -f2`
+   if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -gt 11 );
+   then
+     MAKEINFO=$prog
+-    break
+   fi
+-done
++fi
+ if test -z $MAKEINFO; then
+   AC_MSG_RESULT([no])
+   AC_MSG_WARN([Found Makeinfo $mi_verstr.  4.12 or later required.])