Bug 1852512 - vendor hunspell using moz.yaml r=ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D187878

extensions/spellcheck/hunspell/moz.yaml

@@ -0,0 +1,65 @@
+schema: 1
+
+bugzilla:
+  product: Core
+  component: "Spelling checker"
+
+origin:
+  name: Hunspell
+  description: Spell checker
+
+  url: http://hunspell.github.io
+
+  release: 1180421f50f211984211e968eb6801ffd3390b8f (2022-08-22T13:53:31Z).
+  revision: 1180421f50f211984211e968eb6801ffd3390b8f
+  license: MPL-1.1
+  license-file: COPYING.MPL
+
+vendoring:
+  url: https://github.com/hunspell/hunspell
+  source-hosting: github
+  tracking: commit
+
+  exclude:
+    - "*"
+    - "**"
+    - ".*"
+    - "**/.gitignore"
+
+  keep:
+    - glue
+    - tests
+    - COPYING.MPL
+    - src/moz.build
+    - src/sources.mozbuild
+    - src/license.hunspell
+    - src/license.myspell
+    - src/README.md
+
+  include:
+    - "src/hunspell"
+
+  patches:
+    - patches/bug1410214.patch
+    - patches/bug1653659.patch
+    - patches/bug1739761.patch
+    - patches/bug1838113.patch
+
+  update-actions:
+    - action: move-dir
+      from: '{vendor_dir}/src/hunspell'
+      to: '{vendor_dir}/src'
+    - action: delete-path
+      path: "src/Makefile.am"
+    - action: delete-path
+      path: "src/filemgr.cxx"
+    - action: delete-path
+      path: "src/hunvisapi.h.in"
+    - action: delete-path
+      path: "src/hunzip.cxx"
+    - action: delete-path
+      path: "src/hunzip.hxx"
+    - action: delete-path
+      path: "src/utf_info.hxx"
+    - action: delete-path
+      path: "tests/.gitattributes"

extensions/spellcheck/hunspell/patches/bug1410214.patch

@@ -1,6 +1,6 @@
-diff --git a/extensions/spellcheck/hunspell/src/filemgr.hxx b/extensions/spellcheck/hunspell/src/filemgr.hxx
---- a/extensions/spellcheck/hunspell/src/filemgr.hxx
-+++ b/extensions/spellcheck/hunspell/src/filemgr.hxx
+diff --git a/src/filemgr.hxx b/src/filemgr.hxx
+--- a/src/filemgr.hxx
++++ b/src/filemgr.hxx
 @@ -67,32 +67,11 @@
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.

extensions/spellcheck/hunspell/patches/bug1653659.patch

@@ -1,6 +1,6 @@
-diff --git a/extensions/spellcheck/hunspell/src/csutil.cxx b/extensions/spellcheck/hunspell/src/csutil.cxx
---- a/extensions/spellcheck/hunspell/src/csutil.cxx
-+++ b/extensions/spellcheck/hunspell/src/csutil.cxx
+diff --git a/src/csutil.cxx b/src/csutil.cxx
+--- a/src/csutil.cxx
++++ b/src/csutil.cxx
 @@ -90,21 +90,17 @@
  #else
  #ifndef MOZILLA_CLIENT
@@ -164,9 +164,9 @@ diff --git a/extensions/spellcheck/hunspell/src/csutil.cxx b/extensions/spellche
  
  int unicodeisalpha(unsigned short c) {
  #ifdef OPENOFFICEORG
-diff --git a/extensions/spellcheck/hunspell/src/csutil.hxx b/extensions/spellcheck/hunspell/src/csutil.hxx
---- a/extensions/spellcheck/hunspell/src/csutil.hxx
-+++ b/extensions/spellcheck/hunspell/src/csutil.hxx
+diff --git a/src/csutil.hxx b/src/csutil.hxx
+--- a/src/csutil.hxx
++++ b/src/csutil.hxx
 @@ -77,20 +77,16 @@
  
  #include <fstream>

extensions/spellcheck/hunspell/patches/bug1739761.patch

@@ -1,6 +1,6 @@
-diff --git a/extensions/spellcheck/hunspell/src/hashmgr.cxx b/extensions/spellcheck/hunspell/src/hashmgr.cxx
---- a/extensions/spellcheck/hunspell/src/hashmgr.cxx
-+++ b/extensions/spellcheck/hunspell/src/hashmgr.cxx
+diff --git a/src/hashmgr.cxx b/src/hashmgr.cxx
+--- a/src/hashmgr.cxx
++++ b/src/hashmgr.cxx
 @@ -63,16 +63,17 @@
   * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -538,9 +538,9 @@ diff --git a/extensions/spellcheck/hunspell/src/hashmgr.cxx b/extensions/spellch
 +  --outstanding_arena_allocations;
 +  assert(outstanding_arena_allocations >= 0);
 +}
