Merge branch 'stable-1.3.0' into gnat-fsf-14.1

alire-project · Jun 7, 2024 · cffbd2a · cffbd2a
2 parents 9cd56e5 + 1894252
commit cffbd2a
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 18 deletions.
diff --git a/index/gl/globe_3d/globe_3d-2023.11.12.toml b/index/gl/globe_3d/globe_3d-2023.11.12.toml
@@ -3,7 +3,11 @@ name = "globe_3d"
 version = "2023.11.12"
 
 licenses = "MIT"
-tags = [ "gl", "opengl" ]
+tags = [ "gl", "opengl",
+         "rendering", "graphics", "3d-rendering", "3d-graphics",
+         "space-partition",
+         "collision",
+         "portal" ]
 website = "https://globe3d.sourceforge.io/"
 
 authors = ["Gautier de Montmollin"]

diff --git a/index/gn/gnoga/gnoga-2.1.2.toml b/index/gn/gnoga/gnoga-2.1.2.toml
@@ -12,16 +12,16 @@ licenses = "GPL-3.0-only WITH GCC-exception-3.1"
 
 project-files = ["lib_gnoga.gpr"]
 
-[gpr-set-externals.'case(os)']
-linux   = { Target_OS = "Linux", PRJ_TARGET = "Linux" }
-windows = { Target_OS = "Windows", PRJ_TARGET = "Windows" }
-macos   = { Target_OS = "OSX", PRJ_TARGET = "OSX" }
-
 [[depends-on]]
 gnat = ">=2021 | (>=12 & <2000)"
 simple_components = "^4.62.0"
 uxstrings = "~0.4.0+alpha-20220803"
 
+[gpr-set-externals.'case(os)']
+linux   = { PRJ_TARGET = "Linux" }
+windows = { PRJ_TARGET = "Windows" }
+macos   = { PRJ_TARGET = "OSX" }
+
 [origin]
 commit = "5f127c56986a7a1a562b405d7934eabf8e624c25"
 url = "git+https://github.com/Blady-Com/gnoga.git"

diff --git a/index/li/libgnutls/libgnutls-external.toml b/index/li/libgnutls/libgnutls-external.toml
@@ -7,7 +7,9 @@ maintainers-logins = ["mosteo"]
 [[external]]
 kind = "system"
 [external.origin."case(distribution)"]
+"arch" = ["gnutls"]
 "debian|ubuntu" = ["libgnutls28-dev"]
+"centos|fedora" = ["gnutls-devel"]
 "homebrew" = ["gnutls"]
 "macports" = ["gnutls"]
 

diff --git a/index/li/libmariadb/libmariadb-external.toml b/index/li/libmariadb/libmariadb-external.toml
@@ -7,7 +7,9 @@ maintainers-logins = ["stcarrez"]
 [[external]]
 kind = "system"
 [external.origin."case(distribution)"]
-"debian|ubuntu" = ["libmariadbclient-dev"]
+"debian|ubuntu" = ["libmariadb-dev",      # newer Debian versions
+                   "libmariadbclient-dev" # older Debian versions
+                   ]
 
 # No mariadb library on msys2
 [external.available.'case(os)']

diff --git a/index/op/optional/optional-0.2.0.toml b/index/op/optional/optional-0.2.0.toml
@@ -0,0 +1,16 @@
+name = "optional"
+description = "Optional values a la java.lang.Optional"
+version = "0.2.0"
+
+tags = ["optional", "functional"]
+licenses = "LGPL-3.0-only"
+website = "https://github.com/mosteo/optional/"
+
+authors = ["Alejandro R. Mosteo"]
+maintainers = ["Alejandro R. Mosteo <[email protected]>"]
+maintainers-logins = ["mosteo"]
+
+[origin]
+commit = "3b6d741c320608579419db9871fe3fd02356d9b6"
+url = "git+https://github.com/mosteo/optional.git"
+
diff --git a/index/si/simple_components/simple_components-4.68.0.toml b/index/si/simple_components/simple_components-4.68.0.toml
@@ -21,18 +21,15 @@ Target_OS = ["Windows", "Windows_NT", "Linux", "UNIX", "OSX", "FreeBSD", "auto"]
 Tasking = ["Multiple", "Single"] # Default Multiple
 Traced_Objects = ["Off", "On"] # Default Off
 
