29.3: Remove patchsetHEADmaster

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

6 files changed, 0 insertions, 177 deletions

diff --git a/emacs/29.3/01_all_sanity-check.patch b/emacs/29.3/01_all_sanity-check.patch
deleted file mode 100644
index 6509cf7..0000000
--- a/emacs/29.3/01_all_sanity-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/916180
-
---- emacs-29.1/Makefile.in
-+++ emacs-29.1/Makefile.in
-@@ -417,7 +417,7 @@
- 
- sanity-check:
- 	@[ -f .no-advice-on-failure ] && exit 0; true
--	@v=$$(src/emacs${EXEEXT} --batch --eval \
-+	@v=$$(src/emacs${EXEEXT} --batch --quick --eval \
- 	  '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \
- 	  2> /dev/null); \
- 	[ "X$$v" = "X3628800" ] && exit 0; \
diff --git a/emacs/29.3/02_all_epg-gpmsm.patch b/emacs/29.3/02_all_epg-gpmsm.patch
deleted file mode 100644
index 646798c..0000000
--- a/emacs/29.3/02_all_epg-gpmsm.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Don't enable pinentry loopback mode for gpgsm
-Patch from master branch
-https://debbugs.gnu.org/67012
-
-commit e736a1b5a2aa2dd8dbaba32a408db70822fe434f
-Author: Ulrich Müller <ulm@gentoo.org>
-Date:   Fri Nov 17 12:16:54 2023 +0100
-
-    Don't enable pinentry loopback mode for gpgsm
-
---- a/doc/misc/epa.texi
-+++ b/doc/misc/epa.texi
-@@ -640,6 +640,9 @@ GnuPG Pinentry
- Emacs.
- @end enumerate
- 
-+Note that loopback Pinentry does not work with @command{gpgsm},
-+therefore EasyPG will ignore this setting for it.
-+
- There are other options available to use Emacs as Pinentry, you might
- come across a Pinentry called @command{pinentry-emacs} or
- @command{gpg-agent} option @code{allow-emacs-pinentry}.  However,
---- a/lisp/epg.el
-+++ b/lisp/epg.el
-@@ -595,7 +595,12 @@ epg--start
- 		       (if (epg-context-textmode context) '("--textmode"))
- 		       (if (epg-context-output-file context)
- 			   (list "--output" (epg-context-output-file context)))
--		       (if (epg-context-pinentry-mode context)
-+		       (if (and (epg-context-pinentry-mode context)
-+				(not
-+				 ;; loopback doesn't work with gpgsm
-+				 (and (eq (epg-context-protocol context) 'CMS)
-+				      (eq (epg-context-pinentry-mode context)
-+					  'loopback))))
- 			   (list "--pinentry-mode"
- 				 (symbol-name (epg-context-pinentry-mode
- 					       context))))
diff --git a/emacs/29.3/03_all_autoconf-2.72.patch b/emacs/29.3/03_all_autoconf-2.72.patch
deleted file mode 100644
index 45ad85c..0000000
--- a/emacs/29.3/03_all_autoconf-2.72.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Compatibility fix for autoconf-2.72
-Patch backported from master branch
-https://bugs.gentoo.org/930502
-
-commit e34ebc0ccc6c27e7e1217baad9ca74dd7bea4c37
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Wed Feb 7 13:17:57 2024 -0800
-
-    Port better to Autoconf 2.72
-
-    * configure.ac: Set ac_cv_type_gid_t=yes to pacify Autoconf 2.72
-    AC_TYPE_GETGROUPS.  Problem reported by Nick Bowler in:
-    https://lists.gnu.org/r/autoconf-patches/2024-02/msg00001.html
-
---- emacs-29.3/configure.ac
-+++ emacs-29.3/configure.ac
-@@ -1661,6 +1661,7 @@
- AC_DEFUN([AC_TYPE_SIZE_T])
- # Likewise for obsolescent test for uid_t, gid_t; Emacs assumes them.
- AC_DEFUN([AC_TYPE_UID_T])
-+ac_cv_type_gid_t=yes # AC_TYPE_GETGROUPS needs this in Autoconf 2.72.
- 
- # Check for all math.h functions that Emacs uses; on some platforms,
- # -lm is needed for some of these functions.
diff --git a/emacs/29.3/04_all_make-info-dir.patch b/emacs/29.3/04_all_make-info-dir.patch
deleted file mode 100644
index 9ae52c8..0000000
--- a/emacs/29.3/04_all_make-info-dir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Make it build with mksh
-Patch from emacs-29 branch
-https://bugs.gentoo.org/930086
-https://debbugs.gnu.org/70484
-
-commit 42766f95e5c0e7eb9e21db964ed93c7e093cc0b9
-Author: Ulrich Müller <ulm@gentoo.org>
-Date:   Tue Apr 23 07:37:17 2024 +0200
-
-    * build-aux/make-info-dir: Avoid bashism (bug#70484).
-
---- emacs-29.3/build-aux/make-info-dir
-+++ emacs-29.3/build-aux/make-info-dir
-@@ -33,7 +33,8 @@
- 
- ## Header contains non-printing characters, so this is more
- ## reliable than using awk.
--cat <"${1?}" || exit
-+test $# -ge 2 || exit 1
-+cat <"$1"
- shift
- 
- exec "${AWK-awk}" '
-@@ -101,4 +102,4 @@
-       if (data[dircat])
-         printf "\n%s\n%s", topic[dircat], data[dircat]
-   }
--' "${@?}"
-+' "$@"
diff --git a/emacs/29.3/05_all_ol-expand-abbrev.patch b/emacs/29.3/05_all_ol-expand-abbrev.patch
deleted file mode 100644
index 2aef76d..0000000
--- a/emacs/29.3/05_all_ol-expand-abbrev.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-org-mode should not expand link abbrevs that specify an unsafe function
-Backported from emacs-29 branch
-
-commit c645e1d8205f0f0663ec4a2d27575b238c646c7c
-Author: Ihor Radchenko <yantar92@posteo.net>
-Date:   Fri Jun 21 15:45:25 2024 +0200
-
-    org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code
-
---- emacs-29.3/lisp/org/ol.el
-+++ emacs-29.3/lisp/org/ol.el
-@@ -1063,17 +1063,35 @@
-       (if (not as)
- 	  link
- 	(setq rpl (cdr as))
--	(cond
--	 ((symbolp rpl) (funcall rpl tag))
--	 ((string-match "%(\\([^)]+\\))" rpl)
--	  (replace-match
--	   (save-match-data
--	     (funcall (intern-soft (match-string 1 rpl)) tag))
--	   t t rpl))
--	 ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
--	 ((string-match "%h" rpl)
--	  (replace-match (url-hexify-string (or tag "")) t t rpl))
--	 (t (concat rpl tag)))))))
-+	;; Drop any potentially dangerous text properties like
-+	;; `modification-hooks' that may be used as an attack vector.
-+	(substring-no-properties
-+	 (cond
-+	  ((symbolp rpl) (funcall rpl tag))
-+	  ((string-match "%(\\([^)]+\\))" rpl)
-+	   (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl))))
-+	     ;; Using `unsafep-function' is not quite enough because
-+	     ;; Emacs considers functions like `genenv' safe, while
-+	     ;; they can potentially be used to expose private system
-+	     ;; data to attacker if abbreviated link is clicked.
-+	     (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe))
-+		     (eq t (get rpl-fun-symbol 'pure)))
-+		 (replace-match
-+		  (save-match-data
-+		    (funcall (intern-soft (match-string 1 rpl)) tag))
-+		  t t rpl)
-+	       (org-display-warning
-+		(format "Disabling unsafe link abbrev: %s
-+You may mark function safe via (put '%s 'org-link-abbrev-safe t)"
-+			rpl (match-string 1 rpl)))
-+	       (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local)
-+		     org-link-abbrev-alist (delete as org-link-abbrev-alist))
-+	       link
-+	       )))
-+	  ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
-+	  ((string-match "%h" rpl)
-+	   (replace-match (url-hexify-string (or tag "")) t t rpl))
-+	  (t (concat rpl tag))))))))
- 
- (defun org-link-open (link &optional arg)
-   "Open a link object LINK.
diff --git a/emacs/29.3/06_all_flymake-gcc-14.patch b/emacs/29.3/06_all_flymake-gcc-14.patch
deleted file mode 100644
index 5167d21..0000000
--- a/emacs/29.3/06_all_flymake-gcc-14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix flymake tests with GCC 14
-https://debbugs.gnu.org/71749
-
---- emacs-29.3/test/lisp/progmodes/flymake-tests.el
-+++ emacs-29.3/test/lisp/progmodes/flymake-tests.el
-@@ -174,7 +174,8 @@
-     (flymake-tests--with-flymake
-         ("some-problems.h")
-       (flymake-goto-next-error)
--      (should (eq 'flymake-warning (face-at-point)))
-+      ;; implicit-int was promoted from warning to error in GCC 14
-+      (should (memq (face-at-point) '(flymake-warning flymake-error)))
-       (flymake-goto-next-error)
-       (should (eq 'flymake-error (face-at-point)))
-       (should-error (flymake-goto-next-error nil nil t)))