forked from mirrors/gecko-dev
Bug 1821011 - Vendor woff2 using mach vendor r=jfkthame
Differential Revision: https://phabricator.services.mozilla.com/D171976
This commit is contained in:
parent
76bcfd7b55
commit
2014a700e5
5 changed files with 64 additions and 46 deletions
19
modules/woff2/LICENSE
Normal file
19
modules/woff2/LICENSE
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
Copyright (c) 2013-2017 by the WOFF2 Authors.
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
This is the woff2 library from
|
|
||||||
https://github.com/google/woff2.
|
|
||||||
|
|
||||||
Upstream code can be viewed at
|
|
||||||
https://github.com/google/woff2/tree/master
|
|
||||||
|
|
||||||
and cloned by
|
|
||||||
git clone https://github.com/google/woff2
|
|
||||||
|
|
||||||
The in-tree copy is updated by running
|
|
||||||
sh update.sh
|
|
||||||
from within the modules/woff2 directory.
|
|
||||||
|
|
||||||
Current version: [commit 4721483ad780ee2b63cb787bfee4aa64b61a0446].
|
|
||||||
|
|
||||||
Additional patch: woff2-rlbox.patch (bug 1732201).
|
|
||||||
42
modules/woff2/moz.yaml
Normal file
42
modules/woff2/moz.yaml
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
schema: 1
|
||||||
|
|
||||||
|
bugzilla:
|
||||||
|
product: Toolkit
|
||||||
|
component: "General"
|
||||||
|
|
||||||
|
origin:
|
||||||
|
name: woff2
|
||||||
|
description: font compression
|
||||||
|
|
||||||
|
url: https://github.com/google/woff2
|
||||||
|
|
||||||
|
release: 4721483ad780ee2b63cb787bfee4aa64b61a0446 (2022-03-30T15:59:13Z).
|
||||||
|
revision: 4721483ad780ee2b63cb787bfee4aa64b61a0446
|
||||||
|
|
||||||
|
license: MIT
|
||||||
|
|
||||||
|
vendoring:
|
||||||
|
url: https://github.com/google/woff2
|
||||||
|
source-hosting: github
|
||||||
|
tracking: commit
|
||||||
|
|
||||||
|
exclude:
|
||||||
|
- ".*"
|
||||||
|
- CMakeLists.txt
|
||||||
|
- CONTRIBUTING.md
|
||||||
|
- Makefile
|
||||||
|
- brotli
|
||||||
|
- cmake
|
||||||
|
- README.md
|
||||||
|
|
||||||
|
include:
|
||||||
|
- include/
|
||||||
|
- src/
|
||||||
|
|
||||||
|
keep:
|
||||||
|
- "RLBoxWOFF2Sandbox.*"
|
||||||
|
- sources.mozbuild
|
||||||
|
|
||||||
|
patches:
|
||||||
|
- woff2-rlbox.patch
|
||||||
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Script to update the mozilla in-tree copy of the woff2 library.
|
|
||||||
# Run this within the /modules/woff2 directory of the source tree.
|
|
||||||
|
|
||||||
MY_TEMP_DIR=`mktemp -d -t woff2_update.XXXXXX` || exit 1
|
|
||||||
|
|
||||||
git clone https://github.com/google/woff2 ${MY_TEMP_DIR}/woff2
|
|
||||||
|
|
||||||
COMMIT=`(cd ${MY_TEMP_DIR}/woff2 && git log | head -n 1)`
|
|
||||||
perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[${COMMIT}]/" README.mozilla;
|
|
||||||
|
|
||||||
rm -rf src
|
|
||||||
rm -rf include
|
|
||||||
mv ${MY_TEMP_DIR}/woff2/src src
|
|
||||||
mv ${MY_TEMP_DIR}/woff2/include include
|
|
||||||
rm -rf ${MY_TEMP_DIR}
|
|
||||||
hg add src
|
|
||||||
hg add include
|
|
||||||
|
|
||||||
echo "###"
|
|
||||||
echo "### Updated woff2 to $COMMIT."
|
|
||||||
echo "### Remember to verify and commit the changes to source control!"
|
|
||||||
echo "###"
|
|
||||||
|
|
||||||
echo "Applying woff2-rlbox.patch..."
|
|
||||||
patch -p3 < woff2-rlbox.patch
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
diff --git a/modules/woff2/src/woff2_dec.cc b/modules/woff2/src/woff2_dec.cc
|
diff --git a/src/woff2_dec.cc b/src/woff2_dec.cc
|
||||||
--- a/modules/woff2/src/woff2_dec.cc
|
--- a/src/woff2_dec.cc
|
||||||
+++ b/modules/woff2/src/woff2_dec.cc
|
+++ b/src/woff2_dec.cc
|
||||||
@@ -19,7 +19,6 @@
|
@@ -19,7 +19,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue