diff --git a/ports/libodb/fix-linux.patch b/ports/libodb/fix-linux.patch new file mode 100644 index 0000000000..9a2f2eab91 --- /dev/null +++ b/ports/libodb/fix-linux.patch @@ -0,0 +1,94 @@ +diff --git a/odb/details/shared-ptr/base.cxx b/odb/details/shared-ptr/base.cxx +index b95797b..6cf8ed7 100644 +--- a/odb/details/shared-ptr/base.cxx ++++ b/odb/details/shared-ptr/base.cxx +@@ -54,7 +54,7 @@ namespace odb + } + + void* +-operator new (size_t n, odb::details::share s) throw (std::bad_alloc) ++operator new (size_t n, odb::details::share s) + { + if (s == odb::details::shared) + { +@@ -74,7 +74,7 @@ operator new (size_t n, odb::details::share s) throw (std::bad_alloc) + } + + void +-operator delete (void* p, odb::details::share s) throw () ++operator delete (void* p, odb::details::share s) + { + // This version of operator delete is only called when the c-tor + // fails. In this case there is no object and we can just free the +diff --git a/odb/details/shared-ptr/base.hxx b/odb/details/shared-ptr/base.hxx +index 4a38945..1c951a8 100644 +--- a/odb/details/shared-ptr/base.hxx ++++ b/odb/details/shared-ptr/base.hxx +@@ -35,10 +35,10 @@ namespace odb + } + + LIBODB_EXPORT void* +-operator new (std::size_t, odb::details::share) throw (std::bad_alloc); ++operator new (std::size_t, odb::details::share); + + LIBODB_EXPORT void +-operator delete (void*, odb::details::share) throw (); ++operator delete (void*, odb::details::share); + + namespace odb + { +@@ -62,16 +62,16 @@ namespace odb + _ref_count () const; + + void* +- operator new (std::size_t) throw (std::bad_alloc); ++ operator new (std::size_t); + + void* +- operator new (std::size_t, share) throw (std::bad_alloc); ++ operator new (std::size_t, share); + + void +- operator delete (void*, share) throw (); ++ operator delete (void*, share); + + void +- operator delete (void*) throw (); ++ operator delete (void*); + + struct refcount_callback + { +diff --git a/odb/details/shared-ptr/base.ixx b/odb/details/shared-ptr/base.ixx +index 9bf7c94..e03ea86 100644 +--- a/odb/details/shared-ptr/base.ixx ++++ b/odb/details/shared-ptr/base.ixx +@@ -64,25 +64,25 @@ namespace odb + } + + inline void* shared_base:: +- operator new (std::size_t n) throw (std::bad_alloc) ++ operator new (std::size_t n) + { + return ::operator new (n); + } + + inline void* shared_base:: +- operator new (std::size_t n, share) throw (std::bad_alloc) ++ operator new (std::size_t n, share) + { + return ::operator new (n); + } + + inline void shared_base:: +- operator delete (void* p, share) throw () ++ operator delete (void* p, share) + { + ::operator delete (p); + } + + inline void shared_base:: +- operator delete (void* p) throw () ++ operator delete (void* p) + { + ::operator delete (p); + } diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 47becf880e..26e099eeab 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + fix-linux.patch ) file(REMOVE "${SOURCE_PATH}/version") diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json index 0c666c06a9..031d80e698 100644 --- a/ports/libodb/vcpkg.json +++ b/ports/libodb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb", "version": "2.4.0", - "port-version": 10, + "port-version": 11, "description": "ODB library, base runtime for the ODB ORM solution", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 94c04d622d..c3a3abdca2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -578,7 +578,6 @@ libmpeg2:arm-neon-android=fail libmpeg2:arm64-android=fail libmpeg2:x64-android=fail libmysql:x86-windows=skip -libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index a25e1e22d9..bdc6a265ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4730,7 +4730,7 @@ }, "libodb": { "baseline": "2.4.0", - "port-version": 10 + "port-version": 11 }, "libodb-boost": { "baseline": "2.4.0", diff --git a/versions/l-/libodb.json b/versions/l-/libodb.json index 1581863743..0bbda9fa88 100644 --- a/versions/l-/libodb.json +++ b/versions/l-/libodb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daca6d80b91b4d1c0d94a3b8a5553e6c2e9aa64f", + "version": "2.4.0", + "port-version": 11 + }, { "git-tree": "e7f1f5aa4bec08ddcadab7f1f7512234b8c44155", "version": "2.4.0",