From 97ab1425bffea22e0e5690205cd245f2224bce67 Mon Sep 17 00:00:00 2001 From: Blady-Com Date: Tue, 27 Sep 2022 18:04:28 +0200 Subject: [PATCH] gtkada 21.0.0: macOS support (#545) * Add macOS support to GTKAda 21.0.0. * Fix sed syntax for Linux. * To be compatible between macOS and Linux, we should avoid sed -i and use tmp files instead. * Disable problematic platforms Co-authored-by: GHA --- index/gt/gtkada/gtkada-21.0.0.toml | 10 +++++++++- index/li/libgtk3/libgtk3-external.toml | 5 +++++ index/pk/pkg_config/pkg_config-external.toml | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/index/gt/gtkada/gtkada-21.0.0.toml b/index/gt/gtkada/gtkada-21.0.0.toml index 6a0ea642..a84c18a0 100644 --- a/index/gt/gtkada/gtkada-21.0.0.toml +++ b/index/gt/gtkada/gtkada-21.0.0.toml @@ -12,7 +12,11 @@ tags = ["gtk", "gui"] # Add msys in the OS list in config.sub [[actions]] type = "post-fetch" -command = ["sed", "-i", "s/| -mingw32\\*/| -mingw32\\* | -msys\\*/g", "config.sub"] +command = ["sh", "-c", "sed 's/| -mingw32\\*/| -mingw32\\* | -msys\\*/g' config.sub > config.sub.0 && mv -f config.sub.0 config.sub"] + +[[actions]] +type = "post-fetch" +command = ["sh", "-c", "sed '/misc_osx.h/a\\\nNSWindow *gdk_quartz_window_get_nswindow(GdkWindow *window);\n' src/misc_osx.m > src/misc_osx.m.0 && mv -f src/misc_osx.m.0 src/misc_osx.m"] [[actions]] type = "post-fetch" @@ -39,6 +43,10 @@ LIBRARY_TYPE = ["static", "static-pic", "relocatable"] msys2.C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/mingw64/x86_64-w64-mingw32/include" msys2.LIBRARY_PATH.append = "${DISTRIB_ROOT}/mingw64/x86_64-w64-mingw32/lib" +[available] +'case(os)'.windows = false +'case(distribution)'.arch = false + [origin] url="https://github.com/AdaCore/gtkada/archive/v21.0.0/gtkada-21.0.0.zip" hashes=["sha512:3c1373c0a1168ae875398a0b5a1941234f6620ac114088980b83558c984c4566b87796fb4098de371af206ca6a4ae0fb4c6390119c5606a9f6a5b142916ce8d8"] diff --git a/index/li/libgtk3/libgtk3-external.toml b/index/li/libgtk3/libgtk3-external.toml index 508023ce..0534adcf 100644 --- a/index/li/libgtk3/libgtk3-external.toml +++ b/index/li/libgtk3/libgtk3-external.toml @@ -10,3 +10,8 @@ kind = "system" "debian|ubuntu" = ["libgtk-3-dev"] arch = ["gtk3"] msys2 = ["mingw-w64-x86_64-gtk3"] + +[[external]] +kind = "version-output" +version-command = [ "pkg-config", "--modversion", "gtk+-3.0" ] +version-regexp = "([\\d\\.]+)" diff --git a/index/pk/pkg_config/pkg_config-external.toml b/index/pk/pkg_config/pkg_config-external.toml index bcf9e509..124600ab 100644 --- a/index/pk/pkg_config/pkg_config-external.toml +++ b/index/pk/pkg_config/pkg_config-external.toml @@ -10,3 +10,8 @@ kind = "system" "debian|ubuntu" = ["pkg-config"] arch = ["pkgconf"] msys2 = ["mingw-w64-x86_64-pkg-config"] + +[[external]] +kind = "version-output" +version-command = [ "pkg-config", "--version" ] +version-regexp = "([\\d\\.]+)"