From 162dcb892a241e0b6e2a34da89ad19560f9650e4 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Fri, 26 Apr 2024 14:32:42 -0500 Subject: [PATCH] fontconfig: Change hinting back to full Signed-off-by: Reilly Brogan --- ...ji.patch => 0001-upstream-fix-emoji.patch} | 0 ...0002-Enforce-sane-defaults-for-Solus.patch | 27 -------------- .../0002-Solus-Default-font-settings.patch | 37 +++++++++++++++++++ ...figs-too-for-stateless-implementati.patch} | 0 packages/f/fontconfig/files/series | 6 +-- packages/f/fontconfig/package.yml | 4 +- packages/f/fontconfig/pspec_x86_64.xml | 13 ++++--- 7 files changed, 49 insertions(+), 38 deletions(-) rename packages/f/fontconfig/files/{upstream-fix-emoji.patch => 0001-upstream-fix-emoji.patch} (100%) delete mode 100644 packages/f/fontconfig/files/0002-Enforce-sane-defaults-for-Solus.patch create mode 100644 packages/f/fontconfig/files/0002-Solus-Default-font-settings.patch rename packages/f/fontconfig/files/{0001-Support-local-configs-too-for-stateless-implementati.patch => 0003-Support-local-configs-too-for-stateless-implementati.patch} (100%) diff --git a/packages/f/fontconfig/files/upstream-fix-emoji.patch b/packages/f/fontconfig/files/0001-upstream-fix-emoji.patch similarity index 100% rename from packages/f/fontconfig/files/upstream-fix-emoji.patch rename to packages/f/fontconfig/files/0001-upstream-fix-emoji.patch diff --git a/packages/f/fontconfig/files/0002-Enforce-sane-defaults-for-Solus.patch b/packages/f/fontconfig/files/0002-Enforce-sane-defaults-for-Solus.patch deleted file mode 100644 index 1943adae032..00000000000 --- a/packages/f/fontconfig/files/0002-Enforce-sane-defaults-for-Solus.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 71bc71bb66c85b47f8f53b705b131fc6c4361efd Mon Sep 17 00:00:00 2001 -From: Ikey Doherty -Date: Fri, 9 Dec 2016 02:38:46 +0000 -Subject: [PATCH 2/3] Enforce sane defaults for Solus - -Signed-off-by: Ikey Doherty - -fixup ---- - conf.d/60-latin.conf | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf -index ff933af..c817753 100644 ---- a/conf.d/60-latin.conf -+++ b/conf.d/60-latin.conf -@@ -35,6 +37,7 @@ - - monospace - -+ Hack - Noto Sans Mono - DejaVu Sans Mono - Inconsolata --- -2.35.4 - diff --git a/packages/f/fontconfig/files/0002-Solus-Default-font-settings.patch b/packages/f/fontconfig/files/0002-Solus-Default-font-settings.patch new file mode 100644 index 00000000000..825c08777d5 --- /dev/null +++ b/packages/f/fontconfig/files/0002-Solus-Default-font-settings.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ikey Doherty +Date: Fri, 9 Dec 2016 02:38:46 +0000 +Subject: [PATCH] Solus: Default font settings + +Changes: +- Set default monospace font to hack +- Disable bitmap fonts besides emoji ones +--- + conf.d/60-latin.conf | 1 + + conf.d/meson.build | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf +index ff933af..fd8b8cc 100644 +--- a/conf.d/60-latin.conf ++++ b/conf.d/60-latin.conf +@@ -35,6 +35,7 @@ + + monospace + ++ Hack + Noto Sans Mono + DejaVu Sans Mono + Inconsolata +diff --git a/conf.d/meson.build b/conf.d/meson.build +index b6d07ee..771fee9 100644 +--- a/conf.d/meson.build ++++ b/conf.d/meson.build +@@ -66,6 +66,7 @@ conf_links = [ + '65-fonts-persian.conf', + '65-nonlatin.conf', + '69-unifont.conf', ++ '70-no-bitmaps-except-emoji.conf', + '80-delicious.conf', + '90-synthetic.conf', + ] diff --git a/packages/f/fontconfig/files/0001-Support-local-configs-too-for-stateless-implementati.patch b/packages/f/fontconfig/files/0003-Support-local-configs-too-for-stateless-implementati.patch similarity index 100% rename from packages/f/fontconfig/files/0001-Support-local-configs-too-for-stateless-implementati.patch rename to packages/f/fontconfig/files/0003-Support-local-configs-too-for-stateless-implementati.patch diff --git a/packages/f/fontconfig/files/series b/packages/f/fontconfig/files/series index e8973368974..05fddc68c05 100644 --- a/packages/f/fontconfig/files/series +++ b/packages/f/fontconfig/files/series @@ -1,3 +1,3 @@ -0001-Support-local-configs-too-for-stateless-implementati.patch -0002-Enforce-sane-defaults-for-Solus.patch -upstream-fix-emoji.patch +0001-upstream-fix-emoji.patch +0002-Solus-Default-font-settings.patch +0003-Support-local-configs-too-for-stateless-implementati.patch diff --git a/packages/f/fontconfig/package.yml b/packages/f/fontconfig/package.yml index baab3b500dc..551c853a1e6 100644 --- a/packages/f/fontconfig/package.yml +++ b/packages/f/fontconfig/package.yml @@ -1,6 +1,6 @@ name : fontconfig version : 2.15.0 -release : 45 +release : 46 source : - https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz : 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e homepage : https://www.freedesktop.org/wiki/Software/fontconfig/ @@ -23,7 +23,7 @@ emul32 : yes setup : | %apply_patches %meson_configure \ - -Ddefault-hinting=slight \ + -Ddefault-hinting=full \ -Ddefault-sub-pixel-rendering=rgb \ -Dbaseconfig-dir=/etc/fonts \ -Dconfig-dir=/etc/fonts/conf.d diff --git a/packages/f/fontconfig/pspec_x86_64.xml b/packages/f/fontconfig/pspec_x86_64.xml index 949fe6c8240..f7e3b1c664a 100644 --- a/packages/f/fontconfig/pspec_x86_64.xml +++ b/packages/f/fontconfig/pspec_x86_64.xml @@ -76,7 +76,7 @@ /usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf /usr/share/fontconfig/conf.avail/80-delicious.conf /usr/share/fontconfig/conf.avail/90-synthetic.conf - /usr/share/fonts/conf.d/10-hinting-slight.conf + /usr/share/fonts/conf.d/10-hinting-full.conf /usr/share/fonts/conf.d/10-scale-bitmap-fonts.conf /usr/share/fonts/conf.d/10-sub-pixel-rgb.conf /usr/share/fonts/conf.d/10-yes-antialias.conf @@ -95,6 +95,7 @@ /usr/share/fonts/conf.d/65-fonts-persian.conf /usr/share/fonts/conf.d/65-nonlatin.conf /usr/share/fonts/conf.d/69-unifont.conf + /usr/share/fonts/conf.d/70-no-bitmaps-except-emoji.conf /usr/share/fonts/conf.d/80-delicious.conf /usr/share/fonts/conf.d/90-synthetic.conf /usr/share/fonts/conf.d/README @@ -126,7 +127,7 @@ emul32 - fontconfig + fontconfig /usr/lib32/libfontconfig.so.1 @@ -140,8 +141,8 @@ programming.devel - fontconfig-devel - fontconfig-32bit + fontconfig-32bit + fontconfig-devel /usr/lib32/libfontconfig.so @@ -155,7 +156,7 @@ programming.devel - fontconfig + fontconfig /usr/include/fontconfig/fcfreetype.h @@ -385,7 +386,7 @@ - + 2024-04-26 2.15.0 Packaging update