pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emacs-git: patches have been merged, remove them



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Jul 18 11:13:59 2026 +0200
Changeset:	d00b2272a8f8bab136c0a7de2c440a7e4d10f264

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

Log Message:
emacs-git: patches have been merged, remove them

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

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

diffstat:
 emacs-git/distinfo                           |  4 ----
 emacs-git/patches/patch-lib_getopt-pfx-ext.h | 14 -----------
 emacs-git/patches/patch-lib_getopt1.c        | 36 ----------------------------
 3 files changed, 54 deletions(-)

diffs:
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
deleted file mode 100644
index a38159151e..0000000000
--- a/emacs-git/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-lib_getopt-pfx-ext.h) = 2a7a18a5fd467a0217eff4e983f237f42ec9281c
-SHA1 (patch-lib_getopt1.c) = 1aa0c9571db526b9cf7c980b725aefa88587c525
diff --git a/emacs-git/patches/patch-lib_getopt-pfx-ext.h b/emacs-git/patches/patch-lib_getopt-pfx-ext.h
deleted file mode 100644
index 559b45eb54..0000000000
--- a/emacs-git/patches/patch-lib_getopt-pfx-ext.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index b950c55a1a..0000000000
--- a/emacs-git/patches/patch-lib_getopt1.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$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);
- }
- 


Home | Main Index | Thread Index | Old Index