Skip to content

Commit

Permalink
Roll src/third_party/harfbuzz-ng/src/ e0307de81..000d4b128 (6 commits)
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/e0307de818ad..000d4b128eba

$ git log e0307de81..000d4b128 --date=short --no-merges --format='%ad %ae %s'
2018-11-29 behdad Make shaper's override_features() override user features as well
2018-11-29 behdad [khmer] Move 'clig' to overrides
2018-11-29 behdad Fix "typename outside template" issues
2018-11-29 behdad 2.2.0
2018-11-29 behdad [icu] Minor
2018-11-27 vichang Replace @deprecated ICU API - USCRIPT_CODE_LIMIT

Created with:
  roll-dep src/third_party/harfbuzz-ng/src
R=bashi@chromium.org,behdad@chromium.org,behdad@google.com,drott@chromium.org,eae@chromium.org,jshin@chromium.org

Force 'paste' in the roll script read from stdin with '-' to work on Mac.

This fixes the issue https://bugzilla.mozilla.org/show_bug.cgi?id=1458053
in Blink.

Change-Id: I56cea6cf9f1e968f850ba9ae37f89aced2a5ac18
Reviewed-on: https://chromium-review.googlesource.com/c/1357337
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Commit-Queue: Ben Wagner <bungeman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613114}
  • Loading branch information
bungeman authored and Commit Bot committed Dec 3, 2018
1 parent b408165 commit 6b4c75a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling HarfBuzz
# and whatever else without interference from each other.
'harfbuzz_revision': 'e0307de818ad1f70ef96938642bda61d7a62532a',
'harfbuzz_revision': '000d4b128eba58677acdc3b361829ff2f9a257b1',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
Expand Down
6 changes: 3 additions & 3 deletions third_party/harfbuzz-ng/README.chromium
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: harfbuzz-ng
Short Name: harfbuzz-ng
URL: http://harfbuzz.org
Version: 2.1.3-182
Date: 20181129
Revision: e0307de818ad1f70ef96938642bda61d7a62532a
Version: 2.2.0-3
Date: 20181201
Revision: 000d4b128eba58677acdc3b361829ff2f9a257b1
Security Critical: yes
License: MIT
License File: src/COPYING
Expand Down
6 changes: 3 additions & 3 deletions third_party/harfbuzz-ng/roll-harfbuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

rolldeps() {
STEP="roll-deps" &&
REVIEWERS=$(grep -E -v "^$|#" third_party/harfbuzz-ng/OWNERS | paste -s -d,) &&
REVIEWERS=$(grep -E -v "^$|#" third_party/harfbuzz-ng/OWNERS | paste -s -d, -) &&
roll-dep -r "${REVIEWERS}" --roll-to origin/upstream/master "$@" src/third_party/harfbuzz-ng/src/
}

Expand All @@ -25,8 +25,8 @@ previousrev() {
check_added_deleted_files() {
STEP="Check for added or deleted files since last HarfBuzz revision" &&
previousrev &&
ADDED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=A --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d,) &&
DELETED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=D --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d,) &&
ADDED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=A --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d, -) &&
DELETED_FILES=$(git -C third_party/harfbuzz-ng/src/ diff --diff-filter=D --name-only ${PREVIOUS_HARFBUZZ_REV} -- src/ | paste -s -d, -) &&
if [ -n "$ADDED_FILES" ]; then echo "Added files detected: " $ADDED_FILES; fi &&
if [ -n "$DELETED_FILES" ]; then echo "Deleted files detected" $DELETED_FILES; fi &&
if [ -n "$ADDED_FILES" ] || [ -n "$DELETED_FILES" ]; then echo -e "\nPlease update src/third_party/harfbuzz-ng/BUILD.gn before continuing."; fi
Expand Down

0 comments on commit 6b4c75a

Please sign in to comment.