-diff --git a/extensions/spellcheck/hunspell/src/hashmgr.hxx b/extensions/spellcheck/hunspell/src/hashmgr.hxx
---- a/extensions/spellcheck/hunspell/src/hashmgr.hxx
-+++ b/extensions/spellcheck/hunspell/src/hashmgr.hxx
+diff --git a/src/hashmgr.hxx b/src/hashmgr.hxx
+--- a/src/hashmgr.hxx
++++ b/src/hashmgr.hxx
 @@ -67,16 +67,18 @@
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.

extensions/spellcheck/hunspell/patches/bug1838113.patch

@@ -1,7 +1,7 @@
-diff --git a/extensions/spellcheck/hunspell/src/csutil.cxx b/extensions/spellcheck/hunspell/src/csutil.cxx
+diff --git a/src/csutil.cxx b/src/csutil.cxx
 index 48e58ff4b2677..39a54d38023c8 100644
---- a/extensions/spellcheck/hunspell/src/csutil.cxx
-+++ b/extensions/spellcheck/hunspell/src/csutil.cxx
+--- a/src/csutil.cxx
++++ b/src/csutil.cxx
 @@ -108,6 +108,7 @@ static struct unicode_info2* utf_tbl = NULL;
  static int utf_tbl_count =
      0;  // utf_tbl can be used by multiple Hunspell instances

extensions/spellcheck/hunspell/src/moz.yaml

@@ -1,16 +0,0 @@
-# Version of this schema
-schema: 1
-
-bugzilla:
-  product: "Core"
-  component: "Spelling checker"
-
-origin:
-  name: "Hunspell"
-  description: "Spell Checker"
-
-  url: "http://hunspell.github.io/"
-  license: "MPL-1.1"
-  license-file: "COPYING.MPL"
-
-  release: "1.7.0"

extensions/spellcheck/hunspell/update.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 1 ]; then
-  echo update.sh "<release tag name>"
-  exit 1
-fi
-
-hunspell_dir=`dirname $0`
-
-tmpclonedir=$(mktemp -d)
-git clone https://github.com/hunspell/hunspell --depth 1 --branch $1 ${tmpclonedir}
-# Back up mozilla files
-cp ${hunspell_dir}/src/moz.build ${tmpclonedir}/src/hunspell
-cp ${hunspell_dir}/src/moz.yaml ${tmpclonedir}/src/hunspell
-cp ${hunspell_dir}/src/sources.mozbuild ${tmpclonedir}/src/hunspell
-
-rm -rf ${hunspell_dir}/src
-cp -r ${tmpclonedir}/src/hunspell/ ${hunspell_dir}/src
-cp ${tmpclonedir}/license.hunspell ${hunspell_dir}/src
-cp ${tmpclonedir}/license.myspell ${hunspell_dir}/src
-cp ${tmpclonedir}/README.md ${hunspell_dir}/src
-rm ${hunspell_dir}/src/Makefile.am
-rm ${hunspell_dir}/src/filemgr.cxx
-rm ${hunspell_dir}/src/hunvisapi.h.in
-rm ${hunspell_dir}/src/hunzip.cxx
-rm ${hunspell_dir}/src/hunzip.hxx
-rm ${hunspell_dir}/src/utf_info.hxx
-rm -rf ${tmpclonedir}
-
-cd ${hunspell_dir}/src
-patch -p5 < ../patches/bug1410214.patch
-patch -p5 < ../patches/bug1653659.patch
-patch -p5 < ../patches/bug1739761.patch
-patch -p5 < ../patches/bug1838113.patch