mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

fontconfig.wrap: Bump and fix MSYS2 build failure

Browse source 
Apply upstream patch:
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/283

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5018>
This commit is contained in:
Nirbheek Chauhan 2023-07-12 11:08:21 +05:30 committed by GStreamer Marge Bot
parent 20eef720f0
commit 9c882287d5
2 changed files with 52 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/fontconfig.wrap
View file

@ -1,6 +1,6 @@
[wrap-git]
directory=fontconfig
url=https://gitlab.freedesktop.org/fontconfig/fontconfig
push-url=git@gitlab.freedesktop.org:fontconfig/fontconfig.git
depth=1
revision=2.14.0
[wrap-file]
directory = fontconfig-2.14.2
source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz
source_filename = fontconfig-2.14.2.tar.xz
source_hash = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
diff_files = fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch

46
subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch Normal file
View file

@ -0,0 +1,46 @@
From 8c0727b1c3ea7eaa97cf05affb3efb4469a4443f Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 12 Jul 2023 10:53:59 +0530
Subject: [PATCH] meson: Always use posix path, even on Windows
Fix build error when using MSYS2 and building inside C:\Users
```
FAILED: subprojects/fontconfig/test/test_bz89617.exe.p/test-bz89617.c.obj
"cc" [...] "-DSRCDIR=\"C:\\Users\\Administrator\\runner\\builds\\nirbheek\\gstreamer\\subprojects\\fontconfig\\test\"" [...] ../subprojects/fontconfig/test/test-bz89617.c
../subprojects/fontconfig/test/test-bz89617.c: In function 'main':
../subprojects/fontconfig/test/test-bz89617.c:33:76: error: incomplete universal character name \U
33 | if (!FcConfigAppFontAddFile (config, (const FcChar8 *)SRCDIR "/4x6.pcf") ||
| ^
../subprojects/fontconfig/test/test-bz89617.c:33:76: warning: unknown escape sequence: '\A'
../subprojects/fontconfig/test/test-bz89617.c:33:76: warning: unknown escape sequence: '\g'
../subprojects/fontconfig/test/test-bz89617.c:33:76: warning: unknown escape sequence: '\s'
```
---
test/meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/meson.build b/test/meson.build
index 59de427..9265662 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,5 +1,6 @@
+fsmod = import('fs')
tests = [
- ['test-bz89617.c', {'c_args': ['-DSRCDIR="@0@"'.format(meson.current_source_dir())]}],
+ ['test-bz89617.c', {'c_args': ['-DSRCDIR="@0@"'.format(fsmod.as_posix(meson.current_source_dir()))]}],
['test-bz131804.c'],
['test-bz96676.c'],
['test-name-parse.c'],
@@ -12,7 +13,7 @@ tests = [
if host_machine.system() != 'windows'
tests += [
# FIXME: ['test-migration.c'],
- ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}],
+ ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(fsmod.as_posix(join_paths(meson.current_source_dir(), '4x6.pcf')))]}],
['test-issue107.c'], # FIXME: fails on mingw
# FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh
['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread
--
2.41.0.windows.2