Merge branch 'xmake-io:dev' into dev

xmake-io · Jul 17, 2024 · 96b3f9b · 96b3f9b
2 parents 8cb9dc8 + a3999a5
commit 96b3f9b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua
@@ -6,6 +6,7 @@ package("aws-crt-cpp")
     add_urls("https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/$(version).tar.gz",
              "https://github.com/awslabs/aws-crt-cpp.git")
 
+    add_versions("v0.27.4", "0554776a4cbbea016075f4a28698ff22818c5b948296171e1f76d0a787576f83")
     add_versions("v0.27.2", "e17c82d7cc3b5e6e4300bc7e4794306e292b5281d212ead536000a8b5f5f1be4")
     add_versions("v0.27.0", "e7601c8c5e6391013b6ad164d2dd7b970bf5dbb3693b9cc80c424bd6f42b79c8")
     add_versions("v0.26.11", "23acb2b14019182dd73fe6779ec266ee4d8937f19a99803da6407937fa22db7d")

diff --git a/packages/l/libzip/patches/1.10.1/mingw.patch b/packages/l/libzip/patches/1.10.1/mingw.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/zip_source_file_win32.h b/lib/zip_source_file_win32.h
+index d86069ec..86ef2651 100644
+--- a/lib/zip_source_file_win32.h
++++ b/lib/zip_source_file_win32.h
+@@ -76,6 +76,9 @@ int _zip_win32_error_to_errno(DWORD win32err);
+ #ifdef __clang__
+ #define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wincompatible-function-pointer-types\"")
+ #define DONT_WARN_INCOMPATIBLE_FN_PTR_END _Pragma("GCC diagnostic pop")
++#elif defined(__GNUC__) && __GNUC__ > 13
++#define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types\"")
++#define DONT_WARN_INCOMPATIBLE_FN_PTR_END _Pragma("GCC diagnostic pop")
+ #else
+ #define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN
+ #define DONT_WARN_INCOMPATIBLE_FN_PTR_END
diff --git a/packages/l/libzip/xmake.lua b/packages/l/libzip/xmake.lua
@@ -13,6 +13,8 @@ package("libzip")
     add_versions("v1.8.0", "30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e")
     add_versions("v1.9.2", "fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f")
 
+    add_patches("<=1.10.1", "patches/1.10.1/mingw.patch", "17513dbef5feca0630ad16a2eacb507fd2ee3d3a47a7c9a660eba24b35ea3fa8")
+
     add_deps("cmake", "zlib")
 
     local configdeps = {-- gnutls = "gnutls",
@@ -29,15 +31,15 @@ package("libzip")
         add_syslinks("advapi32")
     end
 
-    on_load("windows", "macosx", "linux", function (package)
+    on_load(function (package)
         for config, dep in pairs(configdeps) do
             if package:config(config) then
                 package:add("deps", dep)
             end
         end
     end)
 
-    on_install("windows", "macosx", "linux", function (package)
+    on_install("windows", "macosx", "linux", "mingw", function (package)
         io.replace("CMakeLists.txt", "Dist(", "#Dist(", {plain = true})
         local configs = {"-DBUILD_DOC=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_REGRESS=OFF", "-DBUILD_TOOLS=ON"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))

diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua
@@ -6,6 +6,7 @@ package("thorvg")
     add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz",
              "https://github.com/thorvg/thorvg.git")
 
+    add_versions("v0.14.2", "04202e8f5e17b427c3b16ae3b3d4be5d3f3cdac96d5c64ed3efd7b6db3ad731f")
     add_versions("v0.14.1", "9c0346fda8b62a3b13a764dda5784e0465c8cab54fb5342d0240c7fb40e415bd")
     add_versions("v0.13.8", "ce49929a94d1686d4f1436da6ef5fa7a8439901c22b5fa0879d7d5879b8ba2bd")
     add_versions("v0.13.6", "f24fd3647e1a309dec00f6455b32258c0dd0e0dbd1133233169467571f188bad")