From 790bd89cd9b4f327f803485285fdf4eb5d8d76a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:12:51 -0300 Subject: [PATCH 1/8] aspell: force 32-bit dictionaries for all archs. Given [1] and that we cross build dictionary packages for 32bit archs on 64bit hosts, the generated dictionaries aren't usable on the 32bit systems. It is therefore necessary to compile aspell in its 32bit mode, which will make it possible to cross build dictionaries between supported architectures, as long as they have the same endianness. Furthermore, upstream recommends using 32bit hashes, since the 64bit ones are completely unnecessary [2]. It should be noted that dictionaries were previously completely broken for 32-bit cross compiled targets (currently, arvm6l and armv7l). [1] http://aspell.net/man-html/Using-32_002dBit-Dictionaries-on-a-64_002dBit-System.html [2] https://lists.gnu.org/archive/html/aspell-devel/2020-12/msg00001.html --- srcpkgs/aspell/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template index 414e0adedfd..3a7449450ab 100644 --- a/srcpkgs/aspell/template +++ b/srcpkgs/aspell/template @@ -1,9 +1,16 @@ # Template file for 'aspell' pkgname=aspell version=0.60.8 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--enable-compile-in-filters" +# we need to force aspell to use /usr/lib for data for two reasons: +# - in multilib systems, it should use the native dicts instead of requiring +# that a dict be installed twice +# - when cross compiling packages, it's aspell that determines where the dicts +# are to be installed; the build will error out if it tries to install the +# dictionaries into /usr/lib64 for 32-bit targets +configure_args="--enable-compile-in-filters --enable-32-bit-hash-fun + --libdir=/usr/lib --enable-pkgdatadir=/usr/lib" hostmakedepends="automake libtool gettext-devel perl" makedepends="ncurses-devel" depends="perl" From 15c48fa648e68fd9a26fe13e31c69f1466463e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:32 -0300 Subject: [PATCH 2/8] aspell-ru: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-ru/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-ru/template b/srcpkgs/aspell-ru/template index c6592338f38..abdcf8f050c 100644 --- a/srcpkgs/aspell-ru/template +++ b/srcpkgs/aspell-ru/template @@ -1,7 +1,7 @@ # Template file for 'aspell-ru' pkgname=aspell-ru version=0.99f7 -revision=3 +revision=4 wrksrc="aspell6-ru-${version}-1" build_style=configure hostmakedepends="aspell-devel which" From f06c8160beebf3f58d2a0d209fd626a71976f448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:32 -0300 Subject: [PATCH 3/8] aspell-de: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-de/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-de/template b/srcpkgs/aspell-de/template index 029664409c5..be8905b0299 100644 --- a/srcpkgs/aspell-de/template +++ b/srcpkgs/aspell-de/template @@ -1,7 +1,7 @@ # Template file for 'aspell-de' pkgname=aspell-de version=20161207.7.0 -revision=2 +revision=3 wrksrc="aspell6-de-${version//./-}" build_style=configure hostmakedepends="aspell-devel which" From b60ecc53c6bf326023c6ad53b7f85aba04095382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:32 -0300 Subject: [PATCH 4/8] aspell-el: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-el/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-el/template b/srcpkgs/aspell-el/template index 7d4a9c2727f..1221a64c823 100644 --- a/srcpkgs/aspell-el/template +++ b/srcpkgs/aspell-el/template @@ -1,7 +1,7 @@ # Template file for 'aspell-el' pkgname=aspell-el version=0.08.0 -revision=2 +revision=3 _distver="${version%.*}-${version##*.}" wrksrc="aspell6-el-${_distver}" build_style=configure From 57f01ffc04e4548ba24fe1c507d2c6d772703449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:32 -0300 Subject: [PATCH 5/8] aspell-fr: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-fr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-fr/template b/srcpkgs/aspell-fr/template index 970e6041401..e563f3a91e8 100644 --- a/srcpkgs/aspell-fr/template +++ b/srcpkgs/aspell-fr/template @@ -1,7 +1,7 @@ # Template file for 'aspell-fr' pkgname=aspell-fr version=0.50.3 -revision=3 +revision=4 wrksrc="aspell-fr-0.50-3" build_style=configure hostmakedepends="aspell-devel which" From 7eb1e17529fa5094a6866ab470abc150c8993bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:33 -0300 Subject: [PATCH 6/8] aspell-en: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-en/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template index 87ac85d00ea..7b6ca841eaf 100644 --- a/srcpkgs/aspell-en/template +++ b/srcpkgs/aspell-en/template @@ -1,7 +1,7 @@ # Template file for 'aspell-en' pkgname=aspell-en version=2020.12.07 -revision=1 +revision=2 wrksrc="aspell6-en-${version}-0" build_style=configure hostmakedepends="aspell-devel which" From 8e8eb35b62eed8bb5dac0133178a26f067bbfa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:33 -0300 Subject: [PATCH 7/8] aspell-cs: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-cs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-cs/template b/srcpkgs/aspell-cs/template index 35958546170..a5ff4a773d2 100644 --- a/srcpkgs/aspell-cs/template +++ b/srcpkgs/aspell-cs/template @@ -1,7 +1,7 @@ # Template file for 'aspell-cs' pkgname=aspell-cs version=20040614.1 -revision=2 +revision=3 wrksrc="aspell6-cs-${version/./-}" build_style=configure hostmakedepends="aspell-devel which" From 47d4d2be70cfe31db12fd2cfbefe8b1b28e791af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 22 Dec 2020 01:19:33 -0300 Subject: [PATCH 8/8] aspell-pl: rebuild for forced 32bit hash function in aspell. --- srcpkgs/aspell-pl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template index a0600b785c9..05d90c0033b 100644 --- a/srcpkgs/aspell-pl/template +++ b/srcpkgs/aspell-pl/template @@ -1,7 +1,7 @@ # Template file for 'aspell-pl' pkgname=aspell-pl version=20061121 -revision=2 +revision=3 wrksrc="aspell6-pl-6.0_${version}-0" build_style=configure hostmakedepends="aspell-devel which"