diff --git a/srcpkgs/UEFITool/patches/musl_defs.patch b/srcpkgs/UEFITool/patches/musl_defs.patch deleted file mode 100644 index 7c4a0d0d0eda96..00000000000000 --- a/srcpkgs/UEFITool/patches/musl_defs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/common/filesystem.cpp b/common/filesystem.cpp -index b2b8d65b4..5287a0c83 100644 ---- a/common/filesystem.cpp -+++ b/common/filesystem.cpp -@@ -75,6 +75,9 @@ UString getAbsPath(const UString & path) - #else - #include - #include -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif - bool isExistOnFs(const UString & path) - { - struct stat buf; -@@ -103,4 +106,4 @@ UString getAbsPath(const UString & path) { - return UString(abs); - return path; - } --#endif -\ No newline at end of file -+#endif diff --git a/srcpkgs/UEFITool/patches/use-system-libs.patch b/srcpkgs/UEFITool/patches/use-system-libs.patch new file mode 100644 index 00000000000000..80e4428cdf003f --- /dev/null +++ b/srcpkgs/UEFITool/patches/use-system-libs.patch @@ -0,0 +1,102 @@ +diff --git a/UEFIExtract/CMakeLists.txt b/UEFIExtract/CMakeLists.txt +index ac174d7..5c90757 100644 +--- a/UEFIExtract/CMakeLists.txt ++++ b/UEFIExtract/CMakeLists.txt +@@ -56,21 +56,6 @@ SET(PROJECT_SOURCES + ../common/digest/sha256.c + ../common/digest/sha512.c + ../common/digest/sm3.c +- ../common/zlib/adler32.c +- ../common/zlib/compress.c +- ../common/zlib/crc32.c +- ../common/zlib/deflate.c +- ../common/zlib/gzclose.c +- ../common/zlib/gzlib.c +- ../common/zlib/gzread.c +- ../common/zlib/gzwrite.c +- ../common/zlib/inflate.c +- ../common/zlib/infback.c +- ../common/zlib/inftrees.c +- ../common/zlib/inffast.c +- ../common/zlib/trees.c +- ../common/zlib/uncompr.c +- ../common/zlib/zutil.c + ) + + ADD_DEFINITIONS( +@@ -82,6 +67,8 @@ ADD_DEFINITIONS( + + ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES} uefiextract.manifest) + ++TARGET_LINK_LIBRARIES(UEFIExtract PRIVATE z) ++ + IF(UNIX) + SET_TARGET_PROPERTIES(UEFIExtract PROPERTIES OUTPUT_NAME uefiextract) + ENDIF() +diff --git a/UEFIFind/CMakeLists.txt b/UEFIFind/CMakeLists.txt +index c7f0a8f..19f06f7 100644 +--- a/UEFIFind/CMakeLists.txt ++++ b/UEFIFind/CMakeLists.txt +@@ -53,25 +53,12 @@ SET(PROJECT_SOURCES + ../common/digest/sha256.c + ../common/digest/sha512.c + ../common/digest/sm3.c +- ../common/zlib/adler32.c +- ../common/zlib/compress.c +- ../common/zlib/crc32.c +- ../common/zlib/deflate.c +- ../common/zlib/gzclose.c +- ../common/zlib/gzlib.c +- ../common/zlib/gzread.c +- ../common/zlib/gzwrite.c +- ../common/zlib/inflate.c +- ../common/zlib/infback.c +- ../common/zlib/inftrees.c +- ../common/zlib/inffast.c +- ../common/zlib/trees.c +- ../common/zlib/uncompr.c +- ../common/zlib/zutil.c + ) + + ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES} uefifind.manifest) + ++TARGET_LINK_LIBRARIES(UEFIFind PRIVATE z) ++ + IF(UNIX) + SET_TARGET_PROPERTIES(UEFIFind PROPERTIES OUTPUT_NAME uefifind) + ENDIF() +diff --git a/UEFITool/CMakeLists.txt b/UEFITool/CMakeLists.txt +index 363f5c1..7d21cb5 100644 +--- a/UEFITool/CMakeLists.txt ++++ b/UEFITool/CMakeLists.txt +@@ -85,21 +85,6 @@ SET(PROJECT_SOURCES + ../common/generated/intel_keym_v2.cpp + ../common/generated/intel_acm.cpp + ../common/kaitai/kaitaistream.cpp +- ../common/zlib/adler32.c +- ../common/zlib/compress.c +- ../common/zlib/crc32.c +- ../common/zlib/deflate.c +- ../common/zlib/gzclose.c +- ../common/zlib/gzlib.c +- ../common/zlib/gzread.c +- ../common/zlib/gzwrite.c +- ../common/zlib/inflate.c +- ../common/zlib/infback.c +- ../common/zlib/inftrees.c +- ../common/zlib/inffast.c +- ../common/zlib/trees.c +- ../common/zlib/uncompr.c +- ../common/zlib/zutil.c + ) + + QT_ADD_RESOURCES(PROJECT_SOURCES +@@ -119,7 +104,7 @@ ADD_EXECUTABLE(UEFITool ${PROJECT_HEADERS} ${PROJECT_FORMS} ${PROJECT_SOURCES}) + + TARGET_INCLUDE_DIRECTORIES(UEFITool PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") + +-TARGET_LINK_LIBRARIES(UEFITool PRIVATE Qt6::Widgets) ++TARGET_LINK_LIBRARIES(UEFITool PRIVATE Qt6::Widgets z) + + ADD_SUBDIRECTORY(QHexView) + TARGET_LINK_LIBRARIES(UEFITool PRIVATE QHexView) diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template index 4af132756b6aaf..dd5b0a6894cdb4 100644 --- a/srcpkgs/UEFITool/template +++ b/srcpkgs/UEFITool/template @@ -1,6 +1,6 @@ # Template file for 'UEFITool' pkgname=UEFITool -version=A68 +version=A72 revision=1 build_style=cmake hostmakedepends="qt6-base qt6-tools" @@ -10,7 +10,7 @@ maintainer="0x5c " license="BSD-2-Clause" homepage="https://github.com/LongSoft/UEFITool/" distfiles="https://github.com/LongSoft/UEFITool/archive/${version}.tar.gz" -checksum=aa4bc52105ab83e5b094de9b54b31d52a30ae1c0f3f1ce7930088fc412efe900 +checksum=3cace3f617c0023ffed4b95009752a50c55fe22cbba62d760b85f800ce74697f post_install() { vlicense LICENSE.md