From ae15b043f88e1032e811d5f7e8058cf4d2ed890f Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 19 Jan 2025 15:25:53 +0000 Subject: [PATCH 1/2] Update ocilib to v4.7.7 --- packages/o/ocilib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/ocilib/xmake.lua b/packages/o/ocilib/xmake.lua index 1c950591c29..9a3837d92ee 100644 --- a/packages/o/ocilib/xmake.lua +++ b/packages/o/ocilib/xmake.lua @@ -6,6 +6,7 @@ package("ocilib") add_urls("https://github.com/vrogier/ocilib/archive/refs/tags/$(version).tar.gz", "https://github.com/vrogier/ocilib.git") + add_versions("v4.7.7", "92822cc683048d3a2cddbbc7835062a02a9011ed2d7382da52a4c120e8c911ab") add_versions("v4.7.6", "43f5093cac645518ad5bc8d6f48f5b77e12372ef84dc87ddb3a54c40e425bd26") add_configs("unicode", {description = "Enable Unicode", default = true, type = "boolean"}) From 540475ff7b8d340a2f124fffe0f4129bcc05f662 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 20 Jan 2025 22:29:06 +0800 Subject: [PATCH 2/2] add patch --- .../o/ocilib/patches/4.7.7/fix-gcc14.patch | 23 +++++++++++++++++++ packages/o/ocilib/xmake.lua | 10 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 packages/o/ocilib/patches/4.7.7/fix-gcc14.patch diff --git a/packages/o/ocilib/patches/4.7.7/fix-gcc14.patch b/packages/o/ocilib/patches/4.7.7/fix-gcc14.patch new file mode 100644 index 00000000000..c1a3ea413f0 --- /dev/null +++ b/packages/o/ocilib/patches/4.7.7/fix-gcc14.patch @@ -0,0 +1,23 @@ +From 4b67124796225c6e1b6038ab1c9f11b232aa50fb Mon Sep 17 00:00:00 2001 +From: Vincent Rogier +Date: Mon, 20 Jan 2025 13:47:30 +0100 +Subject: [PATCH] Fixed # #371 (missing cast leading compile falieur on gcc14 + as -Wincompatible-pointer-types becomes default) + +--- + src/reference.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/reference.c b/src/reference.c +index d760420c..428318b7 100644 +--- a/src/reference.c ++++ b/src/reference.c +@@ -443,7 +443,7 @@ boolean OcilibReferenceToString + } + else + { +- dbstr = str; ++ dbstr = (dbtext *) str; + } + + CHECK_OCI diff --git a/packages/o/ocilib/xmake.lua b/packages/o/ocilib/xmake.lua index 9a3837d92ee..e4d096ec127 100644 --- a/packages/o/ocilib/xmake.lua +++ b/packages/o/ocilib/xmake.lua @@ -9,18 +9,22 @@ package("ocilib") add_versions("v4.7.7", "92822cc683048d3a2cddbbc7835062a02a9011ed2d7382da52a4c120e8c911ab") add_versions("v4.7.6", "43f5093cac645518ad5bc8d6f48f5b77e12372ef84dc87ddb3a54c40e425bd26") + add_patches("4.7.7", "patches/4.7.7/fix-gcc14.patch", "33253876d5bdffe6fd74372a812a54733b58bdc25368a5205220ffb56984da5c") + add_configs("unicode", {description = "Enable Unicode", default = true, type = "boolean"}) on_install(function (package) - local configs = { - unicode = package:config("unicode") - } if not package:config("shared") then package:add("defines", "OCI_LIB_LOCAL_COMPILE") end + io.replace("include/ocilibcpp/detail/core/SmartHandle.hpp", ".Set", ".template Set", {plain = true}) + + local configs = { + unicode = package:config("unicode") + } os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") import("package.tools.xmake").install(package, configs) end)