mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-03 05:59:10 +00:00
meson: Fix fontconfig build failure with MSYS2 gperf
The CI image now contains MSYS2 gperf, and the build fails due to CRLF newlines in files generated by the build files. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5043>
This commit is contained in:
parent
51cc04eafe
commit
cc6ccd881e
2 changed files with 38 additions and 1 deletions
|
@ -3,4 +3,4 @@ directory = fontconfig-2.14.2
|
||||||
source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz
|
source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz
|
||||||
source_filename = fontconfig-2.14.2.tar.xz
|
source_filename = fontconfig-2.14.2.tar.xz
|
||||||
source_hash = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
|
source_hash = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
|
||||||
diff_files = fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch
|
diff_files = fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch, fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
From 6081263d131848842b916a6d2506c1a612be7f81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nirbheek Chauhan <nirbheek@centricular.com>
|
||||||
|
Date: Thu, 13 Jul 2023 07:28:52 +0530
|
||||||
|
Subject: [PATCH] meson: Always write utf-8 files with LF newlines
|
||||||
|
|
||||||
|
Otherwise, MSYS2 gperf chokes on the CRLF newlines translated by
|
||||||
|
`open()`, even though we explicitly write out `\n`
|
||||||
|
|
||||||
|
```
|
||||||
|
[1/48] Generating src/fcobjshash.h with a custom command
|
||||||
|
FAILED: src/fcobjshash.h
|
||||||
|
"C:\msys64\usr\bin\gperf.EXE" "--pic" "-m" "100" "src/fcobjshash.gperf" "--output-file" "src/fcobjshash.h"
|
||||||
|
src/fcobjshash.gperf:17: warning: junk after %% is ignored
|
||||||
|
src/fcobjshash.gperf:2: warning: junk after %} is ignored
|
||||||
|
src/fcobjshash.gperf:3: junk after declaration
|
||||||
|
ninja: build stopped: subcommand failed.
|
||||||
|
```
|
||||||
|
---
|
||||||
|
src/cutout.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/cutout.py b/src/cutout.py
|
||||||
|
index 6b46529..9fe46ce 100644
|
||||||
|
--- a/src/cutout.py
|
||||||
|
+++ b/src/cutout.py
|
||||||
|
@@ -29,7 +29,7 @@ if __name__== '__main__':
|
||||||
|
|
||||||
|
stdout = ret.stdout.decode('utf8')
|
||||||
|
|
||||||
|
- with open(args[0].output, 'w') as out:
|
||||||
|
+ with open(args[0].output, 'w', encoding='utf-8', newline='\n') as out:
|
||||||
|
write = True
|
||||||
|
for l in stdout.split('\n'):
|
||||||
|
l = l.strip('\r')
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
Loading…
Reference in a new issue