[boinc] update to 8.2.8 (#48604)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
2026-01-18 01:11:23 +01:00 · 2025-12-02 00:16:34 +01:00
parent 8b174ea370
commit 6f7d6bce66
7 changed files with 55 additions and 55 deletions
--- a/ports/boinc/CMakeLists.txt
+++ b/ports/boinc/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 project(boinc)

 find_package(OpenSSL REQUIRED)
+find_package(libzip REQUIRED)

 set(LIBBOINC_HEADERS_WIN
    lib/boinc_win.h
@@ -140,6 +141,14 @@ set(LIBBOINCAPI_SOURCES_GENERIC
    api/boinc_api.cpp
 )

+set(LIBBOINCZIP_HEADERS
+    zip/boinc_zip.h
+)
+
+set(LIBBOINCZIP_SOURCES
+    zip/boinc_zip.cpp
+)
+
 if(APPLE)
    set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_APPLE})
    set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_APPLE})
@@ -159,6 +168,7 @@ endif()

 add_library(boinc ${LIBBOINC_SOURCES})
 add_library(boincapi ${LIBBOINCAPI_SOURCES})
+add_library(boinc_zip ${LIBBOINCZIP_SOURCES})

 if(WIN32 OR APPLE)
    set_target_properties(boinc PROPERTIES PREFIX "lib")
@@ -166,6 +176,9 @@ if(WIN32 OR APPLE)

    set_target_properties(boincapi PROPERTIES PREFIX "lib")
    set_target_properties(boincapi PROPERTIES IMPORT_PREFIX "lib")
+
+    set_target_properties(boinc_zip PROPERTIES PREFIX "lib")
+    set_target_properties(boinc_zip PROPERTIES IMPORT_PREFIX "lib")
 endif()

 # currently this is for MinGW only
@@ -199,6 +212,13 @@ elseif(WIN32)
                                ${build_options}
    )

+    target_compile_definitions(boinc_zip PUBLIC
+                                -D_CRT_SECURE_NO_WARNINGS
+                                -DWIN32
+                                -D_CONSOLE
+                                ${build_options}
+    )
+
    target_include_directories(boinc PUBLIC
                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/win_build>
    )
@@ -206,6 +226,10 @@ elseif(WIN32)
    target_include_directories(boincapi PUBLIC
                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/win_build>
    )
