[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/35: gnu: Add ncompress.
From: |
guix-commits |
Subject: |
01/35: gnu: Add ncompress. |
Date: |
Wed, 20 Nov 2019 15:19:35 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1f6a4cd5a6d13e3784e796c05cfc8b80b64ce84e
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Sep 15 20:36:12 2019 +0200
gnu: Add ncompress.
* gnu/packages/compression.scm (ncompress): New variable.
* gnu/packages/patches/compress-fix-softlinks.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/compression.scm | 30 ++++++++++++++++++++++
gnu/packages/patches/ncompress-fix-softlinks.patch | 24 +++++++++++++++++
3 files changed, 55 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7f288b3..d161406 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1127,6 +1127,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m4-gnulib-libio.patch \
+ %D%/packages/patches/ncompress-fix-softlinks.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netcdf-tst_h_par.patch \
%D%/packages/patches/netpbm-CVE-2017-2586.patch \
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 64d995b..1d1c434 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <address@hidden>
;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
;;; Copyright © 2019 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2048,3 +2049,32 @@ external compressors: the compressor to be used for each
format is configurable
at run time, and must be installed separately.")
(license (list license:bsd-2 ; arg_parser.{cc,h}
license:gpl2+)))) ; the rest
+
+(define-public ncompress
+ (package
+ (name "ncompress")
+ (version "4.2.4.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/vapier/ncompress/archive/"
+ "v" version ".tar.gz"))
+ (patches (search-patches "ncompress-fix-softlinks.patch"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"))))
+ (arguments
+ '(#:make-flags (list "CC=gcc"
+ (string-append "BINDIR=" (string-append %output
"/bin"))
+ (string-append "MANDIR=" (string-append %output
"/share/man/man1")))
+ #:phases (modify-phases %standard-phases
+ (delete 'configure))))
+ (build-system gnu-build-system)
+ (home-page "https://github.com/vapier/ncompress/")
+ (synopsis "Original Lempel-Ziv compress/uncompress programs")
+ (description "(N)compress provides the original compress and uncompress
+programs that used to be the de facto UNIX standard for compressing and
+uncompressing files. These programs implement a fast, simple Lempel-Ziv (LZW)
+file compression algorithm.")
+ (license license:gpl2+)))
diff --git a/gnu/packages/patches/ncompress-fix-softlinks.patch
b/gnu/packages/patches/ncompress-fix-softlinks.patch
new file mode 100644
index 0000000..98752e8
--- /dev/null
+++ b/gnu/packages/patches/ncompress-fix-softlinks.patch
@@ -0,0 +1,24 @@
+Patch taken from Debian sid.
+
+Description: Support uncompressing and compressing soft links.
+ Historically, ncompress for Debian has been built using a command line
+ directly in debian/rules. For 4.2.4.5-1, I simplified by swtching to the
+ upstream Makefile. However, that caused a regression - the Debian version of
+ ncompress has always successfully handled soft links, but this stopped
+ working. To revert to the original behavior, I need to remove -DLSTAT from
+ the build options, to be consistent with how the code was previously built.
+Author: Kenneth J. Pronovici <address@hidden>
+Bug-Debian: http://bugs.debian.org/918836
+Index: ncompress/GNUmakefile
+===================================================================
+--- ncompress.orig/GNUmakefile
++++ ncompress/GNUmakefile
+@@ -9,7 +9,7 @@ distclean: cleanup
+
+ Makefile: Makefile.def GNUmakefile
+ sed \
+- -e 's:options= :options= $$(CFLAGS) -DNOFUNCDEF -DUTIME_H
-DLSTAT $$(LDFLAGS) :' \
++ -e 's:options= :options= $$(CFLAGS) -DNOFUNCDEF -DUTIME_H
$$(LDFLAGS) :' \
+ Makefile.def > Makefile
+
+ check:
- branch wip-bootstrap created (now e560af2), guix-commits, 2019/11/20
- 03/35: bootstrap: Add gash-boot., guix-commits, 2019/11/20
- 05/35: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-tarball., guix-commits, 2019/11/20
- 06/35: bootstrap: Add %bootstrap-gash. WIP, guix-commits, 2019/11/20
- 16/35: bootstrap: bootstrap-mes: Update for mes-0.21. WIP, guix-commits, 2019/11/20
- 15/35: bootstrap: bootstrap-mes: Update for mes-0.20., guix-commits, 2019/11/20
- 02/35: gnu: Add gash-core-utils., guix-commits, 2019/11/20
- 04/35: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/11/20
- 01/35: gnu: Add ncompress.,
guix-commits <=
- 07/35: gnu: nyacc: Update to 0.99.0., guix-commits, 2019/11/20
- 09/35: gnu: mes: Update to 0.20., guix-commits, 2019/11/20
- 11/35: mes: 0.21, guix-commits, 2019/11/20
- 12/35: bootstrap: mescc-tools-static: Update for mescc-tools-0.6.1., guix-commits, 2019/11/20
- 13/35: bootstrap: mes-minimal: Update for mes-0.20., guix-commits, 2019/11/20
- 19/35: bootstrap: nyacc-boot. WIP, guix-commits, 2019/11/20
- 08/35: gnu: mescc-tools: Update to 0.6.1., guix-commits, 2019/11/20
- 10/35: gnu: mes: Update to 0.21 WIP, guix-commits, 2019/11/20
- 14/35: bootstrap: bootstrap-mescc-tools: Update for mescc-tools-0.6.1., guix-commits, 2019/11/20
- 17/35: bootstrap-mes, guix-commits, 2019/11/20