From 22c7e758a51bb44290ff18fe997b941bb79bb8f0 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 13 Dec 2025 22:05:18 -0600 Subject: [PATCH] updated fontconfig --- cmake/hashes.cmake | 5 +++-- src/scripts/libraries.sh | 2 +- src/scripts/versions.sh | 2 +- support/3rd_party/fontconfig-2.16.0.tar.xz.sha256 | 1 - support/3rd_party/fontconfig-2.17.1.tar.xz.sha256 | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 support/3rd_party/fontconfig-2.16.0.tar.xz.sha256 create mode 100644 support/3rd_party/fontconfig-2.17.1.tar.xz.sha256 diff --git a/cmake/hashes.cmake b/cmake/hashes.cmake index 1b0ad54..392b4e0 100644 --- a/cmake/hashes.cmake +++ b/cmake/hashes.cmake @@ -8,16 +8,16 @@ set(CXXOPTS_HASH 3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e207 set(EXPAT_HASH 85372797ff0673a8fc4a6be16466bb5a0ca28c0dcf3c6f7ac1686b4a3ba2aabb) set(FLAC_HASH aea54ed186ad07a34750399cb27fc216a2b62d0ffcd6dc2e3064a3518c3146f8) set(FMT_HASH aa3e8fbb6a0066c03454434add1f1fc23299e85758ceec0d7d2d974431481e40) -set(FONTCONFIG_HASH 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220) +set(FONTCONFIG_HASH 9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541) set(FREETYPE2_HASH 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34) set(GCC_HASH 7294d65cc1a0558cb815af0ca8c7763d86f7a31199794ede3f630c0d1b0a5723) set(GTEST_HASH 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c) set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2) set(INNOSETUP_HASH fa73bf47a4da250d185d07561c2bfda387e5e20db77e4570004cf6a133cc10b1) set(JSON_HASH 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187) +set(LIBBITCOIN_SYSTEM_HASH b5dd2a97289370fbb93672dd3114383f30d877061de1d1683fa8bdda5309bfa2) set(LIBDSM_HASH 747c4563d6291303d9b085c9e7dc96ac44f91871dcac3e20480fdcc066eee88a) set(LIBEVENT_HASH 7180a979aaa7000e1264da484f712d403fcf7679b1e9212c4e3d09f5c93efc24) -set(LIBBITCOIN_SYSTEM_HASH b5dd2a97289370fbb93672dd3114383f30d877061de1d1683fa8bdda5309bfa2) set(LIBICONV_HASH 3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8) set(LIBJPEG_TURBO_HASH 560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6) set(LIBPNG_HASH 71158e53cfdf2877bc99bcab33641d78df3f48e6e0daad030afe9cb8c031aa46) @@ -38,6 +38,7 @@ set(SFML_HASH 15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f) set(SPDLOG_HASH 15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67) set(SQLITE_HASH 1d3049dd0f830a025a53105fc79fd2ab9431aea99e137809d064d8ee8356b032) set(STDUUID_HASH b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3) +set(VLC_HASH 9d2b24d6bc4196b3da8d181a3878678ba272e2a7690321f8826da76a69b2fb9c) set(VORBIS_HASH 270c76933d0934e42c5ee0a54a36280e2d87af1de3cc3e584806357e237afd13) set(WINFSP_HASH 073a70e00f77423e34bed98b86e600def93393ba5822204fac57a29324db9f7a) set(WXWIDGETS_HASH f936c8d694f9c49a367a376f99c751467150a4ed7cbf8f4723ef19b2d2d9998d) diff --git a/src/scripts/libraries.sh b/src/scripts/libraries.sh index 69aa4fb..d847bd6 100755 --- a/src/scripts/libraries.sh +++ b/src/scripts/libraries.sh @@ -110,7 +110,7 @@ PROJECT_DOWNLOADS[CXXOPTS]="https://github.com/jarro2783/cxxopts/archive/refs/ta PROJECT_DOWNLOADS[EXPAT]="https://github.com/libexpat/libexpat/archive/refs/tags/R_${PROJECT_VERSIONS[EXPAT2]}.tar.gz;expat-${PROJECT_VERSIONS[EXPAT]}.tar.gz;3rd_party/mingw64" PROJECT_DOWNLOADS[FLAC]="https://github.com/xiph/flac/archive/refs/tags/${PROJECT_VERSIONS[FLAC]}.tar.gz;flac-${PROJECT_VERSIONS[FLAC]}.tar.gz;3rd_party" PROJECT_DOWNLOADS[FMT]="https://github.com/fmtlib/fmt/archive/refs/tags/${PROJECT_VERSIONS[FMT]}.tar.gz;fmt-${PROJECT_VERSIONS[FMT]}.tar.gz;3rd_party" -PROJECT_DOWNLOADS[FONTCONFIG]="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.xz;fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.xz;3rd_party" +PROJECT_DOWNLOADS[FONTCONFIG]="https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PROJECT_VERSIONS[FONTCONFIG]}/fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.xz;fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.xz;3rd_party" PROJECT_DOWNLOADS[FREETYPE2]="https://download.savannah.gnu.org/releases/freetype/freetype-${PROJECT_VERSIONS[FREETYPE2]}.tar.gz;freetype-${PROJECT_VERSIONS[FREETYPE2]}.tar.gz;3rd_party" PROJECT_DOWNLOADS[GCC]="https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-${PROJECT_VERSIONS[GCC]}/gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;3rd_party/mingw64" PROJECT_DOWNLOADS[GTEST]="https://github.com/google/googletest/archive/refs/tags/v${PROJECT_VERSIONS[GTEST]}.tar.gz;googletest-${PROJECT_VERSIONS[GTEST]}.tar.gz;3rd_party" diff --git a/src/scripts/versions.sh b/src/scripts/versions.sh index e9d62c3..7a00c59 100755 --- a/src/scripts/versions.sh +++ b/src/scripts/versions.sh @@ -18,7 +18,7 @@ PROJECT_VERSIONS[EXPAT]="2.7.1" PROJECT_VERSIONS[EXPAT2]="2_7_1" PROJECT_VERSIONS[FLAC]="1.5.0" PROJECT_VERSIONS[FMT]="12.0.0" -PROJECT_VERSIONS[FONTCONFIG]="2.16.0" +PROJECT_VERSIONS[FONTCONFIG]="2.17.1" PROJECT_VERSIONS[FREETYPE2]="2.14.1" PROJECT_VERSIONS[GCC]="15.2.0" PROJECT_VERSIONS[GTEST]="1.17.0" diff --git a/support/3rd_party/fontconfig-2.16.0.tar.xz.sha256 b/support/3rd_party/fontconfig-2.16.0.tar.xz.sha256 deleted file mode 100644 index 08fe304..0000000 --- a/support/3rd_party/fontconfig-2.16.0.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 fontconfig-2.16.0.tar.xz diff --git a/support/3rd_party/fontconfig-2.17.1.tar.xz.sha256 b/support/3rd_party/fontconfig-2.17.1.tar.xz.sha256 new file mode 100644 index 0000000..f46b0c8 --- /dev/null +++ b/support/3rd_party/fontconfig-2.17.1.tar.xz.sha256 @@ -0,0 +1 @@ +9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541 fontconfig-2.17.1.tar.xz