diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 38a2cfc9e..2b30c2e72 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -522,6 +522,16 @@ function Get-ZlibVersion { return "Zlib $zlibVersion" } +function Get-LibXftVersion { + $libXftVersion = (brew info libxft)[0] | Take-Part -Part 2 + return "libXft $libXftVersion" +} + +function Get-LibXextVersion { + $libXextVersion = (brew info libxext)[0] | Take-Part -Part 2 + return "libXext $libXextVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index a7016f904..d8d724a3b 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -292,7 +292,12 @@ $markdown += Build-AndroidEnvironmentTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Miscellaneous" -Level 3 -$markdown += New-MDList -Lines @(Get-ZlibVersion) -Style Unordered +$markdown += New-MDList -Style Unordered -Lines (@( + (Get-ZlibVersion), + (Get-LibXextVersion), + (Get-LibXftVersion) + ) | Sort-Object +) # # Generate systeminfo.txt with information about image (for debug purpose) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1db75e409..aba45a823 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -225,7 +225,9 @@ "swig", "xctool", "zstd", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e24814eb5..a82679ee2 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -185,7 +185,9 @@ "swiftformat", "swig", "zstd", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a4ca2b473..67ed08d92 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -100,7 +100,9 @@ "swig", "zstd", "gmp", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia"