From 1bea54624df5f07cf196fd0b47b5a6e29e7c7458 Mon Sep 17 00:00:00 2001 From: Jason Francis Date: Mon, 24 Oct 2022 20:25:35 -0500 Subject: [PATCH] meson: Update freetype2 git repository to upstream The forked repository is unmaintained and several releases out of date. The upstream repository now includes meson support, so the forked repository is no longer necessary. --- meson.build | 2 +- subprojects/freetype2.wrap | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index b704a5b..13ecbed 100644 --- a/meson.build +++ b/meson.build @@ -30,7 +30,7 @@ freetype_dep = dependency('freetype2', method: 'pkg-config', version: freetype_r # Give another shot using CMake if not freetype_dep.found() freetype_dep = dependency('freetype', method: 'cmake', version: freetype_req_cmake, - fallback: ['freetype2', 'freetype_dep']) + fallback: ['freetype2', 'freetype_dep'], default_options: 'werror=false') endif # Linking expat should not be so difficult... see: https://github.com/mesonbuild/meson/issues/10516 diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index 3151539..d86a75e 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=freetype2 -url=https://github.com/centricular/freetype2.git -push-url=git@github.com:centricular/freetype2.git -revision=meson +url=https://gitlab.freedesktop.org/freetype/freetype.git +push-url=git@gitlab.freedesktop.org:freetype/freetype.git +revision=master