Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
044c035
Patch Tuesday for September 2025 + macOS 15.6.1
BillyONeal Sep 11, 2025
7f66120
Passing, remove from fail lists.
BillyONeal Sep 15, 2025
ddb2e31
[clockutils] Disable -Werror
BillyONeal Sep 15, 2025
6e6951d
[cpprealm] Add missing header and disable -Werror.
BillyONeal Sep 16, 2025
24edd70
[cpprealm] Also fix macos overzealous template
BillyONeal Sep 16, 2025
8183ef8
[dbow3] Add missing header.
BillyONeal Sep 16, 2025
de0efe8
[awlib] Fix build again.
BillyONeal Sep 16, 2025
926dba6
[hareflow] Add missing header
BillyONeal Sep 16, 2025
7559f2a
[libgo] Add <stdexcept>
BillyONeal Sep 16, 2025
abb516e
[licensepp] Add stdint.h and remove -Werror
BillyONeal Sep 17, 2025
acc5347
[libmysql] Add libtirpc-dev apt package.
BillyONeal Sep 17, 2025
4712f74
[clblas] Use all caps for configure_file variables.
BillyONeal Sep 17, 2025
40bff59
[llgl] Add <cstdint> using upstream patch.
BillyONeal Sep 17, 2025
54c8735
[manifold] Disable -Werror
BillyONeal Sep 17, 2025
ebd9b6a
[pistache] Add <cstdint>.
BillyONeal Sep 17, 2025
04aaa8e
[ms-ifc-sdk] Add <cstdint>.
BillyONeal Sep 17, 2025
8d42c41
[realsense2] Add <stdexcept>.
BillyONeal Sep 18, 2025
a0543c1
[qt5-location] Add stdint.h.
BillyONeal Sep 18, 2025
2b38d1c
[openvino] Disable on x64-osx.
BillyONeal Sep 18, 2025
e3999f2
[nmslib] Fix apple clang detection.
BillyONeal Sep 18, 2025
1affff7
[colmap] Apply upstream macOS fixes
BillyONeal Sep 18, 2025
73816c8
[corrade] Add missing headers.
BillyONeal Sep 18, 2025
f3d39c8
[rtmfp-cpp] Add missing <cstdint> with upstream patch.
BillyONeal Sep 18, 2025
f180114
[treehopper] Add missing <cstdint>
BillyONeal Sep 18, 2025
417a035
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 18, 2025
f8eec8d
[orange-math] Workaround no std::fmodf
BillyONeal Sep 18, 2025
5e6141f
[embree3] Fix missing member references using upstream patch.
BillyONeal Sep 18, 2025
934fb3c
[ggml] Baseline due to https://github.com/ggml-org/ggml/issues/1343
BillyONeal Sep 18, 2025
10866e0
[irrlicht] Avoid using a pointer as a 0.
BillyONeal Sep 18, 2025
f0352d1
[rioki-glow] Add <iostream> to use std::cerr.
BillyONeal Sep 18, 2025
354c9a0
[shaderwriter] Fix incorrect ::template followed by no template argum…
BillyONeal Sep 18, 2025
861f02d
[trubobase64] Fix arm64 detection on macOS.
BillyONeal Sep 18, 2025
c945364
[vanillapdf] Disable broken AutoSubscribe type.
BillyONeal Sep 18, 2025
e32df5b
[xeus] Remove broken LTO flags using upstream's commit.
BillyONeal Sep 18, 2025
78a8869
Fix baseline typo.
BillyONeal Sep 18, 2025
7a397e9
[awlib] graphics needs hudf
BillyONeal Sep 18, 2025
b36717d
Feature baseline nitpicks.
BillyONeal Sep 18, 2025
eb283fa
Copy llgl skip from ci.baseline.txt to ci.feature.baseline.txt
BillyONeal Sep 18, 2025
23accda
More feature baseline.
BillyONeal Sep 18, 2025
f7bf74c
More feature baseline
BillyONeal Sep 18, 2025
83d1536
[qt5-location] Actually add the macOS fixing patch 😅
BillyONeal Sep 19, 2025
89dec07
treehopper now passes
BillyONeal Sep 19, 2025
5d5ce74
[cpprealm] Disable -Werror harder
BillyONeal Sep 19, 2025
a0c2c3f
[ggml] Add patch suggested by upstream maintainers for llama.cpp
BillyONeal Sep 20, 2025
4c34d87
Skip libxt again.
BillyONeal Sep 22, 2025
42b79fd
[magnum] Fix missing headers.
BillyONeal Sep 22, 2025
2d8849a
[vcpkg-ci-python] Disable CMP0148 on CMake 4.x
BillyONeal Sep 22, 2025
475d845
More CI feature baseline.
BillyONeal Sep 22, 2025
06e8057
formatting sigh
BillyONeal Sep 22, 2025
84c0218
Complete [libxt]
BillyONeal Sep 23, 2025
fb07f36
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 23, 2025
f0d1218
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions ports/awlib/fix-mac-build.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
index 98469732..65e82aac 100644
index 9846973..65e82aa 100644
--- a/io/include/aw/io/mmap_file.h
+++ b/io/include/aw/io/mmap_file.h
@@ -83,18 +83,18 @@ using win32::file_mapping;
Expand Down Expand Up @@ -30,8 +30,26 @@ index 98469732..65e82aac 100644
return file_mode::read|file_mode::write;
}

