From 021528cc1c4acafb3805c6ceaf07a8d2397a073a Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Wed, 21 Oct 2020 21:13:01 +0200 Subject: [PATCH] GTKAda 21.0.0 (#189) * GTKAda 21.0.0 * Fix gtkada on msys2 and update eagle_lander * pkg_config on msys2: use mingw pkg-config --- index/ea/eagle_lander/eagle_lander-1.2.0.toml | 2 +- index/gt/gtkada/gtkada-21.0.0.toml | 45 +++++++++++++++++++ index/gt/gtkada/gtkada-external.toml | 13 ------ index/li/libgtk3/libgtk3-external.toml | 11 +++++ index/pk/pkg_config/pkg_config-external.toml | 11 +++++ .../wi/winpthreads/winpthreads-external.toml | 11 +++++ 6 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 index/gt/gtkada/gtkada-21.0.0.toml delete mode 100644 index/gt/gtkada/gtkada-external.toml create mode 100644 index/li/libgtk3/libgtk3-external.toml create mode 100644 index/pk/pkg_config/pkg_config-external.toml create mode 100644 index/wi/winpthreads/winpthreads-external.toml diff --git a/index/ea/eagle_lander/eagle_lander-1.2.0.toml b/index/ea/eagle_lander/eagle_lander-1.2.0.toml index 59ff6015..c0296271 100644 --- a/index/ea/eagle_lander/eagle_lander-1.2.0.toml +++ b/index/ea/eagle_lander/eagle_lander-1.2.0.toml @@ -8,7 +8,7 @@ project-files = ["eagle_lander.gpr"] tags = ["simulator", "game", "gtk"] [[depends-on]] -gtkada = "^17" +gtkada = "^21" [origin] url = "https://github.com/Fabien-Chouteau/eagle-lander/releases/download/v1.2/eagle_lander-1.2.zip" diff --git a/index/gt/gtkada/gtkada-21.0.0.toml b/index/gt/gtkada/gtkada-21.0.0.toml new file mode 100644 index 00000000..c3d73048 --- /dev/null +++ b/index/gt/gtkada/gtkada-21.0.0.toml @@ -0,0 +1,45 @@ +description = "An Ada graphical toolkit based on Gtk+" +website = "https://github.com/adacore/gtkada" +name = "gtkada" +version = "21.0.0" +authors = ["AdaCore"] +licenses = ["GMGPL 3.0"] +maintainers = ["chouteau@adacore.com"] +maintainers-logins = ["Fabien-Chouteau"] +project-files = ["install_dir/lib/gnat/gtkada.gpr"] +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"] + +[[actions]] +type = "post-fetch" +command = ["bash", "configure", "--with-GL=no"] + +# Since the GTKAda project doesn't build alone with just gprbuild we build and +# install with the Makefile from post-fetch action. +[[actions]] +type = "post-fetch" +command = ["make", "all", "install", "prefix=install_dir"] + +[[depends-on]] +make = "*" +pkg_config = "*" +libgtk3 = "^3" + +[depends-on.'case(os)'.windows] +winpthreads = "*" + +[gpr-externals] +LIBRARY_TYPE = ["static", "static-pic", "relocatable"] + +[environment.'case(distribution)'] +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" + +[origin] +url="https://github.com/AdaCore/gtkada/archive/v21.0.0/gtkada-21.0.0.zip" +hashes=["sha512:3c1373c0a1168ae875398a0b5a1941234f6620ac114088980b83558c984c4566b87796fb4098de371af206ca6a4ae0fb4c6390119c5606a9f6a5b142916ce8d8"] + diff --git a/index/gt/gtkada/gtkada-external.toml b/index/gt/gtkada/gtkada-external.toml deleted file mode 100644 index fe2134ae..00000000 --- a/index/gt/gtkada/gtkada-external.toml +++ /dev/null @@ -1,13 +0,0 @@ -description = "Ada binding for the GTK+ GUI" -name = "gtkada" -licenses = [] -maintainers = ["alejandro@mosteo.com"] -maintainers-logins = ["mosteo"] - -[[external]] -kind = "system" -available."case(toolchain)".user = false - -[external.origin."case(distribution)"] -debian = ["libgtkada18-dev"] -ubuntu = ["libgtkada16.1.0-dev", "libgtkada19-dev"] diff --git a/index/li/libgtk3/libgtk3-external.toml b/index/li/libgtk3/libgtk3-external.toml new file mode 100644 index 00000000..984fe583 --- /dev/null +++ b/index/li/libgtk3/libgtk3-external.toml @@ -0,0 +1,11 @@ +description = "GObject-based multi-platform GUI toolkit (v3)" +name = "libgtk3" +licenses = ["LGPL 3.0"] +maintainers = ["chouteau@adacore.com"] +maintainers-logins = ["Fabien-Chouteau"] + +[[external]] +kind = "system" +[external.origin."case(distribution)"] +"debian|ubuntu" = ["libgtk-3-dev"] +msys2 = ["mingw-w64-x86_64-gtk3"] diff --git a/index/pk/pkg_config/pkg_config-external.toml b/index/pk/pkg_config/pkg_config-external.toml new file mode 100644 index 00000000..ef9fbc21 --- /dev/null +++ b/index/pk/pkg_config/pkg_config-external.toml @@ -0,0 +1,11 @@ +description = "" +name = "pkg_config" +licenses = ["LGPL 3.0"] +maintainers = ["chouteau@adacore.com"] +maintainers-logins = ["Fabien-Chouteau"] + +[[external]] +kind = "system" +[external.origin."case(distribution)"] +"debian|ubuntu" = ["pkg-config"] +msys2 = ["mingw-w64-x86_64-pkg-config"] diff --git a/index/wi/winpthreads/winpthreads-external.toml b/index/wi/winpthreads/winpthreads-external.toml new file mode 100644 index 00000000..f9460a65 --- /dev/null +++ b/index/wi/winpthreads/winpthreads-external.toml @@ -0,0 +1,11 @@ +description = "winpthreads library" +name = "winpthreads" +licenses = ["MIT"] +maintainers = ["chouteau@adacore.com"] +maintainers-logins = ["Fabien-Chouteau"] + +[[external]] +kind = "system" +[external.origin."case(distribution)"] +msys2 = ["mingw-w64-x86_64-winpthreads-git"] +