From fc88ddcbaea41454b49366a4e56a59a693dc6431 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Tue, 12 Nov 2024 17:06:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?diff-match-patch-cpp-stl=E5=BA=93=E7=9A=84h?=
 =?UTF-8?q?pkbuild=E6=96=87=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E6=95=B4=E6=94=B9=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=B8=BAgit=20clo?=
 =?UTF-8?q?ne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/diff-match-patch-cpp-stl/HPKBUILD | 39 +++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/thirdparty/diff-match-patch-cpp-stl/HPKBUILD b/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
index 4a9c24fc..361e1891 100644
--- a/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
+++ b/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
@@ -9,24 +9,43 @@ archs=("armeabi-v7a" "arm64-v8a")
 license=("Apache License 2.0")
 depends=()
 makedepends=()
-
-source="https://github.com/leutloff/$pkgname/archive/refs/heads/$pkgver.zip"
-
-autounpack=true
-downloadpackage=true
+source="https://gitee.com/lycium_pkg_mirror/$pkgname.git"
+autounpack=false
+downloadpackage=false
 buildtools="cmake"
 
 builddir=$pkgname-${pkgver}
 packagename=$builddir.zip
-
+commitid=673dfc9d4bcb8cd0234894f5a245e9824abf5fbc
+cloneflag=true
 prepare() {
-   mkdir -p $builddir/$ARCH-build
+
+    if [ $cloneflag == true ]
+    then
+        mkdir $builddir
+        git clone -b $pkgver $source $builddir > $publicbuildlog 2>&1 
+        if [ $? != 0 ]
+        then
+            return -1
+        fi
+        cd $builddir
+        git reset --hard $commitid > $publicbuildlog 2>&1 
+        if [ $? != 0 ]
+        then
+            return -1
+        fi
+        cd ..
+        cloneflag=false
+    fi
+
+    mkdir -p $builddir/$ARCH-build
 }
 
 build() {
-    cd $builddir/
-    ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1
-    make -j4 -C $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1
+    cd $builddir
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" \
+        -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > $buildlog 2>&1
+    $MAKE VERBOSE=1 -C $ARCH-build >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
-- 
Gitee


From 140a840b64c0a2ebeede30c1ca19a856c0c8026c Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Fri, 15 Nov 2024 03:24:24 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E5=B1=82=E4=BD=BF=E7=94=A8oldpwd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/diff-match-patch-cpp-stl/HPKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/thirdparty/diff-match-patch-cpp-stl/HPKBUILD b/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
index 361e1891..ce1301bc 100644
--- a/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
+++ b/thirdparty/diff-match-patch-cpp-stl/HPKBUILD
@@ -15,7 +15,7 @@ downloadpackage=false
 buildtools="cmake"
 
 builddir=$pkgname-${pkgver}
-packagename=$builddir.zip
+#packagename=$builddir.zip
 commitid=673dfc9d4bcb8cd0234894f5a245e9824abf5fbc
 cloneflag=true
 prepare() {
@@ -34,7 +34,7 @@ prepare() {
         then
             return -1
         fi
-        cd ..
+        cd $OLDPWD
         cloneflag=false
     fi
 
-- 
Gitee