From 0bd7c065e5ac349c327e39d30dfc63d3934adeef Mon Sep 17 00:00:00 2001 From: xuwenlong Date: Sat, 26 Aug 2023 19:32:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9harfbuzz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuwenlong --- thirdparty/harfbuzz/HPKBUILD | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/thirdparty/harfbuzz/HPKBUILD b/thirdparty/harfbuzz/HPKBUILD index a76d17bf..dd33ff1a 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -1,3 +1,16 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Contributor: 小肉头君 # Maintainer: 小肉头君 @@ -8,7 +21,7 @@ pkgdesc="HarfBuzz text shaping engine." url="https://github.com/harfbuzz/harfbuzz" archs=("armeabi-v7a" "arm64-v8a") license=("Old MIT") -depends=() +depends=("freetype2") makedepends=() source="https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz" @@ -20,11 +33,9 @@ builddir=$pkgname-$pkgver packagename=$builddir.tar.gz source envset.sh -autogenflag=true host= prepare() { - mkdir -p $builddir/$ARCH-build if [ $ARCH == "armeabi-v7a" ] then setarm32ENV @@ -35,18 +46,17 @@ prepare() { setarm64ENV host=aarch64-linux fi - if $autogenflag - then - cd $builddir - ./autogen.sh > `pwd`/build.log 2>&1 - cd $OLDPWD - autogenflag=false - fi + mkdir -p $builddir/$ARCH-build + # autogen可直接生产Makefile, 应直接生成到编译目录 + cd $builddir/$ARCH-build + ../autogen.sh > `pwd`/build.log 2>&1 + cd $OLDPWD } build() { cd $builddir/$ARCH-build - ../configure "$@" --host=$host --with-freetype=no --with-icu=no --with-glib=no -with-cairo=no --enable-static > `pwd`/build.log 2>&1 + # freetype2 功能选项需要打开，其他库需要 + PKG_CONFIG_PATH="${pkgconfigpath}" ../configure "$@" --host=$host --with-freetype=yes --with-icu=no --with-glib=no -with-cairo=no --enable-static > `pwd`/build.log 2>&1 make -j4 >> `pwd`/build.log 2>&1 ret=$? cd $OLDPWD -- Gitee From dab735047a80b5e3c43e40fb8cc34cf41cbad2b5 Mon Sep 17 00:00:00 2001 From: wlxuz Date: Sun, 27 Aug 2023 15:29:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maintainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wlxuz --- thirdparty/harfbuzz/HPKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thirdparty/harfbuzz/HPKBUILD b/thirdparty/harfbuzz/HPKBUILD index dd33ff1a..f733feda 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Contributor: 小肉头君 +# Contributor: 小肉头君 , 城meto # Maintainer: 小肉头君 pkgname=harfbuzz @@ -57,7 +57,7 @@ build() { cd $builddir/$ARCH-build # freetype2 功能选项需要打开，其他库需要 PKG_CONFIG_PATH="${pkgconfigpath}" ../configure "$@" --host=$host --with-freetype=yes --with-icu=no --with-glib=no -with-cairo=no --enable-static > `pwd`/build.log 2>&1 - make -j4 >> `pwd`/build.log 2>&1 + make -j4 VERBOSE=1 >> `pwd`/build.log 2>&1 ret=$? cd $OLDPWD return $ret -- Gitee From 1871b864c3c875f806c00f70e7ea8a74656fb26e Mon Sep 17 00:00:00 2001 From: wlxuz Date: Sun, 27 Aug 2023 22:18:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wlxuz --- thirdparty/harfbuzz/HPKBUILD | 7 ++++--- thirdparty/harfbuzz/SHA512SUM | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/thirdparty/harfbuzz/HPKBUILD b/thirdparty/harfbuzz/HPKBUILD index f733feda..259f5374 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -21,16 +21,17 @@ pkgdesc="HarfBuzz text shaping engine." url="https://github.com/harfbuzz/harfbuzz" archs=("armeabi-v7a" "arm64-v8a") license=("Old MIT") -depends=("freetype2") +depends=() #"freetype2" makedepends=() -source="https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz" +# 原仓地址: https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz, 因网络原因使用镜像 +source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/$pkgver.zip" autounpack=true downloadpackage=true buildtools="configure" builddir=$pkgname-$pkgver -packagename=$builddir.tar.gz +packagename=$builddir.zip source envset.sh host= diff --git a/thirdparty/harfbuzz/SHA512SUM b/thirdparty/harfbuzz/SHA512SUM index 4ef71985..63c1d0a8 100644 --- a/thirdparty/harfbuzz/SHA512SUM +++ b/thirdparty/harfbuzz/SHA512SUM @@ -1 +1 @@ -aaef6801c73492624f19dececd956c03fda82a441b81553dfcd0bd47e5120b1d61acfef422a6cd0ded490d16ee4ee9088abdc0faba2a84884905e7cd63fe59d6 harfbuzz-7.1.0.tar.gz +7a51be0c3ac58731505878d9b2b656c7daece0b5151e5da7025a6b21c375de65b21df53622961cb747bac5e0d69b7045396334263706c56c4d4c97f7b7b2ef1e harfbuzz-7.1.0.zip -- Gitee From 3cf0c7aaf8bf848872930e9d10038fa7cd286dff Mon Sep 17 00:00:00 2001 From: wlxuz Date: Sun, 27 Aug 2023 22:40:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wlxuz --- thirdparty/harfbuzz/HPKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/harfbuzz/HPKBUILD b/thirdparty/harfbuzz/HPKBUILD index 259f5374..b9a59ad0 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -21,7 +21,7 @@ pkgdesc="HarfBuzz text shaping engine." url="https://github.com/harfbuzz/harfbuzz" archs=("armeabi-v7a" "arm64-v8a") license=("Old MIT") -depends=() #"freetype2" +depends=("freetype2") makedepends=() # 原仓地址: https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz, 因网络原因使用镜像 source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/$pkgver.zip" -- Gitee