diff mbox series

[meta-openembedded,4/5] sqlite-orm: Upgrade 1.5 -> 1.9.1 to allow CMake 4+ compatibility

Message ID 20250710173827.43239-4-alperyasinak1@gmail.com
State Under Review
Headers show
Series [meta-openembedded,1/5] physfs: Add patch for CMake 4+ compatibility | expand

Commit Message

Alper Ak July 10, 2025, 5:38 p.m. UTC
- Dropped the patch as the issue is already fixed in the newer version.
- The LICENSE file has changed so updated LIC_FILES_CHKSUM to match the new md5sum.
- Updated CMake flag to disable tests according to the new version.

Changelog:

https://github.com/fnc12/sqlite_orm/compare/v1.5...v1.9.1
https://github.com/fnc12/sqlite_orm/releases

Fix:

| CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
|   Compatibility with CMake < 3.5 has been removed from CMake.
|
|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
|   to tell CMake that the project requires at least <min> but has been updated
|   to work with policies introduced by <max> or earlier.
|
|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
|
|
| -- Configuring incomplete, errors occurred!

Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
---
 ...01-fix-cstdint-error-with-gcc-15.0.1.patch | 52 -------------------
 ...{sqlite-orm_1.5.bb => sqlite-orm_1.9.1.bb} |  7 ++-
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
 rename meta-oe/recipes-devtools/sqlite-orm/{sqlite-orm_1.5.bb => sqlite-orm_1.9.1.bb} (68%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
deleted file mode 100644
index af884808f2..0000000000
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@ 
-From f011501e719e0042fc6ca29ac7b33e8a14562246 Mon Sep 17 00:00:00 2001
-From: "mark.yang" <mark.yang@lge.com>
-Date: Tue, 1 Apr 2025 19:45:01 +0900
-Subject: [PATCH] fix cstdint error with gcc-15.0.1
-
-* see more details:
-  http://errors.yoctoproject.org/Errors/Details/850148/
-    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:7:5: error: 'uint16_t' does not name a type
-        7 |     uint16_t src_port;
-        |     ^~~~~~~~
-    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:3:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
-        2 | #include <sqlite_orm/sqlite_orm.h>
-    +++ |+#include <cstdint>
-        3 | #include <string>
-
-While this was backported from 6a96d1cec4(Explicitly included <cstdint> in examples and unit tests),
-since it was a commit made in v1.9, only synchronous.cpp was modified as other files do not exist in the current version.
-
-Signed-off-by: mark.yang <mark.yang@lge.com>
-
-Upstream-Status: Backport [6a96d1c Explicitly included <cstdint> in examples and unit tests]
----
- examples/synchronous.cpp | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/examples/synchronous.cpp b/examples/synchronous.cpp
-index d10da13d..b103b48c 100644
---- a/examples/synchronous.cpp
-+++ b/examples/synchronous.cpp
-@@ -1,15 +1,16 @@
- 
- #include <sqlite_orm/sqlite_orm.h>
-+#include <cstdint>
- #include <string>
- 
- struct Query {
-     std::string src_ip;
--    uint16_t src_port;
--    uint16_t txn_id;
--    uint32_t tv_sec;
--    uint32_t tv_usec;
-+    std::uint16_t src_port;
-+    std::uint16_t txn_id;
-+    std::uint32_t tv_sec;
-+    std::uint32_t tv_usec;
-     std::string name;
--    uint16_t type;
-+    std::uint16_t type;
- };
- 
- int main(int, char **) {
-
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb
similarity index 68%
rename from meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
rename to meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb
index ee203f83e2..a4da31ebc7 100644
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.9.1.bb
@@ -1,19 +1,18 @@ 
 SUMMARY = "SQLite ORM light header only library for modern C++"
 HOMEPAGE = "https://github.com/fnc12/sqlite_orm"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5bf5ee8bb16d8e19359efe11bdc3f2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4ae09d45eac4aa08d013b5f2e01c67f6"
 
 inherit cmake
 
 DEPENDS += "sqlite3"
 
-SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b"
+SRCREV = "5f1a2ce84a3d72711b4f0a440fdaba977868ae67"
 SRC_URI = " \
     git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \
-    file://0001-fix-cstdint-error-with-gcc-15.0.1.patch \
 "
 
-EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \
+EXTRA_OECMAKE += "-DBUILD_TESTING=OFF -DLIB_INSTALL_DIR=${libdir} \
                   -DCMAKE_INSTALL_DIR=${libdir}/cmake \
                   -DPKGCONFIG_INSTALL_DIR=${libdir}/pkgconfig"