diff --git a/types/include/aw/types/bits/variant_dispatch.h b/types/include/aw/types/bits/variant_dispatch.h
index 9d5dc3b..95a9394 100644
--- a/types/include/aw/types/bits/variant_dispatch.h
+++ b/types/include/aw/types/bits/variant_dispatch.h
@@ -71,11 +71,11 @@ struct vh_recursive {
if constexpr (Length_left > 0)
{
if (index < Mid)
- return vh_recursive<Start,Mid,Ts...>::template dispatch(index, storage, f);
+ return vh_recursive<Start,Mid,Ts...>::dispatch(index, storage, f);
}

if constexpr (Length_right > 1)
- return vh_recursive<Mid+1,End,Ts...>::template dispatch(index, storage, f);
+ return vh_recursive<Mid+1,End,Ts...>::dispatch(index, storage, f);

_unreachable();
}
diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
index 82f46934..b38c46a9 100644
index 82f4693..b38c46a 100644
--- a/types/include/aw/types/byte_buffer.h
+++ b/types/include/aw/types/byte_buffer.h
@@ -8,6 +8,7 @@
Expand All @@ -42,3 +60,16 @@ index 82f46934..b38c46a9 100644
#include <memory>
namespace aw {
/**
diff --git a/types/include/aw/types/containers/queue.h b/types/include/aw/types/containers/queue.h
index af8f13b..8398e8c 100644
--- a/types/include/aw/types/containers/queue.h
+++ b/types/include/aw/types/containers/queue.h
@@ -96,7 +96,7 @@ protected:
queue_base(queue_base&& other, Allocator const& alloc) noexcept
: impl(alloc)
{
- if (alloc == other.alloc)
+ if (alloc == static_cast<Allocator&>(other.impl))
impl.swap(other.impl);
else
create_storage(other.allocated_size());
9 changes: 8 additions & 1 deletion ports/awlib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "awlib",
"version-date": "2024-04-06",
"port-version": 1,
"port-version": 2,
"description": "Cross-platform utility library",
"homepage": "https://github.com/absurdworlds/awlib",
"license": "LGPL-3.0-or-later",
Expand All @@ -21,6 +21,13 @@
"description": "Build graphics library",
"supports": "!uwp",
"dependencies": [
{
"name": "awlib",
"default-features": false,
"features": [
"hudf"
]
},
"glfw3",
"libpng"
]
Expand Down
58 changes: 58 additions & 0 deletions ports/clblas/fix-cmake-4.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75df37a..4e31cd3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,19 +103,19 @@ else( )
endif( )

# Define a version for the code
-if( NOT DEFINED clBLAS_VERSION_MAJOR )
- set( clBLAS_VERSION_MAJOR 2 )
+if( NOT DEFINED CLBLAS_VERSION_MAJOR )
+ set( CLBLAS_VERSION_MAJOR 2 )
endif( )

-if( NOT DEFINED clBLAS_VERSION_MINOR )
- set( clBLAS_VERSION_MINOR 12 )
+if( NOT DEFINED CLBLAS_VERSION_MINOR )
+ set( CLBLAS_VERSION_MINOR 12 )
endif( )

-if( NOT DEFINED clBLAS_VERSION_PATCH )
- set( clBLAS_VERSION_PATCH 0 )
+if( NOT DEFINED CLBLAS_VERSION_PATCH )
+ set( CLBLAS_VERSION_PATCH 0 )
endif( )

-set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}")
+set( clBLAS_VERSION "${CLBLAS_VERSION_MAJOR}.${CLBLAS_VERSION_MINOR}.${CLBLAS_VERSION_PATCH}")

# Increment this if we break backward compatibility.
set( clBLAS_SOVERSION 2 )
@@ -425,9 +425,9 @@ endif( )

set( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${clBLAS_VERSION}-${CMAKE_HOST_SYSTEM_NAME}-Source")

-set( CPACK_PACKAGE_VERSION_MAJOR ${clBLAS_VERSION_MAJOR} )
-set( CPACK_PACKAGE_VERSION_MINOR ${clBLAS_VERSION_MINOR} )
-set( CPACK_PACKAGE_VERSION_PATCH ${clBLAS_VERSION_PATCH} )
+set( CPACK_PACKAGE_VERSION_MAJOR ${CLBLAS_VERSION_MAJOR} )
+set( CPACK_PACKAGE_VERSION_MINOR ${CLBLAS_VERSION_MINOR} )
+set( CPACK_PACKAGE_VERSION_PATCH ${CLBLAS_VERSION_PATCH} )
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL implementation of a BLAS library")
set( CPACK_PACKAGE_VENDOR "Neutral")
set( CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/;/\\\\.svn/;/\\\\.git/" )
diff --git a/src/clBLAS.version.h.in b/src/clBLAS.version.h.in
index a05cbce..ab22a87 100644
--- a/src/clBLAS.version.h.in
+++ b/src/clBLAS.version.h.in
@@ -17,6 +17,6 @@

/* the configured version and settings for clblas
*/
-#define clblasVersionMajor @clBLAS_VERSION_MAJOR@
-#define clblasVersionMinor @clBLAS_VERSION_MINOR@
-#define clblasVersionPatch @clBLAS_VERSION_PATCH@
+#define clblasVersionMajor @CLBLAS_VERSION_MAJOR@
+#define clblasVersionMinor @CLBLAS_VERSION_MINOR@
+#define clblasVersionPatch @CLBLAS_VERSION_PATCH@
1 change: 1 addition & 0 deletions ports/clblas/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
cmake.patch
Fix-BuildDLL.patch
abs-arm.patch
fix-cmake-4.diff # https://github.com/clMathLibraries/clBLAS/pull/364
)

# v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
Expand Down
2 changes: 1 addition & 1 deletion ports/clblas/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "clblas",
"version": "2.12",
"port-version": 7,
"port-version": 8,
"description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.",
"license": "Apache-2.0",
"supports": "!(windows & arm)",
Expand Down
22 changes: 22 additions & 0 deletions ports/clockutils/disable-werror.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c77383..0c8029b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,13 +64,13 @@ set (CLANG_FLAGS "-Wstring-plus-int")
IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g")
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG")
- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror")
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g -Werror")
+ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG")
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g")
ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} -g")
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} -0s -DNDEBUG")
- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG -Werror")
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g -Werror")
+ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG")
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g")
ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
set (CXX_FLAGS "/MP /W4 /wd4127 /D_WINSOCK_DEPRECATED_NO_WARNINGS /DNOMINMAX")
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_FLAGS}")
1 change: 1 addition & 0 deletions ports/clockutils/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
fix-warningC4643.patch
add-missing-thread-header.patch
cmake4.patch
disable-werror.diff
)

set(SHARED_FLAG OFF)
Expand Down
2 changes: 1 addition & 1 deletion ports/clockutils/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "clockutils",
"version": "1.1.1",
"port-version": 3,
"port-version": 4,
"description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.",
"homepage": "https://github.com/ClockworkOrigins/clockUtils",
"license": "MIT",
Expand Down
35 changes: 35 additions & 0 deletions ports/colmap/fix-variable-names.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/src/thirdparty/PoissonRecon/Ply.h b/src/thirdparty/PoissonRecon/Ply.h
index 699381f..6cb07d6 100644
--- a/src/thirdparty/PoissonRecon/Ply.h
+++ b/src/thirdparty/PoissonRecon/Ply.h
@@ -340,7 +340,7 @@ public:
PlyOrientedVertex( void ) { ; }
PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; }
PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); }
- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); }
+ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); }
template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); }
template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); }
PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; }
@@ -386,7 +386,7 @@ public:
}

_PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); }
- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); }
+ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); }
template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); }
template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); }
_PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; }
diff --git a/src/thirdparty/PoissonRecon/SparseMatrix.inl b/src/thirdparty/PoissonRecon/SparseMatrix.inl
index c181d82..0a5e59e 100755
--- a/src/thirdparty/PoissonRecon/SparseMatrix.inl
+++ b/src/thirdparty/PoissonRecon/SparseMatrix.inl
@@ -195,7 +195,7 @@ void SparseMatrix< T >::SetRowSize( int row , int count )
template<class T>
void SparseMatrix<T>::SetZero()
{
- Resize(this->m_N, this->m_M);
+ Resize(this->rows, this->_maxEntriesPerRow);
}

template<class T>
1 change: 1 addition & 0 deletions ports/colmap/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
PATCHES
no-glu.diff
fix-flann.patch
fix-variable-names.diff # from https://github.com/colmap/colmap/commit/203bf36c2d5e805f0eb26d8b7a2b8572e7b134e1
)

if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
Expand Down
2 changes: 1 addition & 1 deletion ports/colmap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "colmap",
"version": "3.11.1",
"port-version": 3,
"port-version": 4,
"description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
"homepage": "https://colmap.github.io/",
"license": "BSD-3-Clause",
Expand Down
69 changes: 69 additions & 0 deletions ports/corrade/missing-headers.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
diff --git a/src/Corrade/PluginManager/AbstractManager.h b/src/Corrade/PluginManager/AbstractManager.h
index c8ef531..3d2e3dd 100644
--- a/src/Corrade/PluginManager/AbstractManager.h
+++ b/src/Corrade/PluginManager/AbstractManager.h
@@ -29,6 +29,10 @@
* @brief Class @ref Corrade::PluginManager::AbstractManager, macro @ref CORRADE_PLUGIN_VERSION, @ref CORRADE_PLUGIN_REGISTER()
*/

+#include <string>
+#include <vector>
+#include <utility>
+
#include "Corrade/Containers/EnumSet.h"
#include "Corrade/Containers/Pointer.h"
#include "Corrade/PluginManager/PluginManager.h"
diff --git a/src/Corrade/PluginManager/AbstractPlugin.h b/src/Corrade/PluginManager/AbstractPlugin.h
index b22deee..4f5738f 100644
--- a/src/Corrade/PluginManager/AbstractPlugin.h
+++ b/src/Corrade/PluginManager/AbstractPlugin.h
@@ -29,6 +29,10 @@
* @brief Class @ref Corrade::PluginManager::AbstractPlugin
*/

+#include <string>
+#include <vector>
+#include <utility>
+
#include "Corrade/Containers/Pointer.h"
#include "Corrade/PluginManager/PluginManager.h"
#include "Corrade/PluginManager/visibility.h"
diff --git a/src/Corrade/Utility/Arguments.h b/src/Corrade/Utility/Arguments.h
index 84d856d..ea801be 100644
--- a/src/Corrade/Utility/Arguments.h
+++ b/src/Corrade/Utility/Arguments.h
@@ -31,6 +31,7 @@

#include <string>
#include <utility>
+#include <vector>

#include "Corrade/Containers/Array.h"
#include "Corrade/Utility/ConfigurationValue.h"
diff --git a/src/Corrade/Utility/Directory.h b/src/Corrade/Utility/Directory.h
index 21c1e1a..8d9bde6 100644
--- a/src/Corrade/Utility/Directory.h
+++ b/src/Corrade/Utility/Directory.h
@@ -30,6 +30,9 @@
*/