+
+    target_include_directories(boinc_zip PUBLIC
+                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/win_build>
+    )
 elseif(UNIX)
    target_include_directories(boinc PUBLIC
                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/config-h-${CMAKE_BUILD_TYPE}>
@@ -214,6 +238,10 @@ elseif(UNIX)
    target_include_directories(boincapi PUBLIC
                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/config-h-${CMAKE_BUILD_TYPE}>
    )
+
+    target_include_directories(boinc_zip PUBLIC
+                                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/config-h-${CMAKE_BUILD_TYPE}>
+    )
 endif()

 target_include_directories(boinc PUBLIC
@@ -228,6 +256,12 @@ target_include_directories(boincapi PUBLIC
                            $<INSTALL_INTERFACE:include>
 )

+target_include_directories(boinc_zip PUBLIC
+                            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+                            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>
+                            $<INSTALL_INTERFACE:include>
+)
+
 target_link_libraries(boinc PRIVATE
                        OpenSSL::SSL
                        OpenSSL::Crypto
@@ -237,11 +271,15 @@ target_link_libraries(boincapi PRIVATE
                        boinc
 )

-install(TARGETS boinc boincapi EXPORT boinc-config
+target_link_libraries(boinc_zip PRIVATE
+                        libzip::zip
+)
+
+install(TARGETS boinc boincapi boinc_zip EXPORT boinc-config
            RUNTIME DESTINATION bin
            ARCHIVE DESTINATION lib
            LIBRARY DESTINATION lib
        )

-install(FILES ${LIBBOINC_HEADERS} ${LIBBOINCAPI_HEADERS} DESTINATION include/boinc)
+install(FILES ${LIBBOINC_HEADERS} ${LIBBOINCAPI_HEADERS} ${LIBBOINCZIP_HEADERS} DESTINATION include/boinc)
 install(EXPORT boinc-config NAMESPACE unofficial::boinc:: DESTINATION share/boinc)
--- a/ports/boinc/fix-android-build.patch
+++ b/ports/boinc/fix-android-build.patch
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index fd30579c4b3..61382a61365 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -734,10 +734,10 @@ sse3_flags="-msse3"
- avx_flags="-mavx"
- CXXFLAGS="${save_cxxflags} ${sse3_flags}"
- CPPFLAGS="${save_cppflags} ${sse3_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [sse_flags=""])
- CXXFLAGS="${save_cxxflags} ${avx_flags}"
- CPPFLAGS="${save_cppflags} ${avx_flags}"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],)], [], [avx_flags=""])
- CXXFLAGS="${save_cxxflags} ${sse3_flags}"
- CXXFLAGS="${save_cxxflags} ${sse3_flags}"
- AC_CHECK_HEADERS([intrin.h x86intrin.h pmmintrin.h xmmintrin.h emmintrin.h])
-diff --git a/lib/diagnostics.cpp b/lib/diagnostics.cpp
-index d92d0b6cf36..911b627b189 100644
--- a/lib/diagnostics.cpp
-+++ b/lib/diagnostics.cpp
-@@ -42,6 +42,10 @@
- #include "mac_backtrace.h"
- #endif
- 
-+#if defined(ANDROID) && __ANDROID_API__ < 33
-+#undef HAVE_EXECINFO_H
-+#endif
-+
- #ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
--- a/ports/boinc/fix-mingw-build.patch
+++ b/ports/boinc/fix-mingw-build.patch
@@ -1,13 +0,0 @@
-diff --git a/lib/hostinfo.cpp b/lib/hostinfo.cpp
-index c1fde8a348..7302f1b526 100644
--- a/lib/hostinfo.cpp
-+++ b/lib/hostinfo.cpp
-@@ -448,7 +448,7 @@ bool HOST_INFO::get_docker_compose_version_string(
- bool HOST_INFO::have_docker() {
- #ifdef _WIN32
-     for (WSL_DISTRO &wd: wsl_distros.distros) {
-        if (!empty(wd.docker_version)) return true;
-+        if (!wd.docker_version.empty()) return true;
-     }
-     return false;
- #else
--- a/ports/boinc/portfile.cmake
+++ b/ports/boinc/portfile.cmake
@@ -4,11 +4,8 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO BOINC/boinc
    REF "client_release/${MAJOR_MINOR}/${VERSION}"
-    SHA512 1cb7a4d5a411fe703137f5c8127e03ce70e01a9d1c9d23e19b9d4231c833fabad779cf52dc7b85500ff54121c4b5e900ea1634c312ee1d72cfdf4c2051703c38
+    SHA512 5d38adcaefc99bd79d54e7e47bcc38099844157802852b9de9eb910ce80e2f6d6b333b3ece3f6c619e3c66d9dda9a9c5a8290ce583f77e1727bd7064e81b11af
    HEAD_REF master
-    PATCHES
-        fix-android-build.patch
-        fix-mingw-build.patch
 )

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -41,6 +38,7 @@ endif()
 vcpkg_cmake_configure(
    SOURCE_PATH ${SOURCE_PATH}
    OPTIONS
+        -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}
        ${build_options}
 )

@@ -51,6 +49,7 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" BOINC_CONFIG)
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" "
 include(CMakeFindDependencyMacro)
 find_dependency(OpenSSL)
+find_dependency(libzip)
 ${BOINC_CONFIG}
 ")

--- a/ports/boinc/vcpkg.json
+++ b/ports/boinc/vcpkg.json
@@ -1,12 +1,15 @@
 {
  "name": "boinc",
-  "version": "8.2.5",
-  "port-version": 1,
+  "version": "8.2.8",
  "description": "Open-source software for volunteer computing and grid computing.",
  "homepage": "https://boinc.berkeley.edu/",
  "license": "LGPL-3.0-or-later",
  "supports": "!(windows & arm) & !uwp & !xbox",
  "dependencies": [
+    {
+      "name": "libzip",
+      "default-features": false
+    },
    "openssl",
    {
      "name": "vcpkg-cmake",
--- a/versions/b-/boinc.json
+++ b/versions/b-/boinc.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "065b54511dc3f3f051d47efc8d1198e506ea8f3f",
+      "version": "8.2.8",
+      "port-version": 0
+    },
    {
      "git-tree": "96b3027bbe3410692a2ff6b6236decaabd807492",
      "version": "8.2.5",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -785,8 +785,8 @@
      "port-version": 0
    },
    "boinc": {
-      "baseline": "8.2.5",
-      "port-version": 1
+      "baseline": "8.2.8",
+      "port-version": 0
    },
    "boolinq": {
      "baseline": "3.0.4",