From 1346f66f07522dc6c18abbb93495ec8ba0b9fa74 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Fri, 15 Nov 2024 14:36:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.HDiffPatch=E5=BA=93=E7=9A=84hpkbuild?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=202.=E6=94=B9=E4=B8=BAgitee=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=203.=E4=BF=AE=E6=94=B9=E4=B8=BAgitee=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84sha512=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/HDiffPatch/HPKBUILD  | 21 +++++++++++----------
 thirdparty/HDiffPatch/SHA512SUM |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/thirdparty/HDiffPatch/HPKBUILD b/thirdparty/HDiffPatch/HPKBUILD
index ed6f1bb9..0a2d0577 100644
--- a/thirdparty/HDiffPatch/HPKBUILD
+++ b/thirdparty/HDiffPatch/HPKBUILD
@@ -10,14 +10,13 @@ archs=("armeabi-v7a" "arm64-v8a")
 license=("MIT")
 depends=()
 makedepends=()
-
-source="https://github.com/sisong/$pkgname/archive/refs/tags/$pkgver.tar.gz"
-
+#source="https://github.com/sisong/$pkgname/archive/refs/tags/$pkgver.tar.gz"
+source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/v4.6.3"
 autounpack=true
 downloadpackage=true
 
-builddir=$pkgname-${pkgver:1}
-packagename=$builddir.tar.gz
+builddir=$pkgname-v${pkgver:1}
+packagename=$builddir.zip
 dependsname="bzip2 libmd5 zlib zstd"
 buildtools="make"
 
@@ -39,12 +38,14 @@ prepare() {
             echo "fail: git clone bzip2 $ret"
             return $ret
         fi
-        git clone -b v1.5.5 https://github.com/sisong/zstd.git
+        #git clone -b v1.5.5 https://github.com/sisong/zstd.git
+        git clone -b v1.5.5 https://gitee.com/lycium_pkg_mirror/zstd.git
         if [ $ret -ne 0 ]; then
             echo "fail: git clone zstd $ret"
             return $ret
         fi
-        git clone -b v1.2.11 https://github.com/sisong/zlib.git
+        #git clone -b v1.2.11 https://github.com/sisong/zlib.git
+        git clone -b v1.2.11 https://gitee.com/lycium_pkg_mirror/zlib.git
         if [ $ret -ne 0 ]; then
             echo "fail: git clone zlib $ret"
             return $ret
@@ -73,8 +74,8 @@ prepare() {
 
 build() {
     cd $pkgname_$ARCH-build/$builddir/
-    make CC=$CC CXX=$CXX CFLAGS="$CFLAGS $c_cxxflag" CXXFLAGS="$CXXFLAGS $c_cxxflag" \
-        DESTDIR=$LYCIUM_ROOT/usr/$pkgname LZMA=0 ZSTD=1 MD5=1 > `pwd`/build.log 2>&1
+    $MAKE VERBOSE=1 CC=$CC CXX=$CXX CFLAGS="$CFLAGS $c_cxxflag" CXXFLAGS="$CXXFLAGS $c_cxxflag" \
+        DESTDIR=$LYCIUM_ROOT/usr/$pkgname LZMA=0 ZSTD=1 MD5=1 > $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -85,7 +86,7 @@ package() {
     mkdir -p $LYCIUM_ROOT/usr/$pkgname/$ARCH/bin
     mkdir -p $LYCIUM_ROOT/usr/$pkgname/$ARCH/lib
     mkdir -p $LYCIUM_ROOT/usr/$pkgname/$ARCH/include
-    make install INSTALL_BIN=$LYCIUM_ROOT/usr/$pkgname/$ARCH/bin >> `pwd`/build.log 2>&1
+    $MAKE VERBOSE=1 install INSTALL_BIN=$LYCIUM_ROOT/usr/$pkgname/$ARCH/bin >>$buildlog 2>&1
     cp *.a $LYCIUM_ROOT/usr/$pkgname/$ARCH/lib
     cp *.h $LYCIUM_ROOT/usr/$pkgname/$ARCH/include
     cd $OLDPWD
diff --git a/thirdparty/HDiffPatch/SHA512SUM b/thirdparty/HDiffPatch/SHA512SUM
index 9eef56ab..4a906ceb 100644
--- a/thirdparty/HDiffPatch/SHA512SUM
+++ b/thirdparty/HDiffPatch/SHA512SUM
@@ -1 +1 @@
-1cef5b50b5203d0c1a93698ee2eae818cd25967fc48a473272db616e9197c74710d32a8fedadbfe60adbd37b853e6edc50e797c97c3cd634e294257b40ce11b5 HDiffPatch-4.6.3.tar.gz
+727028dad1d66e59193fa54f018bdf8bfea4590e17567d04dfa54bdbc90782196f8cf043eb47f64245f33161b6a12b6d088532abffd5e18b8ba473ed4572bb70  HDiffPatch-v4.6.3.zip
-- 
Gitee


From 2405cd9c7c48f92b51d81b98259faa598ff666c3 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Fri, 22 Nov 2024 07:56:08 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=8A=E7=89=88=E6=9C=AC=E7=94=A8?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9D=A5=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/HDiffPatch/HPKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdparty/HDiffPatch/HPKBUILD b/thirdparty/HDiffPatch/HPKBUILD
index 0a2d0577..afda8fff 100644
--- a/thirdparty/HDiffPatch/HPKBUILD
+++ b/thirdparty/HDiffPatch/HPKBUILD
@@ -11,7 +11,7 @@ license=("MIT")
 depends=()
 makedepends=()
 #source="https://github.com/sisong/$pkgname/archive/refs/tags/$pkgver.tar.gz"
-source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/v4.6.3"
+source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/$pkgver"
 autounpack=true
 downloadpackage=true
 
-- 
Gitee