[Lunar-commits] <moonbase-core> Revert "Merge pull request #273 from cavalier38/terminus-font"

Peter de Ridder peter at lunar-linux.org
Mon Apr 8 21:28:39 CEST 2013


commit 3ad5c0c7e78d08e92fd9ee6be8e81ab7f5d20a4f
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Mon, 08 Apr 2013 12:02:39 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/3ad5c0c7e78d08e92fd9ee6be8e81ab7f5d20a4f

Revert "Merge pull request #273 from cavalier38/terminus-font"

This reverts commit 97bb1bf2a6eda2d5334d741783737105bad493be, reversing
changes made to a403489831a8282063ce01f334730aa1936f8337.
---
  fonts/fontconfig/10-lunar-fonts.conf | +0/-10    
  fonts/fontconfig/BUILD               | +0/-32    
  fonts/fontconfig/CONFIGURE           | +0/-1     
  fonts/fontconfig/DEPENDS             | +0/-3     
  fonts/fontconfig/DETAILS             | +0/-21    
  fonts/fontconfig/POST_INSTALL        | +0/-9     
  fonts/freetype2/BUILD                | +0/-25    
  fonts/freetype2/DEPENDS              | +0/-2     
  fonts/freetype2/DETAILS              | +0/-18    
  fonts/freetype2/POST_INSTALL         | +0/-3     
  10 files changed, 124 deletions(-)

--- a/fonts/fontconfig/10-lunar-fonts.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- Provided by lunar to make fonts world accessable -->
-<fontconfig>
-
-<!-- Font directory list -->
-
-	<dir>/usr/lib/X11/fonts</dir>
-
-</fontconfig>
--- a/fonts/fontconfig/BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-
-  # We need to clear the cache dir or otherwise the build is going to fail
-  if [ -d /var/cache/fontconfig ] ; then
-    rm -f /var/cache/fontconfig/*
-  fi
-
-  # There is a documented issue when the user does not have a
-  # timezone set (/etc/localtime). It creates invalid XML
-  # syntax in a comment located in /etc/fonts/fonts.conf.
-  sedit "s:\`date\`::" configure  &&
-
-
-  ./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                                &&
-
-
-#  sedit "s:(BASECONFIGDIR):(CONFIGDIR):" Makefile  &&
-
-  default_make &&
-
-  install -m644 $SCRIPT_DIRECTORY/10-lunar-fonts.conf \
-                /etc/fonts/conf.d/
-
-) > $C_FIFO 2>&1
--- a/fonts/fontconfig/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery DOCS "Build docs?" n "" "--disable-docs"
--- a/fonts/fontconfig/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  sed
-depends  expat
-depends  freetype2
--- a/fonts/fontconfig/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-          MODULE=fontconfig
-         VERSION=2.10.2
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.fontconfig.org/release
-      SOURCE_VFY=sha1:3999fc8a850c3bd07c71837f0579ec66378e1ebf
-        WEB_SITE=http://www.fontconfig.org
-         ENTERED=20030425
-         UPDATED=20121130
-           SHORT="A library for configuring and customizing font access"
-
-cat << EOF
-Fontconfig is a font configuration and customization library, which
-does not depend on the X Window System.  It is designed to locate
-fonts within the system and select them according to requirements
-specified by applications.
-
-This package contains a program to maintain the fontconfig cache
-(fc-cache), a sample program to list installed fonts (fc-list),
-and a program to test the matching rules (fc-match). It also makes
-fonts managed by defoma available to fontconfig applications.
-EOF
--- a/fonts/fontconfig/POST_INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-if module_installed pango; then lin -c pango; fi
-
-# We need to make sure theres no symlinks left to rot
-if [ -h /usr/share/fonts/fonts ] ; then
-  rm -f /usr/share/fonts/fonts
-fi
-
-message "** Running fc-cache please be patient **"
-/usr/bin/fc-cache -f
--- a/fonts/freetype2/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-
-  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
-
-  sed -i -r 's:.*(#.*SYSTEM_ZLIB.*) .*:\1:' \
-    include/freetype/config/ftoption.h  &&
-
-  sed -i -r 's:.*(#.*SUBPIXEL_RENDERING.*) .*:\1:' \
-    include/freetype/config/ftoption.h  &&
-
-  sed -i -r 's:.*(#.*INCREMENTAL.*) .*:\1:' \
-    include/freetype/config/ftoption.h  &&
-
-  sed -i 's@^#define\ TT_CONFIG_OPTION_UNPATENTED_HINTING@#undef\ TT_CONFIG_OPTION_UNPATENTED_HINTING@' \
-    include/freetype/config/ftoption.h  &&
-
-  sed -i -r 's:.*(#.*USE_BZIP2.*) .*:\1:' \
-    include/freetype/config/ftoption.h  &&
-
-  sed -i 's@^#\ AUX at AUX@' modules.cfg  &&
-
-  default_build  &&
-  ln -sf /usr/include/freetype2/freetype /usr/include/freetype
-
-) > $C_FIFO 2>&1
--- a/fonts/freetype2/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-optional_depends "zlib"  "--with-zlib"  "--without-zlib"  "for zlib compression support, no=use internal zlib instead of system"
-optional_depends "bzip2" "--with-bzip2" "--without-bzip2" "for support of bzip2 compressed fonts"
--- a/fonts/freetype2/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=freetype2
-         VERSION=2.4.11
-          SOURCE=freetype-$VERSION.tar.bz2
-         SOURCE2=freetype-2.3.11-lunar.patch.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/freetype-$VERSION
-   SOURCE_URL[0]=$SFORGE_URL/freetype
-   SOURCE_URL[1]=http://savannah.nongnu.org/download/freetype
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:b15e5a0b30c1e854484b410340f6429ad1253c74
-     SOURCE2_VFY=sha1:7135d66d1495446882ec940041246712aa6145c7
-        WEB_SITE=http://www.freetype.org
-         ENTERED=20010922
-         UPDATED=20121222
-           SHORT="A free, quality, portable font engine"
-
-cat << EOF
-A Free, Quality, and Portable Font Engine.
-EOF
--- a/fonts/freetype2/POST_INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-if module_installed pango; then
-  lin -c pango
-fi




More information about the Lunar-commits mailing list