diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-11 10:23:30 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-11 13:20:12 +0300 |
| commit | f64b989b1b41f9543f307b4079b69f5801c5867e (patch) | |
| tree | 48f098a521e59fb17a9f9c1419f5488477971225 /gnu/packages/patches | |
| parent | 10692b2e7f88c073815976f110c051a572ecef3d (diff) | |
| download | guix-f64b989b1b41f9543f307b4079b69f5801c5867e.tar guix-f64b989b1b41f9543f307b4079b69f5801c5867e.tar.gz | |
gnu: dico: Update to 2.3.
* gnu/packages/dico.scm (dico): Update to 2.3.
[inputs]: Add python-2, groff. Upgrade readline-6.2 to latest.
[source]: Remove patches.
* gnu/packages/patches/dico-idxcide-bug.patch,
* gnu/packages/patches/dico-libtool-deterministic.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/dico-idxgcide-bug.patch | 21 | ||||
| -rw-r--r-- | gnu/packages/patches/dico-libtool-deterministic.patch | 15 |
2 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/dico-idxgcide-bug.patch b/gnu/packages/patches/dico-idxgcide-bug.patch deleted file mode 100644 index 28cc8a6a08..0000000000 --- a/gnu/packages/patches/dico-idxgcide-bug.patch +++ /dev/null @@ -1,21 +0,0 @@ -Reported at <http://mail.gnu.org.ua/archives/bug-dico/2016-07/msg00000.html>. -Patch the .c file to avoid depending on Flex. - -commit 4599abbda3b5979367138ea098e435c919fe93fc -Author: Sergey Poznyakoff <gray@gnu.org> -Date: Thu Jul 28 14:09:58 2016 +0300 - - Bugfix - - * modules/gcide/idxgcide.l (main): Initialize ipg_header. - ---- dico-2.2/modules/gcide/idxgcide.c 2016-07-28 14:15:07.823587004 +0200 -+++ dico-2.2/modules/gcide/idxgcide.c 2016-07-28 14:15:09.435600549 +0200 -@@ -2497,6 +2497,7 @@ main(int argc, char **argv) - dico_log(L_ERR, 0, _("not enough memory")); - exit(EX_UNAVAILABLE); - } -+ idx_page->ipg_header.hdr.phdr_numentries = 0; - idx_page->ipg_header.hdr.phdr_text_offset = idx_header.ihdr_pagesize / 2; - - idx_header.ihdr_maxpageref = idx_header.ihdr_pagesize / 2 / diff --git a/gnu/packages/patches/dico-libtool-deterministic.patch b/gnu/packages/patches/dico-libtool-deterministic.patch deleted file mode 100644 index 957fc79786..0000000000 --- a/gnu/packages/patches/dico-libtool-deterministic.patch +++ /dev/null @@ -1,15 +0,0 @@ -Dico 2.2 uses an old Libtool (2.2.7a) that did not sort the output -of 'find', thereby leading to non-deterministic file name ordering -in the arguments passed to 'ar rcu' for libdico.a & co. - ---- dico-2.2/build-aux/ltmain.sh 1970-01-01 01:00:00.000000000 +0100 -+++ dico-2.2/build-aux/ltmain.sh 2015-11-25 09:39:30.826169050 +0100 -@@ -2926,7 +2926,7 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" |