summaryrefslogtreecommitdiff
path: root/source/x/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/fontconfig')
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild1
-rw-r--r--source/x/fontconfig/fontconfig.dejavu.diff103
2 files changed, 65 insertions, 39 deletions
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 5feb6fd9..bb3b192f 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -87,6 +87,7 @@ CFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
+ --enable-static=no \
--build=$ARCH-slackware-linux
# Uses a currently non-functional sgml tool, thus '-i':
diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff
index af71a44b..6edcfd37 100644
--- a/source/x/fontconfig/fontconfig.dejavu.diff
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -1,42 +1,5 @@
-diff -Nur fontconfig-2.8.0.orig/conf.d/45-latin.conf fontconfig-2.8.0/conf.d/45-latin.conf
---- fontconfig-2.8.0.orig/conf.d/45-latin.conf 2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/45-latin.conf 2009-12-01 21:45:42.639936724 -0600
-@@ -10,9 +10,9 @@
- Serif faces
- -->
- <alias>
-- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
- <family>Liberation Serif</family>
-+ <family>Bitstream Vera Serif</family>
- <family>Times New Roman</family>
- <family>Times</family>
- <family>Nimbus Roman No9 L</family>
-@@ -25,9 +25,9 @@
- Sans-serif faces
- -->
- <alias>
-- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
- <family>Liberation Sans</family>
-+ <family>Bitstream Vera Sans</family>
- <family>Arial</family>
- <family>Helvetica</family>
- <family>Verdana</family>
-@@ -41,9 +41,9 @@
- Monospace faces
- -->
- <alias>
-- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- <family>Liberation Mono</family>
-+ <family>Bitstream Vera Sans Mono</family>
- <family>Inconsolata</family>
- <family>Courier New</family>
- <family>Courier</family>
-diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf
---- fontconfig-2.8.0.orig/conf.d/60-latin.conf 2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/60-latin.conf 2009-12-01 21:46:39.925935327 -0600
+--- ./conf.d/60-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/60-latin.conf 2012-07-03 15:57:40.109978298 -0500
@@ -4,8 +4,8 @@
<alias>
<family>serif</family>
@@ -67,3 +30,65 @@ diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-
<family>Inconsolata</family>
<family>Andale Mono</family>
<family>Courier New</family>
+--- ./conf.d/45-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/45-latin.conf 2012-07-03 15:57:28.685978786 -0500
+@@ -10,15 +10,15 @@
+ Serif faces
+ -->
+ <alias>
+- <family>Bitstream Vera Serif</family>
++ <family>DejaVu Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+- <family>DejaVu Serif</family>
++ <family>Liberation Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+- <family>Liberation Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+@@ -49,15 +49,15 @@
+ Sans-serif faces
+ -->
+ <alias>
+- <family>Bitstream Vera Sans</family>
++ <family>DejaVu Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+- <family>DejaVu Sans</family>
++ <family>Liberation Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+- <family>Liberation Sans</family>
++ <family>Bitstream Vera Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+@@ -91,10 +91,6 @@
+ <!--
+ Monospace faces
+ -->
+- <alias>
+- <family>Bitstream Vera Sans Mono</family>
+- <default><family>monospace</family></default>
+- </alias>
+ <alias>
+ <family>DejaVu Sans Mono</family>
+ <default><family>monospace</family></default>
+@@ -103,6 +99,10 @@
+ <family>Liberation Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
++ <alias>
++ <family>Bitstream Vera Sans Mono</family>
++ <default><family>monospace</family></default>
++ </alias>
+ <alias>
+ <family>Inconsolata</family>
+ <default><family>monospace</family></default>