From a4f9c675e293564d4740ee87fa344c62ca09fd5d Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 29 Jun 2025 01:44:12 +0000 Subject: [PATCH 1/3] Update zeus_expected to v1.3.0 --- packages/z/zeus_expected/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/z/zeus_expected/xmake.lua b/packages/z/zeus_expected/xmake.lua index af26c45d93f..5f5c02eba00 100644 --- a/packages/z/zeus_expected/xmake.lua +++ b/packages/z/zeus_expected/xmake.lua @@ -7,6 +7,7 @@ package("zeus_expected") add_urls("https://github.com/zeus-cpp/expected/archive/refs/tags/$(version).tar.gz", "https://github.com/zeus-cpp/expected.git") + add_versions("v1.3.0", "d45bd4a38bde787577d16983ba8efee25e8d445af711510619f7b49ef60f1e72") add_versions("v1.2.0", "460da641f212c793f46a5a8f29107c9b9540a17a91f197e2dc396dac0269a2b5") add_versions("v1.1.1", "47b411677ffb2fa0d43b308797542509ae2bdb101426cf0d4777e3c162b1d726") add_versions("v1.1.0", "a963eba43f227498da2cbb924265344209696320c75ee63a92073936bb49f7e5") From 5e55d3f144464fc67d395cd9b1c372f2b66e73b2 Mon Sep 17 00:00:00 2001 From: Willaaaaaaa Date: Sun, 13 Jul 2025 12:20:20 +0800 Subject: [PATCH 2/3] fix: member access --- .../fix_member_access_in_unexpected.patch | 23 +++++++++++++++++++ packages/z/zeus_expected/xmake.lua | 1 + 2 files changed, 24 insertions(+) create mode 100644 packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch diff --git a/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch b/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch new file mode 100644 index 00000000000..729427e2d96 --- /dev/null +++ b/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch @@ -0,0 +1,23 @@ +diff --git a/include/zeus/expected.hpp b/include/zeus/expected.hpp +index 6d06dfe..ebede59 100644 +--- a/include/zeus/expected.hpp ++++ b/include/zeus/expected.hpp +@@ -197,14 +197,14 @@ public: + friend constexpr void swap(unexpected &x, unexpected &y) noexcept(noexcept(x.swap(y))) { x.swap(y); } + + template +- friend constexpr bool operator==(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.m_val == rhs.error())) ++ friend constexpr bool operator==(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.error() == rhs.error())) + { +- return lhs.m_val == rhs.error(); ++ return lhs.error() == rhs.error(); + } + template +- friend constexpr bool operator!=(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.m_val != rhs.error())) ++ friend constexpr bool operator!=(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.error() != rhs.error())) + { +- return lhs.m_val != rhs.error(); ++ return lhs.error() != rhs.error(); + } + + private: diff --git a/packages/z/zeus_expected/xmake.lua b/packages/z/zeus_expected/xmake.lua index 5f5c02eba00..b0a3f12b42f 100644 --- a/packages/z/zeus_expected/xmake.lua +++ b/packages/z/zeus_expected/xmake.lua @@ -15,6 +15,7 @@ package("zeus_expected") add_versions("v1.0.0", "a0d81798b777f9bfcc1e1e4f3046632067bd8c6071dbfcbec5012a31a5aebc68") add_patches("v1.0.0", path.join(os.scriptdir(), "patches", "v1.0.0", "fix_typename.patch"), "710d71f8c765a2937df25a2c52abec24f5f4ef5f43281f6aa01853d0498e2a47") + add_patches("v1.3.0", "patches/v1.3.0/fix_member_access_in_unexpected.patch", "6a79a62cc5c535203c6efca68eb2b4a0caf54a53bd95eadd29415d23da68f88c") on_install(function (package) os.cp("include", package:installdir()) From 1a3243fc0f177f7fdbe7f2401b5b24165d482e88 Mon Sep 17 00:00:00 2001 From: Willaaaaaaa Date: Tue, 15 Jul 2025 22:35:51 +0800 Subject: [PATCH 3/3] update: ignore v1.3.0 --- .../fix_member_access_in_unexpected.patch | 23 ------------------- packages/z/zeus_expected/xmake.lua | 3 +-- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch diff --git a/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch b/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch deleted file mode 100644 index 729427e2d96..00000000000 --- a/packages/z/zeus_expected/patches/v1.3.0/fix_member_access_in_unexpected.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/include/zeus/expected.hpp b/include/zeus/expected.hpp -index 6d06dfe..ebede59 100644 ---- a/include/zeus/expected.hpp -+++ b/include/zeus/expected.hpp -@@ -197,14 +197,14 @@ public: - friend constexpr void swap(unexpected &x, unexpected &y) noexcept(noexcept(x.swap(y))) { x.swap(y); } - - template -- friend constexpr bool operator==(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.m_val == rhs.error())) -+ friend constexpr bool operator==(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.error() == rhs.error())) - { -- return lhs.m_val == rhs.error(); -+ return lhs.error() == rhs.error(); - } - template -- friend constexpr bool operator!=(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.m_val != rhs.error())) -+ friend constexpr bool operator!=(const unexpected &lhs, const unexpected &rhs) noexcept(noexcept(lhs.error() != rhs.error())) - { -- return lhs.m_val != rhs.error(); -+ return lhs.error() != rhs.error(); - } - - private: diff --git a/packages/z/zeus_expected/xmake.lua b/packages/z/zeus_expected/xmake.lua index b0a3f12b42f..91891bc3266 100644 --- a/packages/z/zeus_expected/xmake.lua +++ b/packages/z/zeus_expected/xmake.lua @@ -7,7 +7,7 @@ package("zeus_expected") add_urls("https://github.com/zeus-cpp/expected/archive/refs/tags/$(version).tar.gz", "https://github.com/zeus-cpp/expected.git") - add_versions("v1.3.0", "d45bd4a38bde787577d16983ba8efee25e8d445af711510619f7b49ef60f1e72") + add_versions("v1.3.1", "c70f6d15198f7a033715393c5f33a07851b399784dbc1eb3f27a2e5c4b7af23a") add_versions("v1.2.0", "460da641f212c793f46a5a8f29107c9b9540a17a91f197e2dc396dac0269a2b5") add_versions("v1.1.1", "47b411677ffb2fa0d43b308797542509ae2bdb101426cf0d4777e3c162b1d726") add_versions("v1.1.0", "a963eba43f227498da2cbb924265344209696320c75ee63a92073936bb49f7e5") @@ -15,7 +15,6 @@ package("zeus_expected") add_versions("v1.0.0", "a0d81798b777f9bfcc1e1e4f3046632067bd8c6071dbfcbec5012a31a5aebc68") add_patches("v1.0.0", path.join(os.scriptdir(), "patches", "v1.0.0", "fix_typename.patch"), "710d71f8c765a2937df25a2c52abec24f5f4ef5f43281f6aa01853d0498e2a47") - add_patches("v1.3.0", "patches/v1.3.0/fix_member_access_in_unexpected.patch", "6a79a62cc5c535203c6efca68eb2b4a0caf54a53bd95eadd29415d23da68f88c") on_install(function (package) os.cp("include", package:installdir())