pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2020Q3]: pkgsrc/editors Pullup ticket #6331 - requested by hauke
details: https://anonhg.NetBSD.org/pkgsrc/rev/4ed9964f4ddf
branches: pkgsrc-2020Q3
changeset: 440219:4ed9964f4ddf
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Sun Oct 04 09:28:06 2020 +0000
description:
Pullup ticket #6331 - requested by hauke
editors/xemacs: Linux build fix
Revisions pulled up:
- editors/xemacs-current-nox11/Makefile 1.12
- editors/xemacs-current/Makefile 1.107
- editors/xemacs-current/distinfo 1.38
- editors/xemacs-current/patches/patch-src_process.c 1.1
- editors/xemacs-nox11/Makefile 1.36
- editors/xemacs/Makefile 1.133
- editors/xemacs/distinfo 1.32
- editors/xemacs/patches/patch-src_process.c 1.1
---
Module Name: pkgsrc
Committed By: hauke
Date: Fri Oct 2 11:31:14 UTC 2020
Modified Files:
pkgsrc/editors/xemacs: Makefile distinfo
pkgsrc/editors/xemacs-current: Makefile distinfo
pkgsrc/editors/xemacs-current-nox11: Makefile
pkgsrc/editors/xemacs-nox11: Makefile
Added Files:
pkgsrc/editors/xemacs-current/patches: patch-src_process.c
pkgsrc/editors/xemacs/patches: patch-src_process.c
Log Message:
Linux glibc 2.32+ has removed sys_siglist
Remove stale reference to nb version in Makefile.common
diffstat:
editors/xemacs-current-nox11/Makefile | 5 ++---
editors/xemacs-current/Makefile | 6 ++----
editors/xemacs-current/distinfo | 3 ++-
editors/xemacs-current/patches/patch-src_process.c | 21 +++++++++++++++++++++
editors/xemacs-nox11/Makefile | 6 ++----
editors/xemacs/Makefile | 6 ++----
editors/xemacs/distinfo | 3 ++-
editors/xemacs/patches/patch-src_process.c | 21 +++++++++++++++++++++
8 files changed, 54 insertions(+), 17 deletions(-)
diffs (150 lines):
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs-current-nox11/Makefile
--- a/editors/xemacs-current-nox11/Makefile Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs-current-nox11/Makefile Sun Oct 04 09:28:06 2020 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/10/08 12:40:55 hauke Exp $
+# $NetBSD: Makefile,v 1.11.8.1 2020/10/04 09:28:06 bsiegert Exp $
PKGNAME= ${DISTNAME:S/-/-nox11-/}
-PKGREVISION= 7
+PKGREVISION= 8
COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
-# Version information in ../../editors/xemacs-current/Makefile.common
.include "../../editors/xemacs-current/options.mk"
.include "../../editors/xemacs-current/Makefile.common"
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs-current/Makefile Sun Oct 04 09:28:06 2020 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2020/09/24 17:02:02 hauke Exp $
+# $NetBSD: Makefile,v 1.106.2.1 2020/10/04 09:28:06 bsiegert Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 14
+PKGREVISION= 15
COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
# extra options for x11 support, not for sharing with xemacs-current-nox11
-# Version information in ../../editors/xemacs-current/Makefile.common
-
PKG_SUPPORTED_OPTIONS+= x11 xft xface
PKG_SUGGESTED_OPTIONS+= x11
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs-current/distinfo
--- a/editors/xemacs-current/distinfo Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs-current/distinfo Sun Oct 04 09:28:06 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2019/11/27 15:11:45 hauke Exp $
+$NetBSD: distinfo,v 1.37.8.1 2020/10/04 09:28:06 bsiegert Exp $
SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
@@ -13,4 +13,5 @@
SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2
SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177
SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f
+SHA1 (patch-src_process.c) = 4cca9085f0e34ad1adf44ea006df7c2c370beeb9
SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs-current/patches/patch-src_process.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/patches/patch-src_process.c Sun Oct 04 09:28:06 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $
+
+Linux glibc 2.32+ has removed sys_siglist
+
+--- src/process.c.orig 2013-08-21 17:43:44.000000000 +0000
++++ src/process.c
+@@ -1568,10 +1568,14 @@ See `set-process-sentinel' for more info
+ const char *
+ signal_name (int signum)
+ {
++#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED)
++ return (const char *)strsignal(signum);
++#else
+ if (signum >= 0 && signum < NSIG)
+ return (const char *) sys_siglist[signum];
+
+ return (const char *) GETTEXT ("unknown signal");
++#endif
+ }
+
+ void
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs-nox11/Makefile Sun Oct 04 09:28:06 2020 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2020/08/31 18:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2020/10/04 09:28:06 bsiegert Exp $
PKGNAME= ${DISTNAME:S/-/-nox11-/}
-PKGREVISION= 13
+PKGREVISION= 14
COMMENT= XEmacs text editor version 21 (no x11 support)
-# Version information in ../../editors/xemacs/Makefile.common
-
.include "../../editors/xemacs/options.mk"
.include "../../editors/xemacs/Makefile.common"
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs/Makefile
--- a/editors/xemacs/Makefile Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs/Makefile Sun Oct 04 09:28:06 2020 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.132 2020/09/24 17:02:01 hauke Exp $
+# $NetBSD: Makefile,v 1.132.2.1 2020/10/04 09:28:06 bsiegert Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 14
+PKGREVISION= 15
COMMENT= XEmacs text editor version 21.4
# extra options for x11 support, not for sharing with xemacs-current-nox11
-# Version information in ../../editors/xemacs/Makefile.common
-
PKG_SUPPORTED_OPTIONS+= x11 xface
PKG_SUGGESTED_OPTIONS+= x11
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs/distinfo
--- a/editors/xemacs/distinfo Sun Oct 04 09:26:08 2020 +0000
+++ b/editors/xemacs/distinfo Sun Oct 04 09:28:06 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2019/11/27 14:35:16 hauke Exp $
+$NetBSD: distinfo,v 1.31.8.1 2020/10/04 09:28:06 bsiegert Exp $
SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@@ -18,6 +18,7 @@
SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f
SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
+SHA1 (patch-src_process.c) = b33b37e7e68bd49036d90cfed206170456a4b443
SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20
SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448
diff -r 1fce954e6d4f -r 4ed9964f4ddf editors/xemacs/patches/patch-src_process.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs/patches/patch-src_process.c Sun Oct 04 09:28:06 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $
+
+Linux glibc 2.32+ has removed sys_siglist
+
+--- src/process.c.orig 2015-03-25 11:25:33.000000000 +0000
++++ src/process.c
+@@ -1310,10 +1310,14 @@ See `set-process-sentinel' for more info
+ const char *
+ signal_name (int signum)
+ {
++#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED)
++ return (const char *)strsignal(signum);
++#else
+ if (signum >= 0 && signum < NSIG)
+ return (const char *) sys_siglist[signum];
+
+ return (const char *) GETTEXT ("unknown signal");
++#endif
+ }
+
+ void
Home |
Main Index |
Thread Index |
Old Index