Update boinc to 7.22.2 (#31543)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2023-05-22 20:46:27 +02:00 committed by GitHub
parent e983fc2630
commit af5d4e9e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 57 deletions

View File

@ -1,49 +0,0 @@
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index c258a0f8d1..76530fb432 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -63,6 +63,7 @@
#include "error_numbers.h"
#include "filesys.h"
+#include "str_replace.h"
#include "str_util.h"
#include "util.h"
diff --git a/lib/str_util.h b/lib/str_util.h
index 0e2d5f179a..22908d8568 100644
--- a/lib/str_util.h
+++ b/lib/str_util.h
@@ -22,8 +22,6 @@
#include <vector>
#include <string.h>
-#include "str_replace.h"
-
#define safe_strcpy(x, y) strlcpy(x, y, sizeof(x))
#define safe_strcat(x, y) strlcat(x, y, sizeof(x))
diff --git a/lib/util.cpp b/lib/util.cpp
index cfa495a6f9..2af4b0fb94 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -17,6 +17,7 @@
#if defined(_WIN32)
#include "boinc_win.h"
+#include "str_replace.h"
#include "str_util.h"
#include "win_util.h"
#endif
diff --git a/lib/win_util.cpp b/lib/win_util.cpp
index 86289e0ce7..82b17f4425 100644
--- a/lib/win_util.cpp
+++ b/lib/win_util.cpp
@@ -23,6 +23,7 @@
#include "util.h"
#include "filesys.h"
#include "win_util.h"
+#include "str_replace.h"
#include "str_util.h"
/**

View File

@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO BOINC/boinc
REF client_release/7.22/7.22.1
SHA512 8b3efc68fe8df8f95a674d9deddbe355da2070a960b1768ee7f9c2afdd8a373e97297715dec5d7daf131d4b5c478afbc4476e152ec516080620f66e1a1f785af
REF client_release/7.22/7.22.2
SHA512 ac1f63ecea4d24a86459d5f58aac45f04dfaee3e358fcb5a0ae201e9289e11debada30bf0f3ab1bba462068788a2eca2f4d6b3c45d3603c7b6ca6ad51effc85b
HEAD_REF master
PATCHES
fix-build.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

View File

@ -1,7 +1,6 @@
{
"name": "boinc",
"version": "7.22.1",
"port-version": 1,
"version": "7.22.2",
"description": "Open-source software for volunteer computing and grid computing.",
"homepage": "https://boinc.berkeley.edu/",
"license": "LGPL-3.0-or-later",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b0f6f1b59e54a64b321aba20d196531d6e181d2c",
"version": "7.22.2",
"port-version": 0
},
{
"git-tree": "0d3f7220d72e02720ad44a15cfc46ebc1a6c26b4",
"version": "7.22.1",

View File

@ -609,8 +609,8 @@
"port-version": 0
},
"boinc": {
"baseline": "7.22.1",
"port-version": 1
"baseline": "7.22.2",
"port-version": 0
},
"bond": {
"baseline": "10.0.0",