diff --git a/packages/c/criterion/patch.lua b/packages/c/criterion/patch.lua index 4a182de0f7d..39a0baf7171 100644 --- a/packages/c/criterion/patch.lua +++ b/packages/c/criterion/patch.lua @@ -7,9 +7,19 @@ function main(package) [[nanopb = dependency('nanopb', required: get_option('wrap_mode') == 'nofallback', method: 'cmake',]], [[nanopb = dependency('nanopb', method: 'pkg-config')]], {plain = true}) io.replace("meson.build", "modules: ['nanopb::protobuf-nanopb-static'])", "", {plain = true}) - io.replace("meson.build", - [[libgit2 = dependency('libgit2', required: get_option('wrap_mode') == 'nofallback')]], - [[libgit2 = dependency('libgit2', method: 'pkg-config')]], {plain = true}) + if not package:is_plat("windows", "mingw") then + io.replace("meson.build", [[libgit2 = dependency('libgit2', required: get_option('wrap_mode') == 'nofallback')]], + [[libgit2 = dependency('libgit2', method: 'pkg-config') + openssl = dependency('openssl', 'openssl3') + pcre2 = dependency('pcre2-8', 'libpcre2-8', method: 'pkg-config') + llhttp = dependency('llhttp', 'libllhttp', method: 'pkg-config')]], {plain = true}) + io.replace("meson.build", [[ libgit2, + nanomsg,]], [[ libgit2, + openssl, + pcre2, + llhttp, + nanomsg,]], {plain = true}) + end if package:is_plat("windows", "mingw") then io.replace("src/compat/path.c", "defined (HAVE_GETCWD)", "0", {plain = true}) io.replace("src/compat/path.c", "defined (HAVE_GETCURRENTDIRECTORY)", "1", {plain = true}) diff --git a/packages/c/criterion/xmake.lua b/packages/c/criterion/xmake.lua index 902a56232c4..7fbc093cbce 100644 --- a/packages/c/criterion/xmake.lua +++ b/packages/c/criterion/xmake.lua @@ -6,6 +6,7 @@ package("criterion") add_urls("https://github.com/Snaipe/Criterion/archive/refs/tags/$(version).tar.gz", "https://github.com/Snaipe/Criterion.git") + add_versions("v2.4.3", "6d924ee5eeaaaed7762ab968f560b9ff543fc3473aa949bf53ac56a2a1a9416c") add_versions("v2.4.2", "83e1a39c8c519fbef0d64057dc61c8100b3a5741595788c9f094bba2eeeef0df") add_configs("i18n", {description = "Enable i18n", default = false, type = "boolean"}) diff --git a/packages/l/libgit2/xmake.lua b/packages/l/libgit2/xmake.lua index 6073fed6e5d..9e3d3d99b0d 100644 --- a/packages/l/libgit2/xmake.lua +++ b/packages/l/libgit2/xmake.lua @@ -148,10 +148,6 @@ package("libgit2") table.insert(configs, "-DDLLTOOL=" .. dlltool) end import("package.tools.cmake").install(package, configs, opt) - if package:is_plat("linux") and linuxos.name() == "fedora" then - io.replace(path.join(package:installdir("lib/pkgconfig"), "libgit2.pc"), - "Requires.private: openssl ", "Requires.private: openssl3 ", {plain = true}) - end end) on_test(function (package)