emacs-git: update patches

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Jul 18 07:38:27 2026 +0200
Changeset:	a95c0aee3f4c6932fb5d405d96cce524c6f06bd7

Modified Files:
	emacs-git/distinfo
Added Files:
	emacs-git/patches/patch-lib_getopt-pfx-ext.h
	emacs-git/patches/patch-lib_getopt1.c
Removed Files:
	emacs-git/patches/patch-Makefile.in

Log Message:
emacs-git: update patches

one obsolete (I hope), another replaced

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a95c0aee3f4c6932fb5d405d96cce524c6f06bd7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-git/distinfo                           |  3 +-
 emacs-git/patches/patch-Makefile.in          | 61 ----------------------------
 emacs-git/patches/patch-lib_getopt-pfx-ext.h | 14 +++++++
 emacs-git/patches/patch-lib_getopt1.c        | 36 ++++++++++++++++
 4 files changed, 52 insertions(+), 62 deletions(-)

diffs:
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index e7bbff4940..a38159151e 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,3 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-Makefile.in) = 1babbbeda525935718778225ccc0cc2d0e118454
+SHA1 (patch-lib_getopt-pfx-ext.h) = 2a7a18a5fd467a0217eff4e983f237f42ec9281c
+SHA1 (patch-lib_getopt1.c) = 1aa0c9571db526b9cf7c980b725aefa88587c525
diff --git a/emacs-git/patches/patch-Makefile.in b/emacs-git/patches/patch-Makefile.in
deleted file mode 100644
index b5724d6e15..0000000000
--- a/emacs-git/patches/patch-Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-From 9ab4c49444e2ed2ba707e5fc32a563dde23f43e1 Mon Sep 17 00:00:00 2001
-From: Boris Buliga <boris%d12frosted.io@localhost>
-Date: Thu, 9 Jul 2026 09:47:08 +0300
-Subject: [PATCH] Fix info/dir generation in fresh checkouts (bug#81332)
-
-The previous bug#81332 fix made info/dir depend on doc/misc/NAME.texi
-names derived from INFO_COMMON.  For the manuals whose source is .org
-(modus-themes, org), these .texi files are generated and do not exist
-in a fresh checkout, and there is no rule to build them at this level,
-so building Emacs fails with:
-
-  make[1]: *** No rule to make target 'doc/misc/modus-themes.texi',
-  needed by 'info/dir'.  Stop.
-
-* Makefile.in (srcdir_doc_info_dir_inputs): For the default language,
-depend on the actual sources reported by doc/misc echo-sources
-(texi_misc_default), which lists .org sources for the org-based
-manuals; make-info-dir extracts dir entries from both formats.
-(GET_DOC_SRC): Only handle translated languages; drop the mapping of
-default translation names to doc/misc .texi names.
----
- Makefile.in | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-https://lists.gnu.org/archive/html/bug-gnu-emacs/2026-07/msg00428.html
-
---- Makefile.in.orig	2026-07-15 18:05:00.000000000 +0000
-+++ Makefile.in
-@@ -1190,19 +1190,27 @@ $(foreach lang,$(DOCLANGS),$(eval $(call set_texi_misc
- 
- $(foreach lang,$(DOCLANGS),$(eval $(call set_texi_misc,$(lang))))
- 
-+## For the default language, depend on the actual sources reported by
-+## doc/misc (echo-sources): .org files for the org-based manuals and
-+## .texi files for the rest.  Deriving foo.texi names from INFO_COMMON
-+## would break in a fresh checkout, because the .texi files of the
-+## org-based manuals (e.g. modus-themes.texi) are generated and there
-+## is no rule to build them at this level.  make-info-dir extracts dir
-+## entries from both formats.
- srcdir_doc_info_dir_inputs := \
-   ${srcdir}/doc/emacs/emacs.texi \
-   ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
--  ${srcdir}/doc/lispref/elisp.texi
-+  ${srcdir}/doc/lispref/elisp.texi \
-+  $(addprefix ${srcdir}/doc/misc/,${texi_misc_default})
- TRANSLATED_DIRS:=misc
- # $(1) = dir
- # $(2) = lang
- define GET_DOC_SRC
- -include ${srcdir}/doc/translations/$(2)/$(1)/info_common.mk
- INFO_COMMON:=$$(subst ccmode,cc-mode,$$(INFO_COMMON))
--srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst ${srcdir}/doc/translations/default/$(1)/%-default.texi,${srcdir}/doc/$(1)/%.texi,$$(patsubst %,${srcdir}/doc/translations/$(2)/$(1)/%-$(2).texi,$$(INFO_COMMON)))
-+srcdir_doc_info_dir_inputs:=$$(srcdir_doc_info_dir_inputs) $$(patsubst %,${srcdir}/doc/translations/$(2)/$(1)/%-$(2).texi,$$(INFO_COMMON))
- endef
--$(foreach dir,$(TRANSLATED_DIRS),$(foreach lang,$(DOCLANGS),$(eval $(call GET_DOC_SRC,$(dir),$(lang)))))
-+$(foreach dir,$(TRANSLATED_DIRS),$(foreach lang,$(filter-out default,$(DOCLANGS)),$(eval $(call GET_DOC_SRC,$(dir),$(lang)))))
- 
- info_dir_inputs = \
-   ../build-aux/dir_top \
diff --git a/emacs-git/patches/patch-lib_getopt-pfx-ext.h b/emacs-git/patches/patch-lib_getopt-pfx-ext.h
new file mode 100644
index 0000000000..559b45eb54
--- /dev/null
+++ b/emacs-git/patches/patch-lib_getopt-pfx-ext.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+getopt warning fix, from upstream.
+
+--- lib/getopt-pfx-ext.h.orig	2026-07-14 17:23:34.000000000 +0000
++++ lib/getopt-pfx-ext.h
+@@ -58,6 +58,7 @@
+ #ifndef __getopt_argv_const
+ # if defined __GETOPT_PREFIX
+ #  define __getopt_argv_const /* empty */
++#  define __getopt_argv_const_is_empty 1
+ # else
+ #  define __getopt_argv_const const
+ # endif
diff --git a/emacs-git/patches/patch-lib_getopt1.c b/emacs-git/patches/patch-lib_getopt1.c
new file mode 100644
index 0000000000..b950c55a1a
--- /dev/null
+++ b/emacs-git/patches/patch-lib_getopt1.c
@@ -0,0 +1,36 @@
+$NetBSD$
+
+getopt warning fix, from upstream.
+
+--- lib/getopt1.c.orig	2026-07-14 17:23:34.000000000 +0000
++++ lib/getopt1.c
+@@ -24,11 +24,19 @@
+ #include <getopt.h>
+ #include "getopt_int.h"
+ 
++/* Convert char *__getopt_argv_const * to char ** without provoking
++   gcc -Wuseless-cast when __getopt_argv_const is empty.  */
++#ifdef __getopt_argv_const_is_empty
++# define ARGV_CAST(argv) (argv)
++#else
++# define ARGV_CAST(argv) ((char **) (argv))
++#endif
++
+ int
+ getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
+ 	     const struct option *long_options, int *opt_index)
+ {
+-  return _getopt_internal (argc, (char **) argv, options, long_options,
++  return _getopt_internal (argc, ARGV_CAST (argv), options, long_options,
+ 			   opt_index, 0, 0);
+ }
+ 
+@@ -51,7 +59,7 @@ getopt_long_only (int argc, char *__getopt_argv_const 
+ 		  const char *options,
+ 		  const struct option *long_options, int *opt_index)
+ {
+-  return _getopt_internal (argc, (char **) argv, options, long_options,
++  return _getopt_internal (argc, ARGV_CAST (argv), options, long_options,
+ 			   opt_index, 1, 0);
+ }
+