muon build fixes

2 files changed, 56 insertions, 52 deletions

diff --git a/repos/extra/fontconfig/.files b/repos/extra/fontconfig/.files
index 8823f492..fe716e44 100644
--- a/repos/extra/fontconfig/.files
+++ b/repos/extra/fontconfig/.files
@@ -24,8 +24,8 @@ lrwxrwxrwx root/root    etc/fonts/conf.d/69-unifont.conf -> ../../../usr/share/f
 lrwxrwxrwx root/root    etc/fonts/conf.d/70-no-bitmaps-except-emoji.conf -> ../../../usr/share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf
 lrwxrwxrwx root/root    etc/fonts/conf.d/80-delicious.conf -> ../../../usr/share/fontconfig/conf.avail/80-delicious.conf
 lrwxrwxrwx root/root    etc/fonts/conf.d/90-synthetic.conf -> ../../../usr/share/fontconfig/conf.avail/90-synthetic.conf
--rw-r--r-- root/root    etc/fonts/conf.d/README.new
--rw-r--r-- root/root    etc/fonts/fonts.conf.new
+-rw-rw-r-- root/root    etc/fonts/conf.d/README.new
+-rw-rw-r-- root/root    etc/fonts/fonts.conf.new
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/fc-cache
@@ -40,9 +40,9 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/fc-validate
 drwxr-xr-x root/root    usr/include/
 drwxr-xr-x root/root    usr/include/fontconfig/
--rw-r--r-- root/root    usr/include/fontconfig/fcfreetype.h
--rw-r--r-- root/root    usr/include/fontconfig/fcprivate.h
--rw-r--r-- root/root    usr/include/fontconfig/fontconfig.h
+-rw-rw-r-- root/root    usr/include/fontconfig/fcfreetype.h
+-rw-rw-r-- root/root    usr/include/fontconfig/fcprivate.h
+-rw-rw-r-- root/root    usr/include/fontconfig/fontconfig.h
 drwxr-xr-x root/root    usr/lib/
 lrwxrwxrwx root/root    usr/lib/libfontconfig.so -> libfontconfig.so.1
 lrwxrwxrwx root/root    usr/lib/libfontconfig.so.1 -> libfontconfig.so.1.17.0
@@ -52,57 +52,57 @@ drwxr-xr-x root/root    usr/lib/pkgconfig/
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/fontconfig/
 drwxr-xr-x root/root    usr/share/fontconfig/conf.avail/
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/05-reset-dirs-sample.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-autohint.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-full.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-medium.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-none.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-slight.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-no-antialias.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-none.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-unhinted.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/10-yes-antialias.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-none.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/30-metric-aliases.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/05-reset-dirs-sample.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-autohint.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-full.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-medium.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-none.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-hinting-slight.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-no-antialias.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-none.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-unhinted.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/10-yes-antialias.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/11-lcdfilter-none.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/30-metric-aliases.conf
 -rw-r--r-- root/root    usr/share/fontconfig/conf.avail/35-lang-normalize.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/40-nonlatin.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/45-generic.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/45-latin.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/48-guessfamily.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/48-spacing.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/49-sansserif.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/50-user.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/51-local.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/60-generic.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/60-latin.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/65-fonts-persian.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/65-khmer.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/65-nonlatin.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/69-unifont.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps-and-emoji.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/80-delicious.conf
--rw-r--r-- root/root    usr/share/fontconfig/conf.avail/90-synthetic.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/40-nonlatin.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/45-generic.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/45-latin.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/48-guessfamily.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/48-spacing.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/49-sansserif.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/50-user.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/51-local.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/60-generic.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/60-latin.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/65-fonts-persian.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/65-khmer.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/65-nonlatin.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/69-unifont.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps-and-emoji.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/80-delicious.conf
+-rw-rw-r-- root/root    usr/share/fontconfig/conf.avail/90-synthetic.conf
 drwxr-xr-x root/root    usr/share/gettext/
 drwxr-xr-x root/root    usr/share/gettext/its/
--rw-r--r-- root/root    usr/share/gettext/its/fontconfig.its
--rw-r--r-- root/root    usr/share/gettext/its/fontconfig.loc
+-rw-rw-r-- root/root    usr/share/gettext/its/fontconfig.its
+-rw-rw-r-- root/root    usr/share/gettext/its/fontconfig.loc
 drwxr-xr-x root/root    usr/share/xml/
 drwxr-xr-x root/root    usr/share/xml/fontconfig/
--rw-r--r-- root/root    usr/share/xml/fontconfig/fonts.dtd
+-rw-rw-r-- root/root    usr/share/xml/fontconfig/fonts.dtd
 drwxr-xr-x root/root    var/
 drwxr-xr-x root/root    var/cache/
 drwxr-xr-x root/root    var/cache/fontconfig/
diff --git a/repos/extra/fontconfig/abuild b/repos/extra/fontconfig/abuild
index 334736ad..8b45c02d 100644
--- a/repos/extra/fontconfig/abuild
+++ b/repos/extra/fontconfig/abuild
@@ -2,4 +2,8 @@ name=fontconfig
 version=2.18.1
 release=1
 source="https://gitlab.freedesktop.org/${name}/${name}/-/archive/${version}/${name}-${version}.tar.gz"
-build_opt="-Dtests=disabled"
+build_opt="-Dtests=disabled -Dnls=disabled"
+
+prebuild() {
+	sed -i "/meson_version/d" meson.build
+}