From 4554d6b77e0f306a3dc33a8c1f68c9a302967a08 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Nov 2019 22:30:24 +0100 Subject: gnu: aspell: Truly honor $ASPELL_DICT_DIR. Fixes . Reported by Oleg Pykhalov . * gnu/packages/aspell.scm (aspell)[arguments]: Remove 'wrap-aspell' phase. * gnu/packages/patches/aspell-default-dict-dir.patch: Add hunk to expand the right-hand size of '|' in values like "<$FOO|$BAR/baz>". Change DICT_DIR to refer to "$HOME" on the right-hand side. --- gnu/packages/aspell.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/aspell.scm') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 4f6f1a1cca..f0e0fbcc21 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -65,14 +65,6 @@ (define-public aspell (("\"filter-path(.*)DICT_DIR" _ middle) (string-append "\"filter-path" middle "\"" libdir "\""))) - #t))) - (add-after 'install 'wrap-aspell - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin/aspell (string-append (assoc-ref outputs "out") - "/bin/aspell"))) - (wrap-program bin/aspell - '("ASPELL_CONF" "" = - ("${ASPELL_CONF:-\"dict-dir ${GUIX_PROFILE:-$HOME/.guix-profile}/lib/aspell\"}"))) #t)))))) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 2387e2f2d1839b79f13ddd832f9a008bb220eed6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Nov 2019 22:38:10 +0100 Subject: gnu: aspell: Update to 0.60.8. * gnu/packages/aspell.scm (aspell): Update to 0.60.8. [source]: Remove "aspell-gcc-compat.patch". * gnu/packages/patches/aspell-gcc-compat.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/aspell.scm | 7 +++---- gnu/packages/patches/aspell-gcc-compat.patch | 31 ---------------------------- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/aspell-gcc-compat.patch (limited to 'gnu/packages/aspell.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 64f0ba268d..29988d25e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -695,7 +695,6 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ - %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index f0e0fbcc21..70d0561004 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -38,7 +38,7 @@ (define-module (gnu packages aspell) (define-public aspell (package (name "aspell") - (version "0.60.6.1") + (version "0.60.8") (source (origin (method url-fetch) @@ -46,9 +46,8 @@ (define-public aspell version ".tar.gz")) (sha256 (base32 - "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm")) - (patches (search-patches "aspell-default-dict-dir.patch" - "aspell-gcc-compat.patch")))) + "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr")) + (patches (search-patches "aspell-default-dict-dir.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/aspell-gcc-compat.patch b/gnu/packages/patches/aspell-gcc-compat.patch deleted file mode 100644 index 94c44f8fb6..0000000000 --- a/gnu/packages/patches/aspell-gcc-compat.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix GCC7 warnings. - -Taken from upstream: -https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384 - -diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp -index a979539..19ab63c 100644 ---- a/modules/filter/tex.cpp -+++ b/modules/filter/tex.cpp -@@ -174,7 +174,7 @@ namespace { - - if (c == '{') { - -- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') -+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') - push_command(Parm); - - top.in_what = Parm; -diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp -index db54f3d..89ee09d 100644 ---- a/prog/check_funs.cpp -+++ b/prog/check_funs.cpp -@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { - } - } - if (i == width-1) { -- if (word == '\0') -+ if (*word == '\0') - put(out,' '); - else if (word[len] == '\0') - put(out, word, len); -- cgit v1.2.3 From e118837ede3f96bc76c7db22f1fc2cc348099507 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Wed, 29 Apr 2020 16:49:36 +0200 Subject: gnu: Add aspell-dict-pl. * gnu/packages/aspell.scm (aspell-dict-pl): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/aspell.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/aspell.scm') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index b11a2dbe6b..689fe64ec1 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Timotej Lazar +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -298,6 +299,13 @@ (define-public aspell-dict-nn (base32 "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"))) +(define-public aspell-dict-pl + (aspell-dictionary "pl" "Polish" + #:version "0.51-0" + #:sha256 + (base32 + "1a3ccji6k5gys7l3ilr2lh5pzxgzb7ipc5vb737svl6nqgdy8757"))) + (define-public aspell-dict-pt-br (aspell-dictionary "pt_BR" "Brazilian Portuguese" #:version "20131030-12-0" -- cgit v1.2.3