From 600e48a17bd76a29e4c2bc20a96d7e9258e81118 Mon Sep 17 00:00:00 2001
From: Lucas Pablo Calisi <calisi.lucas@gmail.com>
Date: Wed, 8 May 2024 13:00:31 -0300
Subject: [PATCH 1/2] msttcorefonts-installer: remove unncesesary mv command

Signed-off-by: Lucas Pablo Calisi <calisi.lucas@gmail.com>
---
 msttcorefonts-installer.yaml         |  7 ++++++-
 msttcorefonts-installer/fix_mv.patch | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 msttcorefonts-installer/fix_mv.patch

diff --git a/msttcorefonts-installer.yaml b/msttcorefonts-installer.yaml
index 470da72f07..035f6580bf 100644
--- a/msttcorefonts-installer.yaml
+++ b/msttcorefonts-installer.yaml
@@ -1,13 +1,14 @@
 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:
       - wget
+      - cabextract
 
 environment:
   contents:
@@ -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
new file mode 100644
index 0000000000..e99d7d52c4
--- /dev/null
+++ 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

From 5cf4907fc9aa99248e28752cd5e518854ae12bb8 Mon Sep 17 00:00:00 2001
From: Lucas Pablo Calisi <calisi.lucas@gmail.com>
Date: Mon, 13 May 2024 09:59:06 -0300
Subject: [PATCH 2/2] fix linter

Signed-off-by: Lucas Pablo Calisi <calisi.lucas@gmail.com>
---
 msttcorefonts-installer.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msttcorefonts-installer.yaml b/msttcorefonts-installer.yaml
index 035f6580bf..0e35e46bcf 100644
--- a/msttcorefonts-installer.yaml
+++ b/msttcorefonts-installer.yaml
@@ -7,8 +7,8 @@ package:
     - license: GPL-2.0-or-later
   dependencies:
     runtime:
-      - wget
       - cabextract
+      - wget
 
 environment:
   contents: