Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (5eb46488e68e95d685d4983f8d85715973aa5baf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (5eb46488e68e95d685d4983f8d85715973aa5baf)
  • Date: Tue, 30 Jan 2024 02:53:51 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/cmake/DETAILS | 4 +-
devel/cmake/HISTORY | 5 +++
devel/cmake/PRE_BUILD | 1
devel/cmake/patches/0001-boost-1.84.patch | 45
------------------------------
4 files changed, 7 insertions(+), 48 deletions(-)

New commits:
commit 5eb46488e68e95d685d4983f8d85715973aa5baf
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/cmake: version 3.28.2

diff --git a/devel/cmake/DETAILS b/devel/cmake/DETAILS
index f745bde..fbe192d 100755
--- a/devel/cmake/DETAILS
+++ b/devel/cmake/DETAILS
@@ -1,6 +1,6 @@
SPELL=cmake
- VERSION=3.28.1
-
SOURCE_HASH="sha256:15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad:UPSTREAM_HASH"
+ VERSION=3.28.2
+
SOURCE_HASH="sha256:1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a:UPSTREAM_HASH"
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE_URL[0]="https://www.cmake.org/files/v${VERSION%.?}/${SOURCE}";
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index e994394..d1acb66 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,8 @@
+2024-01-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.28.2
+ * PRE_BUILD, patches/0001-boost-1.84.patch: removed the patch, not
needed
+ anymore
+
2023-12-16 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, patches/0001-boost-1.84.patch: added patch for boost
1.84,
quoting++
diff --git a/devel/cmake/PRE_BUILD b/devel/cmake/PRE_BUILD
index 1d78d2a..d7e5b3e 100755
--- a/devel/cmake/PRE_BUILD
+++ b/devel/cmake/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches &&
# prevent misdetection of qt6 during bootstrap
sed -i '/add_subdirectory(Tests)/D' CMakeLists.txt
diff --git a/devel/cmake/patches/0001-boost-1.84.patch
b/devel/cmake/patches/0001-boost-1.84.patch
deleted file mode 100644
index da39bfc..0000000
--- a/devel/cmake/patches/0001-boost-1.84.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9dc0392df0c1e6f18c1a6575d5a8029c7a4f7357 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king AT kitware.com>
-Date: Thu, 14 Dec 2023 11:33:36 -0500
-Subject: [PATCH] FindBoost: Add support for Boost 1.84
-
-Update the list of known versions.
-
-Run the command
-
- cmake -DBOOST_DIR=/path/to/boost_1_84_0 \
- -P Utilities/Scripts/BoostScanDeps.cmake
-
-to extract dependencies from the 1.84.0 source tree.
-They are the same as 1.83's dependencies, so just update
-the version check for warning about newer versions.
-
-Fixes: #25499
----
- Modules/FindBoost.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index 1f82bb52a11..248ea8b6373 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1394,7 +1394,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- set(_Boost_THREAD_DEPENDENCIES chrono atomic)
- set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono
atomic)
- set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.84.0 AND NOT
Boost_NO_WARN_NEW_VERSIONS)
-+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.85.0 AND NOT
Boost_NO_WARN_NEW_VERSIONS)
- message(WARNING "New Boost version may have incorrect or missing
dependencies and imported targets")
- endif()
- endif()
-@@ -1669,6 +1669,7 @@ else()
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of
- # _Boost_COMPONENT_DEPENDENCIES.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-+ "1.84.0" "1.84"
- "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
"1.79.0" "1.79"
- "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75"
"1.74.0" "1.74"
- "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70"
"1.69.0" "1.69"
---
-GitLab
-


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (5eb46488e68e95d685d4983f8d85715973aa5baf), Pavel Vinogradov, 01/31/2024

Archive powered by MHonArc 2.6.24.

Top of Page