[Lunar-commits] <moonbase-xorg> Merge pull request #63 from Florin65/font

[Auke Kok]

commit bba1738e4727e035203366fec04336e1f38ccc67
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Tue, 04 Dec 2012 04:25:56 -0800
URL: https://github.com/lunar-linux/moonbase-xorg/commit/bba1738e4727e035203366fec04336e1f38ccc67

Merge pull request #63 from Florin65/font

fontconfig: version bumped to 2.10.2.
---
  fontconfig/BUILD   | +17/-10   
  fontconfig/DETAILS | +5/-5     
  2 files changed

--- a/fontconfig/BUILD
+++ b/fontconfig/BUILD
@@ -6,20 +6,27 @@
   fi
 
   # There is a documented issue when the user does not have a
-  # timezone set (/etc/localtime).  It creates invalid XML
+  # timezone set (/etc/localtime). It creates invalid XML
   # syntax in a comment located in /etc/fonts/fonts.conf.
-  sedit "s:\`date\`::" configure                    &&
+  sedit "s:\`date\`::" configure  &&
 
 
-  ./configure --prefix=/usr                          \
-              --with-confdir=/etc/fonts              \
-              --disable-static                       \
-              --with-cache-dir=/var/cache/fontconfig \
-              $OPTS                                 &&
+  ./configure --prefix=/usr     \
+              --sysconfdir=/etc \
+              --with-templatedir=/etc/fonts/conf.avail \
+              --with-xmldir=/etc/fonts \
+              --localstatedir=/var     \
+              --disable-static         \
+              --with-default-fonts=/usr/share/fonts \
+              --with-add-fonts=/usr/share/fonts     \
+              $OPTS                                &&
 
-   default_make &&
 
-   install -m644 $SCRIPT_DIRECTORY/10-lunar-fonts.conf \
-                 /etc/fonts/conf.d/
+#  sedit "s:(BASECONFIGDIR):(CONFIGDIR):" Makefile  &&
+
+  default_make &&
+
+  install -m644 $SCRIPT_DIRECTORY/10-lunar-fonts.conf \
+                /etc/fonts/conf.d/
 
 ) > $C_FIFO 2>&1
--- a/fontconfig/DETAILS
+++ b/fontconfig/DETAILS
@@ -1,11 +1,11 @@
           MODULE=fontconfig
-         VERSION=2.8.0
+         VERSION=2.10.2
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.fontconfig.org/release/
-      SOURCE_VFY=sha1:570fb55eb14f2c92a7b470b941e9d35dbfafa716
-        WEB_SITE=http://www.fontconfig.org/
+      SOURCE_URL=http://www.fontconfig.org/release
+      SOURCE_VFY=sha1:3999fc8a850c3bd07c71837f0579ec66378e1ebf
+        WEB_SITE=http://www.fontconfig.org
          ENTERED=20030425
-         UPDATED=20100214
+         UPDATED=20121130
            SHORT="A library for configuring and customizing font access"
 
 cat << EOF