Merge pull request #18826 from lpcalisi/msttcorefonts-installer

wolfi-dev · May 27, 2024 · cf1b618 · cf1b618
2 parents 27ed07b + 5cf4907
commit cf1b618
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/msttcorefonts-installer.yaml b/msttcorefonts-installer.yaml
@@ -1,12 +1,13 @@
 package:
  name: msttcorefonts-installer
  version: 3.8.1
- epoch: 0
+ epoch: 1
  description: Installer for Microsoft TrueType core fonts
  copyright:
  - license: GPL-2.0-or-later
  dependencies:
  runtime:
+ - cabextract
  - wget
 
 environment:
@@ -30,6 +31,10 @@ pipeline:
  with:
  patches: remove-debian-stuff.patch
 
+ - uses: patch
+ with:
+ patches: fix_mv.patch
+
  - runs: |
  mkdir -p "${{targets.destdir}}"/usr/bin
  mkdir -p "${{targets.destdir}}"/usr/lib/${{package.name}}

diff --git a/msttcorefonts-installer/fix_mv.patch b/msttcorefonts-installer/fix_mv.patch
@@ -0,0 +1,12 @@
+diff --git a/update-ms-fonts b/update-ms-fonts
+index 89d95c3..8c76af5 100755
+--- a/update-ms-fonts
++++ b/update-ms-fonts
+@@ -196,7 +196,6 @@ EOF
+ for ff in $FONTFILES; do
+ for ttf in `grep $ff msfonts.info | awk '{print $4}'`; do
+ longname=`awk "/$ttf/ { print \\$2 }" msfonts.info`
+- mv -Z $ttf $FONTDIR/$longname
+ ln -sf $longname $FONTDIR/$ttf
+ done
+ done