-[gpr-set-externals]
-Target_OS = "auto"
+[gpr-set-externals."case(os)"]
+freebsd = { Target_OS = "FreeBSD" }
+linux   = { Target_OS = "Linux", odbc = "unixODBC" }
+macos   = { Target_OS = "OSX" }
+windows = { Target_OS = "Windows", odbc = "ODBC32" }
 
-[gpr-set-externals."case(os)".linux]
-odbc = "unixODBC"
-[gpr-set-externals."case(os)".windows]
-odbc = "ODBC32"
-
-[gpr-set-externals."case(word-size)".bits-32]
-arch = "i686"
-[gpr-set-externals."case(word-size)".bits-64]
-arch = "x86_64"
+[gpr-set-externals."case(word-size)"]
+bits-32 = { arch = "i686" }
+bits-64 = { arch = "x86_64" }
 
 [origin]
 commit = "da9b0f3a3d56a2e60490fa5f23ca510862c252cd"

diff --git a/index/te/texcad/texcad-4.5.2.toml b/index/te/texcad/texcad-4.5.2.toml
@@ -0,0 +1,45 @@
+description = "TeXCAD is a program for drawing or retouching {picture}s in LaTeX"
+name = "texcad"
+version = "4.5.2"
+
+authors = ["Gautier de Montmollin"]
+maintainers = ["[email protected]"]
+maintainers-logins = ["zertovitch"]
+website = "https://texcad.sourceforge.io/"
+licenses = "GPL-2.0-or-later"
+tags = ["texcad", "tex", "latex", "cad", "picture", "draw", "drawing", "graphics", "vector-graphics"]
+long-description = """
+&nbsp; <a target="_blank" href="https://texcad.sourceforge.io/tc/tca018.png"><img src="https://texcad.sourceforge.io/tc/tca018m.png" alt="texcad screenshot" width="auto" height="200"></a>
+
+TeXCAD is a program for drawing or retouching {picture}s in LaTeX.
+It extends the original {picture} capabilities, even without any obligatory LaTeX package, class or style sheet.
+The core of TeXCAD is totally portable.
+
+Features:
+
+* Supports plain LaTeX
+* Extends LaTeX picture objects through emulation or use of special styles
+* Special styles are only optional
+* Parametric curves
+* **Free**, Open-Source
+"""
+
+project-files = ["tc_gwin/texcad_gw_project_tree.gpr"]
+executables = ["texcad"]
+
+[available.'case(os)']
+windows = true
+'...' = false
+
+[gpr-externals]
+TeXCAD_Build_Mode = ["Debug", "Optimize"]
+
+[gpr-set-externals]
+TeXCAD_Build_Mode = "Debug"
+
+[[depends-on]]
+gwindows = ">=1.4.3"
+
+[origin]
+url = "https://sourceforge.net/projects/texcad/files/texcad/source_snapshots/texcad-svn_code-r105.zip"
+hashes = ["sha512:efd993bff2838127f94d079a4bc90d8923354acdd796d3431324b7873817d1d217d3383eb879b739f01b0486260f89455b450f5e1fafe5ccfdf542adb91160a3"]
diff --git a/index/un/unixodbc/unixodbc-external.toml b/index/un/unixodbc/unixodbc-external.toml
@@ -8,7 +8,9 @@ maintainers-logins = ["mosteo"]
 [[external]]
 kind = "system"
 [external.origin."case(distribution)"]
+"arch" = ["unixodbc"]
 "debian|ubuntu" = ["unixodbc-dev"]
+"centos|fedora" = ["unixODBC-devel"]
 "homebrew" = ["unixodbc"]
 "macports" = ["unixodbc"]