Update to version 1.8.1

Note that this package currently requires freedict-tools-svn.
The latest release of freedict-tools does not yet contain the new
ding2tei converter.

2 files changed, 44 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb58e8988529..646c65e09d2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = dict-freedict-deu-eng
 	pkgdesc = German -> English dictionary for dictd et al. from Freedict.org
-	pkgver = 0.3.5
-	pkgrel = 3
+	pkgver = 1.8.1_fd0.2.1
+	pkgrel = 1
 	url = https://freedict.org/
 	install = dict-freedict-deu-eng.install
 	arch = any
 	license = GPL
-	makedepends = freedict-tools
+	license = AGPL3
+	makedepends = freedict-tools-svn
 	optdepends = dictd: dict client and server
-	source = https://download.freedict.org/dictionaries/deu-eng/0.3.5/freedict-deu-eng-0.3.5.src.tar.xz
-	sha512sums = 1a742e77d75be309f58a6f2de146d5734c44bd49a5bbcfeb37c3420367a688d64181bc855cde98d8d163d4b472889249917cc97401240dd2903a58cd4be45294
+	source = https://ftp.tu-chemnitz.de/pub/Local/urz/ding/old-releases/ding-1.8.1.tar.gz
+	sha512sums = 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4
 
 pkgname = dict-freedict-deu-eng
-
diff --git a/PKGBUILD b/PKGBUILD
index 77a72095d462..2391fdcce0ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,57 @@
 # Maintainer: Einhard Leichtfuß <alguien@respiranto.de>
-#
-# Generated by aur-fd-scripts - https://git.respiranto.de/aur-fd-scripts.git/
+
+# README:
+#  * Building this package takes very long (a day or so) and consumes quite a
+#    lot of RAM (> 4 GiB).
+#    * Consider to use the corresponding -bin package instead.
 
 _lang=deu-eng
 pkgname=dict-freedict-${_lang}
-pkgver=0.3.5
-pkgrel=3
+_dingver=1.8.1
+_pkgver=${_dingver}-fd0.2.1
+pkgver=${_pkgver//-/_}
+pkgrel=1
 pkgdesc="German -> English dictionary for dictd et al. from Freedict.org"
 arch=('any')
 url="https://freedict.org/"
-license=('GPL')
+license=('GPL' 'AGPL3')
 optdepends=('dictd: dict client and server')
-makedepends=('freedict-tools')
+makedepends=('freedict-tools-svn')
 install=${pkgname}.install
-source=("https://download.freedict.org/dictionaries/${_lang}/${pkgver}/freedict-${_lang}-${pkgver}.src.tar.xz")
-sha512sums=('1a742e77d75be309f58a6f2de146d5734c44bd49a5bbcfeb37c3420367a688d64181bc855cde98d8d163d4b472889249917cc97401240dd2903a58cd4be45294')
+source=("https://ftp.tu-chemnitz.de/pub/Local/urz/ding/old-releases/ding-${_dingver}.tar.gz")
+sha512sums=('7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4')
+
+
+prepare()
+{
+	mkdir "$_lang"
+
+	printf '%s\n\n%s\n' \
+		'DISTFILES = deu-eng.tei' \
+		'include $(FREEDICT_TOOLS)/mk/dicts.mk' \
+		> "${_lang}/Makefile"
+}
+
 
 build()
 {
-	cd $_lang
-	make FREEDICT_TOOLS=/usr/lib/freedict-tools build-dictd
+	local _freedict_tools_dir=/usr/lib/freedict-tools
+	local _ding2tei_dir="${_freedict_tools_dir}/importers/ding2tei"
+
+	"$_ding2tei_dir"/preprocess/de-en/all.sh \
+		< "ding-${_dingver}/de-en.txt" \
+		> de-en.txt.preprocessed
+
+	"${_ding2tei_dir}/ding2tei" de-en.txt.preprocessed "${_lang}/${_lang}.tei"
+
+	cd "$_lang"
+	make FREEDICT_TOOLS="$_freedict_tools_dir" build-dictd
 }
 
+
 package()
 {
 	install -m 755 -d "${pkgdir}/usr/share/dictd"
 	install -m 644 -t "${pkgdir}/usr/share/dictd/" \
-		${_lang}/build/dictd/${_lang}.{dict.dz,index}
-
-	for file in ${_lang}/{AUTHORS,README,NEWS,ChangeLog}
-	do
-		if test -f ${file}
-		then
-			install -m 644 -Dt "${pkgdir}/usr/share/doc/freedict/${_lang}/" ${file}
-		fi
-	done
+		"${_lang}/build/dictd/${_lang}".{dict.dz,index}
 }