Re: [PR PATCH] [Updated] Remove noarch from aspell-fr

[henryprecheur <henryprecheur@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 971 bytes --]

There is an updated pull request by henryprecheur against master on the void-packages repository

https://github.com/henryprecheur/void-packages fix-aspell-fr
https://github.com/void-linux/void-packages/pull/24248

Remove noarch from aspell-fr
aspell dictionaries aren't architecture dependent: the dictionary format depends on size_t, therefor it needs to be made architecture specific. This is why the dictionaries are stored in /usr/lib and not in /usr/share.

Without this fix, I get the following error on amd64 when running `aspell check -l fr`:

> Error: The file "/usr/lib/aspell-0.60/fr-40-only.rws" is not in the proper format. Incompatible hash function.

This fixes the aspell-fr package on amd64 and probably most 64bits architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html

A patch file from https://github.com/void-linux/void-packages/pull/24248.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-aspell-fr-24248.patch --]
[-- Type: text/x-diff, Size: 9371 bytes --]

From 83d2898f6d6195ddeed45f68a0a8be0a60010acc Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 11:40:24 -0700
Subject: [PATCH 1/7] Remove noarch from aspell-fr

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-fr package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-fr/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aspell-fr/template b/srcpkgs/aspell-fr/template
index b1d5e6476f9..970e6041401 100644
--- a/srcpkgs/aspell-fr/template
+++ b/srcpkgs/aspell-fr/template
@@ -1,16 +1,15 @@
 # Template file for 'aspell-fr'
 pkgname=aspell-fr
 version=0.50.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="aspell-fr-0.50-3"
 build_style=configure
 hostmakedepends="aspell-devel which"
 makedepends="aspell-devel"
 depends="aspell"
 short_desc="French dictionary for aspell"
-homepage="http://aspell.net/"
-license="GPL-2"
 maintainer="7185 <7185@free.fr>"
+license="GPL-2.0-or-later"
+homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2"
 checksum=f9421047519d2af9a7a466e4336f6e6ea55206b356cd33c8bd18cb626bf2ce91

From ea15775b8165d1a62fe60a7033ac752bdd2efec0 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 12:20:30 -0700
Subject: [PATCH 2/7] Remove noarch from aspell-cs

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-cs package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-cs/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/aspell-cs/template b/srcpkgs/aspell-cs/template
index 252775dd985..35958546170 100644
--- a/srcpkgs/aspell-cs/template
+++ b/srcpkgs/aspell-cs/template
@@ -1,8 +1,7 @@
 # Template file for 'aspell-cs'
 pkgname=aspell-cs
 version=20040614.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="aspell6-cs-${version/./-}"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 8e20261af0489ba69d55d4a3405985664283d5a8 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 13:02:01 -0700
Subject: [PATCH 3/7] Remove noarch from aspell-de

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-de package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-de/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/aspell-de/template b/srcpkgs/aspell-de/template
index 4527bc50095..029664409c5 100644
--- a/srcpkgs/aspell-de/template
+++ b/srcpkgs/aspell-de/template
@@ -1,8 +1,7 @@
 # Template file for 'aspell-de'
 pkgname=aspell-de
 version=20161207.7.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="aspell6-de-${version//./-}"
 build_style=configure
 hostmakedepends="aspell-devel which"
@@ -15,7 +14,6 @@ checksum=c2125d1fafb1d4effbe6c88d4e9127db59da9ed92639c7cbaeae1b7337655571
 
 words-de_package() {
 	short_desc="German dictionary word list"
-	archs=noarch
 	pkg_install() {
 		vmkdir usr/share/dict
 		precat *.cwl |

From cfa720fb47cb690662830d3d2378f2de764a722b Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 13:13:01 -0700
Subject: [PATCH 4/7] Remove noarch from aspell-el

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-el package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-el/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/aspell-el/template b/srcpkgs/aspell-el/template
index f782fd3d624..7d4a9c2727f 100644
--- a/srcpkgs/aspell-el/template
+++ b/srcpkgs/aspell-el/template
@@ -1,9 +1,8 @@
 # Template file for 'aspell-el'
 pkgname=aspell-el
 version=0.08.0
-revision=1
+revision=2
 _distver="${version%.*}-${version##*.}"
-archs=noarch
 wrksrc="aspell6-el-${_distver}"
 build_style=configure
 hostmakedepends="aspell-devel which"

From 9b56a0f1172fb2bab599540d783bfcfd407e3dcc Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 13:25:16 -0700
Subject: [PATCH 5/7] Remove noarch from aspell-en

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-en package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-en/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template
index a1138595576..f01e8c48032 100644
--- a/srcpkgs/aspell-en/template
+++ b/srcpkgs/aspell-en/template
@@ -1,8 +1,7 @@
 # Template file for 'aspell-en'
 pkgname=aspell-en
 version=2019.10.06
-revision=1
-archs=noarch
+revision=2
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel which"
@@ -15,7 +14,6 @@ checksum=24334b4daac6890a679084f4089e1ce7edbe33c442ace776fa693d8e334f51fd
 
 words-en_package() {
 	short_desc="English dictionary word list"
-	archs=noarch
 	pkg_install() {
 		vmkdir usr/share/dict
 		precat en-common.cwl en_US-wo_accents-only.cwl |

From 23498d5ce28400597b84ba4a65df3b1e3547f447 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 13:25:46 -0700
Subject: [PATCH 6/7] Remove noarch from aspell-pl

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-pl package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-pl/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template
index 6e8b2bc9682..a0600b785c9 100755
--- a/srcpkgs/aspell-pl/template
+++ b/srcpkgs/aspell-pl/template
@@ -1,14 +1,13 @@
 # Template file for 'aspell-pl'
 pkgname=aspell-pl
 version=20061121
-revision=1
-archs=noarch
+revision=2
 wrksrc="aspell6-pl-6.0_${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel which"
 short_desc="Polish dictionary for aspell"
-homepage="http://aspell.net/"
-license="GPL-2"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="GPL-2.0-or-later"
+homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/pl/aspell6-pl-6.0_${version}-0.tar.bz2"
 checksum=017741fcb70a885d718c534160c9de06b03cc72f352879bd106be165e024574d

From 803045fc5d648b0464bcf6daac3d7be44a32027b Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Wed, 12 Aug 2020 13:26:02 -0700
Subject: [PATCH 7/7] Remove noarch from aspell-ru

aspell dictionnaries aren't architecture dependent: the dictionnary
format depends on size_t, therefor it needs to be made architecture
specific. This is why the dictionaries are stored in /usr/lib and not
in /usr/share.

This fixes the aspell-ru package on amd64 and probably most 64bits
architectures.

More information about this:

http://aspell.net/0.61/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html
---
 srcpkgs/aspell-ru/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template
index 3c5edc81bd6..f0a6d0fa52d 100644
--- a/srcpkgs/aspell-ru/template
+++ b/srcpkgs/aspell-ru/template
@@ -1,14 +1,13 @@
 # Template file for 'aspell-ru'
 pkgname=aspell-ru
 version=0.99f7
-revision=1
-archs=noarch
+revision=2
 wrksrc="aspell6-ru-${version}-1"
 build_style=configure
 hostmakedepends="aspell-devel which"
 short_desc="Russian dictionary for aspell"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/ru/aspell6-ru-${version}-1.tar.bz2"
 checksum=5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646