Skip to content

Commit

Permalink
upgrade: 1.9.0 -> 2.6.8 (#1)
Browse files Browse the repository at this point in the history
* Remove 1.9.0

* Add 2.6.8

* Update gitattributes

* Add gitignore

* Update lockfiles

* Fix build on macOS

* Change directory

* Change prep harfbuzz version

* Add system deps (Ubuntu)
  • Loading branch information
zbaylin authored Jul 8, 2020
1 parent 3c346ed commit 64274da
Show file tree
Hide file tree
Showing 3,108 changed files with 287,536 additions and 184,538 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
- uses: actions/setup-node@v2-beta
with:
node-version: 12
- name: Install dependencies (Ubuntu)
run: sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libegl1-mesa-dev mesa-utils mesa-utils-extra ragel
if: matrix.os == 'ubuntu-latest'
# Install [email protected]
- name: Install esy
run: npm i -g esy
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_build
_esy

*.DS_Store
3 changes: 3 additions & 0 deletions esy.lock/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions esy.lock/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion esy/configure-osx.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd _build
./configure --enable-shared=no --enable-static=yes --with-pic=yes --prefix=$cur__install
./configure --enable-shared=no --enable-static=yes --with-pic=yes --prefix=$cur__install --disable-dependency-tracking
2 changes: 1 addition & 1 deletion esy/configure-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ INSTALL_PATH="$(cygpath -u $cur__install)"

echo "Install: $INSTALL_PATH"

cmake -G "Unix Makefiles" ../harfbuzz-1.9.0 -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_LINKER=/usr/bin/x86_64-w64-mingw32-ld -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH
cmake -G "Unix Makefiles" ../harfbuzz-2.6.8 -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_LINKER=/usr/bin/x86_64-w64-mingw32-ld -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH
2 changes: 1 addition & 1 deletion esy/prep.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cp -rp harfbuzz-1.9.0 _build
cp -rp harfbuzz-2.6.8 _build

cd _build

Expand Down
9 changes: 0 additions & 9 deletions harfbuzz-1.9.0/AUTHORS

This file was deleted.

Loading

0 comments on commit 64274da

Please sign in to comment.