summaryrefslogtreecommitdiffstats
path: root/source/x/fontconfig
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/x/fontconfig
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
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 5feb6fd90..bb3b192f5 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 af71a44bd..6edcfd37b 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>