#include <initializer_list>
+#include <string>
+#include <utility>
+#include <vector>

#include "Corrade/Containers/Containers.h"
#include "Corrade/Containers/EnumSet.h"
diff --git a/src/Corrade/Utility/Resource.h b/src/Corrade/Utility/Resource.h
index e08c03d..6ce48b0 100644
--- a/src/Corrade/Utility/Resource.h
+++ b/src/Corrade/Utility/Resource.h
@@ -30,6 +30,8 @@
*/

#include <utility>
+#include <string>
+#include <vector>

#include "Corrade/Containers/ArrayView.h"
#include "Corrade/Utility/StlForwardString.h"
1 change: 1 addition & 0 deletions ports/corrade/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
fix-vs2019.patch
build-corrade-rc-always.patch
clang-16.patch
missing-headers.diff
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
Expand Down
2 changes: 1 addition & 1 deletion ports/corrade/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "corrade",
"version-string": "2020.06",
"port-version": 8,
"port-version": 9,
"description": "C++11/C++14 multiplatform utility library.",
"homepage": "https://magnum.graphics/corrade/",
"dependencies": [
Expand Down
13 changes: 13 additions & 0 deletions ports/cpprealm/disable-werror.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8b0675..e7dd3f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ target_link_libraries(cpprealm PUBLIC Realm::ObjectStore)
set(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT_PATH})

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Werror)
+ target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Wno-changes-meaning)
endif()

if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
12 changes: 12 additions & 0 deletions ports/cpprealm/missing-cstdint.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/include/cpprealm/internal/bridge/realm.hpp b/include/cpprealm/internal/bridge/realm.hpp
index 38703d1..827c71d 100644
--- a/include/cpprealm/internal/bridge/realm.hpp
+++ b/include/cpprealm/internal/bridge/realm.hpp
@@ -27,6 +27,7 @@
#include <optional>
#include <string>
#include <vector>
+#include <cstdint>

namespace realm {
class Realm;
4 changes: 4 additions & 0 deletions ports/cpprealm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 "cf975741b5a4a68a40845c53d8584d871acff03c7a212e71a67799801979e0514de2a449aa5d78137f2d7f42e113c5df7c97e9f8c5fb6371e95c46f29ab2b246"
HEAD_REF "main"
PATCHES
missing-cstdint.diff # https://github.com/realm/realm-cpp/pull/247
disable-werror.diff
remove-overzealous-template.diff # https://github.com/realm/realm-cpp/pull/248
)

if(NOT VCPKG_BUILD_TYPE)
Expand Down
22 changes: 22 additions & 0 deletions ports/cpprealm/remove-overzealous-template.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/include/cpprealm/schema.hpp b/include/cpprealm/schema.hpp
index 7494d60..7479c3c 100644
--- a/include/cpprealm/schema.hpp
+++ b/include/cpprealm/schema.hpp
@@ -253,7 +253,7 @@ namespace realm {

if constexpr (N + 1 == sizeof...(Properties)) {
if (property_name == std::string_view(names[N])) {
- auto ptr = managed<Class, void>::template unmanaged_to_managed_pointer(property.ptr);
+ auto ptr = managed<Class, void>::unmanaged_to_managed_pointer(property.ptr);
if constexpr (std::is_pointer_v<typename P::Result>) {
return (cls.*ptr);
} else {
@@ -263,7 +263,7 @@ namespace realm {
return variant_t{};
} else {
if (property_name == std::string_view(names[N])) {
- auto ptr = managed<Class, void>::template unmanaged_to_managed_pointer(property.ptr);
+ auto ptr = managed<Class, void>::unmanaged_to_managed_pointer(property.ptr);
if constexpr (std::is_pointer_v<typename P::Result>) {
return (cls.*ptr);
} else {
1 change: 1 addition & 0 deletions ports/cpprealm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "cpprealm",
"version": "2.2.0",
"port-version": 1,
"description": "Realm is a mobile database that runs directly inside phones, tablets or wearables.",
"homepage": "https://github.com/realm/realm-cpp",
"license": "Apache-2.0",
Expand Down
Loading
Loading