From: Andy Tai <atai@atai.org>
To: 72885@debbugs.gnu.org
Cc: Andy Tai <atai@atai.org>
Subject: [bug#72885] [PATCH] gnu: screen: Update to 5.0.0
Date: Thu, 29 Aug 2024 23:31:03 -0700 [thread overview]
Message-ID: <e468db3e0fa6f0260bdffb3dfaf45dd21081cf7c.1724999417.git.atai@atai.org> (raw)
* gnu/packages/patches/screen-hurd-path-max.patch: Update for screen 5.0.0.
* gnu/packages/screen.scm (screen): Update to 5.0.0.
[arguments]<#:configure-flags: Add "CFLAGS=-D_GNU_SOURCE=1".
[inputs]: Add linux-pam.
Change-Id: Iebc5eff0128ff7f4d27a22cca1bd4a025aca3244
---
.../patches/screen-hurd-path-max.patch | 33 ++++++-------------
gnu/packages/screen.scm | 12 ++++---
2 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/patches/screen-hurd-path-max.patch b/gnu/packages/patches/screen-hurd-path-max.patch
index e906f154f3..6c474d0d11 100644
--- a/gnu/packages/patches/screen-hurd-path-max.patch
+++ b/gnu/packages/patches/screen-hurd-path-max.patch
@@ -6,30 +6,17 @@ Description: Set PATH_MAX to 4096 if undefined
Fixes FTBFS since 4.4.0 on GNU/Hurd. Updated to add one more occurrence for 4.5.0.
Author: Axel Beckert <abe@debian.org>
Bug: https://savannah.gnu.org/bugs/?50089
-Last-Updated: 2017-01-18
+Updated: 2017-01-18
+Updated: 2024-08-30 for GNU Screen 5.0.0
---- a/tty.sh
-+++ b/tty.sh
-@@ -1478,6 +1478,13 @@
- return 0;
- }
-
-+/*
-+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd
-+ */
-+
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-
- int CheckTtyname (char *tty)
- {
+diff --git a/screen.h b/screen.h
+index 308c365..bda05b4 100644
--- a/screen.h
+++ b/screen.h
-@@ -109,6 +109,13 @@
- # define DEFAULT_BUFFERFILE "/tmp/screen-exchange"
+@@ -63,6 +63,13 @@ struct mode {
#endif
-
+ };
+
+/*
+ * Define PATH_MAX to 4096 if it's not defined, like on GNU/Hurd
+ */
@@ -37,6 +24,6 @@ Last-Updated: 2017-01-18
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
-
- #if defined(hpux) && !(defined(VSUSP) && defined(VDSUSP) && defined(VWERASE) && defined(VLNEXT))
- # define HPUX_LTCHARS_HACK
+
+ #include "ansi.h"
+ #include "image.h"
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 7c16ee239a..c63472c1eb 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages screen)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages hurd)
+ #:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
@@ -43,24 +44,27 @@ (define-module (gnu packages screen)
(define-public screen
(package
(name "screen")
- (version "4.9.1")
+ (version "5.0.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/screen/screen-"
version ".tar.gz"))
(patches (search-patches "screen-hurd-path-max.patch"))
(sha256
- (base32 "0sdc0ms6qxm4gbx0caw7pwghj5aw1h8syvxdhkac0w95qkiz7ki6"))))
+ (base32 "0wa9v6p7cna2scpimpvk9pgxaah80f4q0f2kln37qp0f1b83jjph"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake texinfo))
(inputs
- (list ncurses perl))
+ (list linux-pam ncurses perl))
(arguments
`(#:configure-flags
+ ;; GNU_SOURCE must be defined for mallocmock_reset() to be defined
+ '("CFLAGS=-D_GNU_SOURCE=1"
+
;; By default, screen supports 16 colors, but we want 256 when
;; ~/.screenrc contains 'term xterm-256color'.
- '("--enable-colors256")))
+ "--enable-colors256")))
(home-page "https://www.gnu.org/software/screen/")
(synopsis "Full-screen window manager providing multiple terminals")
(description
base-commit: d5312370b46ace47e138d84e1bb28e5651cee94b
--
2.34.1
next reply other threads:[~2024-08-30 6:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-30 6:31 Andy Tai [this message]
2024-09-01 7:03 ` [bug#72885] [PATCH v2] gnu: screen: Update to 5.0.0 Andy Tai
2024-09-03 11:48 ` Ludovic Courtès
2024-09-03 12:33 ` Andy Tai
2024-09-03 12:30 ` [bug#72885] [PATCH v3] " Andy Tai
2024-09-04 17:04 ` bug#72885: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e468db3e0fa6f0260bdffb3dfaf45dd21081cf7c.1724999417.git.atai@atai.org \
--to=atai@atai.org \
--cc=72885@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).