Control: tag -1 patch pending On Mon, 19 Sep 2022, Soren Stoutner wrote: > I recently posted in the debian-kde list about packaging the Qt WebEngine > dictionaries to > see if there was any preference about how they should be named or where the > files should > be located. So far there have not been any comments. > > https://lists.debian.org/debian-kde/2022/09/msg00011.html[1] > > If you would like I could attempt to create a patch to enable the building of > these files. I > am new to Debian packaging, but I have been reading over the documentation > and have > some idea of how to put it together.
Since the files in question are small, I think just including them and appropriate symlinks should be sufficient. Here's the patch which does that. -- Don Armstrong https://www.donarmstrong.com If I had a letter, sealed it in a locked vault and hid the vault somewhere in New York. Then told you to read the letter, thats not security, thats obscurity. If I made a letter, sealed it in a vault, gave you the blueprints of the vault, the combinations of 1000 other vaults, access to the best lock smiths in the world, then told you to read the letter, and you still can't, thats security. -- Bruce Schneier
diff --git a/debian/changelog b/debian/changelog index 2ed6c73..6da3cfc 100644 --- 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 <d...@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 89ad062..58aa8ac 100644 --- 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 2431636..00d9a6a 100644 --- 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 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 b564b3c..f645db0 100644 --- 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 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 54f004b..b0b0a2c 100644 --- 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 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 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 6c3365e..7fe8864 100644 --- 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 a72a41e..a9e36b7 100755 --- 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;