diff --git a/.github/diy/main.sh b/.github/diy/main.sh index 97a8836d1..7c00a423f 100755 --- a/.github/diy/main.sh +++ b/.github/diy/main.sh @@ -99,7 +99,7 @@ git clone --depth 1 https://github.com/linkease/nas-packages && mv -n nas-packag git clone --depth 1 https://github.com/linkease/nas-packages-luci && mv -n nas-packages-luci/luci/* ./; rm -rf nas-packages-luci git clone --depth 1 https://github.com/linkease/istore && mv -n istore/luci/* ./; rm -rf istore git clone --depth 1 https://github.com/AlexZhuo/luci-app-bandwidthd -git clone --depth 1 https://github.com/linkease/openwrt-app-actions +git_clone https://github.com/linkease/openwrt-app-actions && mv -n openwrt-app-actions/applications ./;rm -rf openwrt-app-actions git clone --depth 1 https://github.com/ZeaKyX/luci-app-speedtest-web git clone --depth 1 https://github.com/ZeaKyX/speedtest-web git clone --depth 1 https://github.com/Huangjoe123/luci-app-eqos diff --git a/upx/patches/010-fix-build-with-gcc11.patch b/upx/patches/010-fix-build-with-gcc11.patch deleted file mode 100644 index 245812f28..000000000 --- a/upx/patches/010-fix-build-with-gcc11.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4121815fb9bc977ab0953558a2a69fa33550c53c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 14 May 2021 02:26:13 -0700 -Subject: [PATCH] MyCom.h: fix build with gcc-11 - -* fixes: - ./../src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.h: In member function 'virtual ULONG NCompress::NLZMA::CEncoder::Release()': - ./../src/lzma-sdk/C/7zip/Compress/LZMA/../../../Common/MyCom.h:159:32: error: this 'if' clause does not guard... [-Werror=misleading-indentation] - 159 | STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) \ - | ^~ - -Signed-off-by: Martin Jansa ---- - src/lzma-sdk/C/Common/MyCom.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/src/lzma-sdk/C/Common/MyCom.h -+++ b/src/lzma-sdk/C/Common/MyCom.h -@@ -156,8 +156,7 @@ class CMyUnknownImp - - #define MY_ADDREF_RELEASE \ - STDMETHOD_(ULONG, AddRef)() { return ++__m_RefCount; } \ --STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) \ -- return __m_RefCount; delete this; return 0; } -+STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) return __m_RefCount; delete this; return 0; } - - #define MY_UNKNOWN_IMP_SPEC(i) \ - MY_QUERYINTERFACE_BEGIN \