pkgsrc-WIP-changes archive

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

emacs-git: remove patches that were merged upstream



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Sep 17 15:54:05 2024 +0200
Changeset:	e5f344e22d1f27859c227a146d281a9c7e561d59

Modified Files:
	emacs-git/distinfo
Removed Files:
	emacs-git/patches/patch-lib_utimens.c
	emacs-git/patches/patch-lib_utimens.h
	emacs-git/patches/patch-m4_utimens.m4

Log Message:
emacs-git: remove patches that were merged upstream

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

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-lib_utimens.c | 29 -----------------------------
 emacs-git/patches/patch-lib_utimens.h | 28 ----------------------------
 emacs-git/patches/patch-m4_utimens.m4 | 21 ---------------------
 4 files changed, 81 deletions(-)

diffs:
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
index 141bb129de..77b56e7bfd 100644
--- a/emacs-git/distinfo
+++ b/emacs-git/distinfo
@@ -1,7 +1,4 @@
 $NetBSD$
 
 SHA1 (patch-configure.ac) = fdf28fb6247c1f7bbdf2002e3af1bb6ec654c4a2
-SHA1 (patch-lib_utimens.c) = 015a9c639a9575ae3df4596fce460ff39c15c016
-SHA1 (patch-lib_utimens.h) = bbfde1ddd66e0e038c181dd1fe7b137c1ccb74db
-SHA1 (patch-m4_utimens.m4) = 5850b7f691c0104e3ec97e0dd031426fe58a8b56
 SHA1 (patch-src_fns.c) = af2921422ec11702393ba91d8628fa9b663867ed
diff --git a/emacs-git/patches/patch-lib_utimens.c b/emacs-git/patches/patch-lib_utimens.c
deleted file mode 100644
index f1960453a6..0000000000
--- a/emacs-git/patches/patch-lib_utimens.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-NetBSD utimens fix from gnulib
-
---- lib/utimens.c.orig	2024-06-24 08:03:06.000000000 +0000
-+++ lib/utimens.c
-@@ -516,6 +516,7 @@ fdutimens (int fd, char const *file, str
-   }
- }
- 
-+#if !HAVE_UTIMENS
- /* Set the access and modification timestamps of FILE to be
-    TIMESPEC[0] and TIMESPEC[1], respectively.  */
- int
-@@ -523,7 +524,9 @@ utimens (char const *file, struct timesp
- {
-   return fdutimens (-1, file, timespec);
- }
-+#endif
- 
-+#if !HAVE_LUTIMENS
- /* Set the access and modification timestamps of FILE to be
-    TIMESPEC[0] and TIMESPEC[1], respectively, without dereferencing
-    symlinks.  Fail with ENOSYS if the platform does not support
-@@ -646,3 +649,4 @@ lutimens (char const *file, struct times
-   errno = ENOSYS;
-   return -1;
- }
-+#endif
diff --git a/emacs-git/patches/patch-lib_utimens.h b/emacs-git/patches/patch-lib_utimens.h
deleted file mode 100644
index bff42c67ec..0000000000
--- a/emacs-git/patches/patch-lib_utimens.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-NetBSD utimens fix from gnulib
-
---- lib/utimens.h.orig	2024-06-24 08:03:06.000000000 +0000
-+++ lib/utimens.h
-@@ -24,13 +24,21 @@
- 
- #include <time.h>
- 
-+#if HAVE_UTIMENS || HAVE_LUTIMENS
-+# include <sys/time.h>
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
- int fdutimens (int, char const *, struct timespec const [2]);
-+#if !HAVE_UTIMENS
- int utimens (char const *, struct timespec const [2]);
-+#endif
-+#if !HAVE_LUTIMENS
- int lutimens (char const *, struct timespec const [2]);
-+#endif
- 
- #ifdef __cplusplus
- }
diff --git a/emacs-git/patches/patch-m4_utimens.m4 b/emacs-git/patches/patch-m4_utimens.m4
deleted file mode 100644
index dd81fc54e1..0000000000
--- a/emacs-git/patches/patch-m4_utimens.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-NetBSD utimens fix from gnulib
-
---- m4/utimens.m4.orig	2024-06-24 08:03:06.000000000 +0000
-+++ m4/utimens.m4
-@@ -1,5 +1,5 @@
- # utimens.m4
--# serial 16
-+# serial 17
- dnl Copyright (C) 2003-2024 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
-@@ -16,6 +16,7 @@ AC_DEFUN([gl_UTIMENS],
-   gl_CHECK_FUNCS_ANDROID([lutimes], [[#include <sys/time.h>]])
-   gl_CHECK_FUNCS_ANDROID([futimens], [[#include <sys/stat.h>]])
-   gl_CHECK_FUNCS_ANDROID([utimensat], [[#include <sys/stat.h>]])
-+  AC_CHECK_FUNCS_ONCE([utimens lutimens])
- 
-   if test $ac_cv_func_futimens = no && test $ac_cv_func_futimesat = yes; then
-     dnl FreeBSD 8.0-rc2 mishandles futimesat(fd,NULL,time).  It is not


Home | Main Index | Thread Index | Old Index