fontconfig: Change hinting back to full

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
getsolus · Apr 26, 2024 · 162dcb8 · 162dcb8
1 parent 99b5401
commit 162dcb8
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 38 deletions.
diff --git a/...fontconfig/files/upstream-fix-emoji.patch → ...onfig/files/0001-upstream-fix-emoji.patch b/...fontconfig/files/upstream-fix-emoji.patch → ...onfig/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
diff --git a/packages/f/fontconfig/files/0002-Solus-Default-font-settings.patch 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 <ikey@solus-project.com>
+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 @@
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Hack</family>
+ 			<family>Noto Sans Mono</family>
+ 			<family>DejaVu Sans Mono</family>
+ 			<family>Inconsolata</family>
+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/...figs-too-for-stateless-implementati.patch → ...figs-too-for-stateless-implementati.patch b/...figs-too-for-stateless-implementati.patch → ...figs-too-for-stateless-implementati.patch
diff --git 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
@@ -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
@@ -76,7 +76,7 @@
             <Path fileType="data">/usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf</Path>
             <Path fileType="data">/usr/share/fontconfig/conf.avail/80-delicious.conf</Path>
             <Path fileType="data">/usr/share/fontconfig/conf.avail/90-synthetic.conf</Path>
-            <Path fileType="data">/usr/share/fonts/conf.d/10-hinting-slight.conf</Path>
+            <Path fileType="data">/usr/share/fonts/conf.d/10-hinting-full.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/10-scale-bitmap-fonts.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/10-sub-pixel-rgb.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/10-yes-antialias.conf</Path>
@@ -95,6 +95,7 @@
             <Path fileType="data">/usr/share/fonts/conf.d/65-fonts-persian.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/65-nonlatin.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/69-unifont.conf</Path>
+            <Path fileType="data">/usr/share/fonts/conf.d/70-no-bitmaps-except-emoji.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/80-delicious.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/90-synthetic.conf</Path>
             <Path fileType="data">/usr/share/fonts/conf.d/README</Path>
@@ -126,7 +127,7 @@
 </Description>
         <PartOf>emul32</PartOf>
         <RuntimeDependencies>
-            <Dependency release="45">fontconfig</Dependency>
+            <Dependency release="46">fontconfig</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libfontconfig.so.1</Path>
@@ -140,8 +141,8 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="45">fontconfig-devel</Dependency>
-            <Dependency release="45">fontconfig-32bit</Dependency>
+            <Dependency release="46">fontconfig-32bit</Dependency>
+            <Dependency release="46">fontconfig-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libfontconfig.so</Path>
@@ -155,7 +156,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="45">fontconfig</Dependency>
+            <Dependency release="46">fontconfig</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/fontconfig/fcfreetype.h</Path>
@@ -385,7 +386,7 @@
         </Files>
     </Package>
     <History>
-        <Update release="45">
+        <Update release="46">
             <Date>2024-04-26</Date>
             <Version>2.15.0</Version>
             <Comment>Packaging update</Comment>