Include hunspell .bdic files for qtwebengine and maybe others

Closes: #1017646
Thanks Soren Stoutner for the report

diff --git a/debian/changelog b/debian/changelog
index 2ed6c73fc7bfb92633e17970f8f5152a57e48e9e..6da3cfc033cb0dfaa2ef50f8e09849e4af16e5ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scowl (2020.12.07-3) unstable; urgency=medium
+
+  * Include hunspell .bdic files (for qtwebengine and others). (Closes:
+    #1017646) Thanks to Soren Stoutner.
+
+ -- Don Armstrong <don@debian.org>  Mon, 19 Sep 2022 16:19:57 -0700
+
 scowl (2020.12.07-2) unstable; urgency=medium
 
   * Separate uniqifying from sort; users (and other plurals with

diff --git a/debian/control b/debian/control
index 89ad062d97e39761d1b1fcb416d61cc6beccec10..58aa8acc29e66678370cfd3541e660e66161637c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: text
 Priority: standard
 Standards-Version: 4.1.4
 Build-Depends: debhelper (>= 12)
-Build-Depends-Indep: dictionaries-common-dev, dos2unix, aspell
+Build-Depends-Indep: dictionaries-common-dev, dos2unix, aspell, qtwebengine5-dev-tools, libqt5webengine-data
 Homepage: http://wordlist.sourceforge.net/
 Vcs-Browser: https://git.donarmstrong.com/deb_pkgs/scowl.git
 Vcs-Git: https://git.donarmstrong.com/deb_pkgs/scowl.git

diff --git a/debian/hunspell-en-au.install b/debian/hunspell-en-au.install
index 243163638d199101c2053336b2ccd8c439f62752..00d9a6a52c08a99e06f5b657c72b9b28242fdec4 100644 (file)
--- a/debian/hunspell-en-au.install
+++ b/debian/hunspell-en-au.install
@@ -1,3 +1,4 @@
 ./speller/en_AU.aff usr/share/hunspell
 ./speller/en_AU.dic usr/share/hunspell
+./speller/en_AU.bdic usr/share/hunspell
 

diff --git a/debian/hunspell-en-au.links b/debian/hunspell-en-au.links
new file mode 100644 (file)
index 0000000..80f3a6e
--- /dev/null
+++ b/debian/hunspell-en-au.links
@@ -0,0 +1,2 @@
+usr/share/hunspell/en_AU.bdic usr/share/qt5/qtwebengine_dictionaries/en_AU.bdic
+usr/share/hunspell/en_AU.bdic usr/share/qt6/qtwebengine_dictionaries/en_AU.bdic

diff --git a/debian/hunspell-en-ca.install b/debian/hunspell-en-ca.install
index b564b3c97315cb0e4d76fda7be393eb2cc4def47..f645db012dd9513d632402e9fdee9556709fb150 100644 (file)
--- a/debian/hunspell-en-ca.install
+++ b/debian/hunspell-en-ca.install
@@ -1,3 +1,4 @@
 ./speller/en_CA.aff usr/share/hunspell
 ./speller/en_CA.dic usr/share/hunspell
+./speller/en_CA.bdic usr/share/hunspell
 

diff --git a/debian/hunspell-en-ca.links b/debian/hunspell-en-ca.links
new file mode 100644 (file)
index 0000000..be369a0
--- /dev/null
+++ b/debian/hunspell-en-ca.links
@@ -0,0 +1,2 @@
+usr/share/hunspell/en_CA.bdic usr/share/qt5/qtwebengine_dictionaries/en_CA.bdic
+usr/share/hunspell/en_CA.bdic usr/share/qt6/qtwebengine_dictionaries/en_CA.bdic

diff --git a/debian/hunspell-en-us.install b/debian/hunspell-en-us.install
index 54f004b773e38fe5caccca63f290ad90d6028fb5..b0b0a2cbba16f642bf889b5797e9c9ec045c7c33 100644 (file)
--- a/debian/hunspell-en-us.install
+++ b/debian/hunspell-en-us.install
@@ -1,3 +1,4 @@
 ./speller/en_US.aff usr/share/hunspell
 ./speller/en_US.dic usr/share/hunspell
+./speller/en_US.bdic usr/share/hunspell
 

diff --git a/debian/hunspell-en-us.links b/debian/hunspell-en-us.links
new file mode 100644 (file)
index 0000000..68e537e
--- /dev/null
+++ b/debian/hunspell-en-us.links
@@ -0,0 +1,2 @@
+usr/share/hunspell/en_US.bdic usr/share/qt5/qtwebengine_dictionaries/en_US.bdic
+usr/share/hunspell/en_US.bdic usr/share/qt6/qtwebengine_dictionaries/en_US.bdic

diff --git a/debian/patches/ignore_bdic b/debian/patches/ignore_bdic
new file mode 100644 (file)
index 0000000..10e7da2
--- /dev/null
+++ b/debian/patches/ignore_bdic
@@ -0,0 +1,7 @@
+--- a/speller/.gitignore
++++ b/speller/.gitignore
+@@ -19,3 +19,4 @@
+ aspell/Copyright
+ aspell/doc/SCOWL-README
+ *.txt
++*.bdic

diff --git a/debian/patches/series b/debian/patches/series
index 6c3365e7c169924ddb60e79ae3a644ec8dec35d2..7fe8864900b845692cd1f5888ad671b8f1fb4e73 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ move_sangs_to_insane
 deprecate_reprized
 hunspell_size_70
 fix_hunspell_affix
+ignore_bdic

diff --git a/debian/rules b/debian/rules
index a72a41e1796392f38481aba48a40d56157914533..a9e36b7d43b49bfbaff6a23873a8a30ce27d0c72 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,10 @@ override_dh_auto_build:
          done;\
        done
        cd speller && $(MAKE) hunspell
+       ( cd speller; \
+         for a in *.dic; do \
+                       /usr/lib/qt5/bin/qwebengine_convert_dict $$a $${a%%.dic}.bdic; \
+       done;)
 
 override_dh_auto_clean:
        rm -rf final_utf8;