From 0b8872726c3bcede82df2a6759b374fea8675e80 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Mon, 22 Jan 2024 08:45:20 +0000
Subject: [PATCH] Bug 1875296 - Vendor graphite2 using `mach vendor` r=jfkthame

Differential Revision: https://phabricator.services.mozilla.com/D198954
---
 gfx/graphite2/ChangeLog        | 12 ++++++++
 gfx/graphite2/README.mozilla   |  3 --
 gfx/graphite2/moz-gr-update.sh | 54 ----------------------------------
 gfx/graphite2/moz.yaml         | 38 ++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 57 deletions(-)
 delete mode 100644 gfx/graphite2/README.mozilla
 delete mode 100755 gfx/graphite2/moz-gr-update.sh
 create mode 100644 gfx/graphite2/moz.yaml

diff --git a/gfx/graphite2/ChangeLog b/gfx/graphite2/ChangeLog
index 672dddf8482a..e36110e1c188 100644
--- a/gfx/graphite2/ChangeLog
+++ b/gfx/graphite2/ChangeLog
@@ -1,3 +1,15 @@
+1.3.14
+    . Bug fixes
+    . Allow features to be hidden (for aliases)
+    . Move to python3
+    . Rename doc files from .txt to .asc
+
+1.3.13
+    . Resolve minor spacing issue in rtl non-overlap kerning
+    . python3 for graphite.py
+    . Better fuzzing
+    . Better building on windows
+
 1.3.12
     . Graphite no longer does dumb rendering for fonts with no smarts
     . Segment caching code removed. Anything attempting to use the segment cache gets given a regular face instead
diff --git a/gfx/graphite2/README.mozilla b/gfx/graphite2/README.mozilla
deleted file mode 100644
index 1b9e1e1e1318..000000000000
--- a/gfx/graphite2/README.mozilla
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains the Graphite2 library release 1.3.14 from
-https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-minimal-1.3.14.tgz
-See ./gfx/graphite2/moz-gr-update.sh for update procedure.
diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
deleted file mode 100755
index b91d9c161cc7..000000000000
--- a/gfx/graphite2/moz-gr-update.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Script used to update the Graphite2 library in the mozilla source tree
-
-# This script lives in gfx/graphite2, along with the library source,
-# but must be run from the top level of the mozilla-central tree.
-
-# Run as
-#
-#    ./gfx/graphite2/moz-gr-update.sh RELEASE
-#
-# where RELEASE is the graphite2 release to be used, e.g. "1.3.4".
-
-RELEASE=$1
-
-if [ "x$RELEASE" == "x" ]
-then
-    echo "Must provide the version number to be used."
-    exit 1
-fi
-
-TARBALL="https://github.com/silnrsi/graphite/releases/download/$RELEASE/graphite2-minimal-$RELEASE.tgz"
-
-foo=`basename $0`
-TMPFILE=`mktemp -t ${foo}.XXX` || exit 1
-
-curl -L "$TARBALL" -o "$TMPFILE"
-tar -x -z -C gfx/graphite2/ --strip-components 1 -f "$TMPFILE" || exit 1
-rm "$TMPFILE"
-
-echo "This directory contains the Graphite2 library release $RELEASE from" > gfx/graphite2/README.mozilla
-echo "$TARBALL" >> gfx/graphite2/README.mozilla
-echo ""
-echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
-
-# fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
-#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
-#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
-
-# summarize what's been touched
-echo Updated to $RELEASE.
-echo Here is what changed in the gfx/graphite2 directory:
-echo
-
-hg stat gfx/graphite2
-
-echo
-echo If gfx/graphite2/src/files.mk has changed, please make corresponding
-echo changes to gfx/graphite2/src/moz.build
-echo
-
-echo
-echo Now use hg commands to create a patch for the mozilla tree.
-echo
diff --git a/gfx/graphite2/moz.yaml b/gfx/graphite2/moz.yaml
new file mode 100644
index 000000000000..67c6db62adfe
--- /dev/null
+++ b/gfx/graphite2/moz.yaml
@@ -0,0 +1,38 @@
+schema: 1
+
+bugzilla:
+  product: Core
+  component: "Graphics: Text"
+
+origin:
+  name: graphite2
+  description: smart font system developed specifically to handle the complexities of lesser-known languages of the world
+
+  url: https://graphite.sil.org/
+
+  release: 1.3.14 (2020-04-01T09:53:13+07:00).
+  revision: 1.3.14
+
+  license: LGPL-2.1
+  license-file: LICENSE
+
+vendoring:
+  url: https://github.com/silnrsi/graphite
+  source-hosting: github
+  tracking: tag
+
+  exclude:
+    - "**"
+
+  include:
+    - ChangeLog
+    - COPYING
+    - LICENSE
+    - include
+    - README.md
+    - src
+
+  keep:
+    - geckoextra
+    - src/MozGrMalloc.h
+    - src/sources.mozbuild