Commit 54966f09 authored by Giuseppe's avatar Giuseppe

fontconfig-ubuntu: added Ubuntu's patches and tweaks

parent 6b4cd7a0
diff -Naur fontconfig-2.10.93-orig/conf.d/40-nonlatin.conf fontconfig-2.10.93/conf.d/40-nonlatin.conf
--- fontconfig-2.10.93-orig/conf.d/40-nonlatin.conf 2012-07-24 04:01:32.000000000 +0200
+++ fontconfig-2.10.93/conf.d/40-nonlatin.conf 2013-10-15 10:47:48.750756551 +0200
@@ -161,6 +161,10 @@
<default><family>sans-serif</family></default>
</alias>
<alias>
+ <family>MgOpen Moderna</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Sazanami Gothic</family>
<default><family>sans-serif</family></default>
</alias>
diff -Naur fontconfig-2.10.93-orig/conf.d/60-latin.conf fontconfig-2.10.93/conf.d/60-latin.conf
--- fontconfig-2.10.93-orig/conf.d/60-latin.conf 2012-02-20 04:49:18.000000000 +0100
+++ fontconfig-2.10.93/conf.d/60-latin.conf 2013-10-15 10:49:30.631665827 +0200
@@ -4,8 +4,8 @@
<alias>
<family>serif</family>
<prefer>
- <family>Bitstream Vera Serif</family>
<family>DejaVu Serif</family>
+ <family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
<family>Thorndale AMT</family>
<family>Luxi Serif</family>
@@ -16,8 +16,8 @@
<alias>
<family>sans-serif</family>
<prefer>
- <family>Bitstream Vera Sans</family>
<family>DejaVu Sans</family>
+ <family>Bitstream Vera Sans</family>
<family>Verdana</family>
<family>Arial</family>
<family>Albany AMT</family>
@@ -32,8 +32,8 @@
<alias>
<family>monospace</family>
<prefer>
- <family>Bitstream Vera Sans Mono</family>
<family>DejaVu Sans Mono</family>
+ <family>Bitstream Vera Sans Mono</family>
<family>Inconsolata</family>
<family>Andale Mono</family>
<family>Courier New</family>
diff -Naur fontconfig-2.10.93-orig/conf.d/Makefile.am fontconfig-2.10.93/conf.d/Makefile.am
--- fontconfig-2.10.93-orig/conf.d/Makefile.am 2013-05-13 05:10:36.000000000 +0200
+++ fontconfig-2.10.93/conf.d/Makefile.am 2013-10-15 10:51:35.120538833 +0200
@@ -26,6 +26,9 @@
DOC_FILES = $(DOC_SOURCES:.in=)
CONF_LINKS = \
+ 10-antialias.conf \
+ 10-hinting.conf \
+ 10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
@@ -50,7 +53,12 @@
templatedir = $(TEMPLATEDIR)
template_DATA = \
+ 10-antialias.conf \
10-autohint.conf \
+ 10-hinting.conf \
+ 10-hinting-full.conf \
+ 10-hinting-medium.conf \
+ 10-hinting-slight.conf \
10-no-sub-pixel.conf \
10-scale-bitmap-fonts.conf \
10-sub-pixel-bgr.conf \
@@ -70,6 +78,7 @@
49-sansserif.conf \
50-user.conf \
51-local.conf \
+ 53-monospace-lcd-filter.conf \
60-latin.conf \
65-fonts-persian.conf \
65-khmer.conf \
diff -Naur fontconfig-2.10.93-orig/conf.d/Makefile.in fontconfig-2.10.93/conf.d/Makefile.in
--- fontconfig-2.10.93-orig/conf.d/Makefile.in 2013-05-20 10:44:34.000000000 +0200
+++ fontconfig-2.10.93/conf.d/Makefile.in 2013-10-15 10:53:15.250573207 +0200
@@ -300,6 +300,9 @@
DOC_SOURCES = README.in
DOC_FILES = $(DOC_SOURCES:.in=)
CONF_LINKS = \
+ 10-antialias.conf \
+ 10-hinting.conf \
+ 10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
@@ -320,7 +323,12 @@
CLEANFILES = $(DOC_FILES)
config_DATA = $(DOC_FILES)
template_DATA = \
+ 10-antialias.conf \
10-autohint.conf \
+ 10-hinting.conf \
+ 10-hinting-full.conf \
+ 10-hinting-medium.conf \
+ 10-hinting-slight.conf \
10-no-sub-pixel.conf \
10-scale-bitmap-fonts.conf \
10-sub-pixel-bgr.conf \
@@ -340,6 +348,7 @@
49-sansserif.conf \
50-user.conf \
51-local.conf \
+ 53-monospace-lcd-filter.conf \
60-latin.conf \
65-fonts-persian.conf \
65-khmer.conf \
From: Jinkyu Yi <jincreator@jincreator.net>
Description: add Nanum fonts, fix Baekmuk missing, fix monospace priority
Bug: https://bugs.freedesktop/org/42423
Bug-Ubuntu: https://launchpad.net/bugs/792471
Origin: https://bugs.freedesktop.org/attachment.cgi?id=56872
Author: Jinkyu Yi <jincreator@jincreator.net>
Index: fontconfig-2.10.1/conf.d/40-nonlatin.conf
===================================================================
--- fontconfig-2.10.1.orig/conf.d/40-nonlatin.conf 2012-08-02 22:28:09.226578434 +0200
+++ fontconfig-2.10.1/conf.d/40-nonlatin.conf 2012-08-02 22:28:09.246578435 +0200
@@ -62,6 +62,10 @@
<default><family>serif</family></default>
</alias>
<alias>
+ <family>NanumMyeongjo</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>UnBatang</family>
<default><family>serif</family></default>
</alias>
@@ -90,6 +94,10 @@
<default><family>serif</family></default>
</alias>
<alias>
+ <family>Baekmuk Gulim</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>SimSun</family>
<default><family>serif</family></default>
</alias>
Index: fontconfig-2.10.1/conf.d/53-monospace-lcd-filter.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/53-monospace-lcd-filter.conf 2012-08-02 22:28:09.262578436 +0200
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/monospace-lcd-filter.conf -->
+<fontconfig>
+<!-- Use legacy LCD filter on smaller Monospace fonts -->
+ <match target="font">
+ <test name="family">
+ <string>DejaVu Sans Mono</string>
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <test name="pixelsize" compare="less_eq">
+ <double>12.0</double>
+ </test>
+
+ <edit name="lcd_filter" mode="assign">
+ <const>lcdlegacy</const>
+ </edit>
+ <edit name="hintstyle" mode="assign">
+ <const>hintfull</const>
+ </edit>
+ </match>
+</fontconfig>
Index: fontconfig-2.10.1/src/fcname.c
===================================================================
--- fontconfig-2.10.1.orig/src/fcname.c 2012-07-24 04:01:32.000000000 +0200
+++ fontconfig-2.10.1/src/fcname.c 2012-08-02 22:28:09.282578437 +0200
@@ -453,6 +453,7 @@
{ (FcChar8 *) "lcddefault", "lcdfilter", FC_LCD_DEFAULT },
{ (FcChar8 *) "lcdlight", "lcdfilter", FC_LCD_LIGHT },
{ (FcChar8 *) "lcdlegacy", "lcdfilter", FC_LCD_LEGACY },
+ { (FcChar8 *) "lcdfilterlegacy", "lcdfilter", FC_LCD_LEGACY },
};
#define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
Index: fontconfig-2.10.1/conf.d/10-antialias.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/10-antialias.conf 2012-08-02 22:28:09.298578437 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Use the Antialiasing -->
+ <match target="font">
+ <edit name="antialias" mode="assign"><bool>true</bool></edit>
+ </match>
+</fontconfig>
Index: fontconfig-2.10.1/conf.d/10-hinting.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/10-hinting.conf 2012-08-02 22:28:09.298578437 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Use Hinting -->
+ <match target="font">
+ <edit name="hinting" mode="assign"><bool>true</bool></edit>
+ </match>
+</fontconfig>
Index: fontconfig-2.10.1/conf.d/10-hinting-full.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/10-hinting-full.conf 2012-08-02 22:28:09.298578437 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Use Full Hinting -->
+ <match target="font">
+ <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
+ </match>
+</fontconfig>
Index: fontconfig-2.10.1/conf.d/10-hinting-medium.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/10-hinting-medium.conf 2012-08-02 22:28:09.298578437 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Use Medium Hinting -->
+ <match target="font">
+ <edit name="hintstyle" mode="assign"><const>hintmedium</const></edit>
+ </match>
+</fontconfig>
Index: fontconfig-2.10.1/conf.d/10-hinting-slight.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ fontconfig-2.10.1/conf.d/10-hinting-slight.conf 2012-08-02 22:28:09.298578437 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Use Slight Hinting -->
+ <match target="font">
+ <edit name="hintstyle" mode="assign"><const>hintslight</const></edit>
+ </match>
+</fontconfig>
diff -Naur fontconfig-2.10.93-orig/conf.d/Makefile.am fontconfig-2.10.93/conf.d/Makefile.am
--- fontconfig-2.10.93-orig/conf.d/Makefile.am 2013-10-15 11:03:19.557640594 +0200
+++ fontconfig-2.10.93/conf.d/Makefile.am 2013-10-15 11:01:17.398166118 +0200
@@ -30,6 +30,7 @@
10-hinting.conf \
10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
+ 11-lcdfilter-default.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
30-metric-aliases.conf \
diff -Naur fontconfig-2.10.93-orig/conf.d/Makefile.in fontconfig-2.10.93/conf.d/Makefile.in
--- fontconfig-2.10.93-orig/conf.d/Makefile.in 2013-10-15 11:03:19.557640594 +0200
+++ fontconfig-2.10.93/conf.d/Makefile.in 2013-10-15 11:02:37.945081593 +0200
@@ -304,6 +304,7 @@
10-hinting.conf \
10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
+ 11-lcdfilter-default.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
30-metric-aliases.conf \
Index: fontconfig-2.10.1/conf.d/Makefile.am
===================================================================
--- fontconfig-2.10.1.orig/conf.d/Makefile.am 2012-08-02 22:28:09.318578438 +0200
+++ fontconfig-2.10.1/conf.d/Makefile.am 2012-08-02 22:28:09.334578439 +0200
@@ -41,6 +41,7 @@
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmaps.conf \
80-delicious.conf \
90-synthetic.conf
Index: fontconfig-2.10.1/conf.d/Makefile.in
===================================================================
--- fontconfig-2.10.1.orig/conf.d/Makefile.in 2012-08-02 22:28:09.318578438 +0200
+++ fontconfig-2.10.1/conf.d/Makefile.in 2012-08-02 22:28:09.338578439 +0200
@@ -276,6 +276,7 @@
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmaps.conf \
80-delicious.conf \
90-synthetic.conf
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig/>
#
# Apps Packages for Chakra, part of chakra-project.org
#
# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves gmail.com>
# Contributor: Paul Bredbury <brebs@sent.com>
# Contributor: Biru Ionut <biru.ionut at gmail.com>
# Contributor: Andrea Fagiani <andfagiani {at} gmail {dot} com>
# Maintainer: Giuseppe Calà <jiveaxe@gmail.com>
pkgname=fontconfig-ubuntu
_pkgname=fontconfig
<<<<<<< HEAD
pkgname=$_pkgname-ubuntu
=======
>>>>>>> 6b4cd7a001aa3f8e380d4292040f28c89821ed82
pkgver=2.10.93
_pkgver=$pkgver-2ubuntu1
pkgrel=1
pkgrel=2
pkgdesc="A library for configuring and customizing font access, with Ubuntu's LCD rendering patches."
arch=('x86_64')
url="http://packages.ubuntu.com/lucid/fontconfig"
......@@ -20,6 +20,41 @@ conflicts=($_pkgname)
provides=("$_pkgname=$pkgver")
options=('!libtool')
install=fontconfig.install
<<<<<<< HEAD
source=(http://archive.ubuntu.com/ubuntu/pool/main/f/$_pkgname/${_pkgname}_$pkgver.orig.tar.bz2
00_old_diff_gz.patch
01_fonts_nanum.patch
04_ubuntu_monospace_lcd_filter_conf.patch
05_lcdfilterlegacy.patch
05_ubuntu_add_hinting_and_antialiasing_confs.patch
06_ubuntu_lcddefault.patch
07_no_bitmaps.patch
70-yes-bitmaps.conf)
md5sums=('0f8e5c63c2d6931626185c02802375a3'
'ac9453d43dc7fc75b8ddc0d46681bd62'
'280253acebdb15c75d65f491cad5ad69'
'2ba467103536560e79278db7be33770d'
'6383b5569af71c11019c377c3594dbd9'
'508a1a638082c6c33d2ab8e724e16596'
'b0217eec55ef504e9c8740ec368b734f'
'0695f64eff965df2500dc12f0fd21ad2'
'91c414090c7d8bfe557785fe845cb6bd')
build() {
cd $srcdir/$_pkgname-$pkgver
# apply ubuntu patches
patch -Np1 -i ../00_old_diff_gz.patch
patch -Np1 -i ../01_fonts_nanum.patch
patch -Np1 -i ../04_ubuntu_monospace_lcd_filter_conf.patch
patch -Np1 -i ../05_lcdfilterlegacy.patch
patch -Np1 -i ../05_ubuntu_add_hinting_and_antialiasing_confs.patch
patch -Np1 -i ../06_ubuntu_lcddefault.patch
patch -Np1 -i ../07_no_bitmaps.patch
libtoolize -f
autoreconf -fi
=======
source=(http://archive.ubuntu.com/ubuntu/pool/main/f/$_pkgname/${_pkgname}_$pkgver.orig.tar.bz2)
md5sums=('0f8e5c63c2d6931626185c02802375a3')
......@@ -28,12 +63,17 @@ build() {
# Enable Position Independent Code for prelinking
export CFLAGS="${CFLAGS} -fPIC"
>>>>>>> 6b4cd7a001aa3f8e380d4292040f28c89821ed82
# Configure and build.
./configure \
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-templatedir=/etc/fonts/conf.avail \
--with-xmldir=/etc/fonts \
--localstatedir=/var \
--prefix=/usr \
--sysconfdir=/etc
--disable-static \
--with-default-fonts=/usr/share/fonts \
--with-add-fonts=/usr/share/fonts
make
}
......@@ -42,14 +82,24 @@ package() {
# Installation.
make DESTDIR=$pkgdir install
# use ubuntu 70-yes-bitmaps.conf
mv ${pkgdir}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${pkgdir}/etc/fonts/conf.avail/70-force-bitmaps.conf
install -m644 "${srcdir}/70-yes-bitmaps.conf" "${pkgdir}/etc/fonts/conf.avail"
# Remove configuration files.
rm -f ${pkgdir}/etc/fonts/conf.d/*.conf
# Ubuntu not installs 10-scale-bitmap-fonts.conf
rm ${pkgdir}/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
# License.
install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/license.txt
<<<<<<< HEAD
=======
# Documentation.
install -Dm0644 $srcdir/$_pkgname-$pkgver/ChangeLog $pkgdir/usr/share/doc/$pkgname/ChangeLog
>>>>>>> 6b4cd7a001aa3f8e380d4292040f28c89821ed82
}
configs=('10-antialias.conf'
'10-hinting.conf'
'10-hinting-slight.conf'
'11-lcd-filter-lcddefault.conf'
'20-fix-globaladvance.conf'
'10-hinting.conf'
'10-hinting-slight.conf'
'11-lcdfilter-default.conf'
'20-unhint-small-vera.conf'
'25-ttf-arphic-uming-render.conf'
'30-cjk-aliases.conf'
'30-defoma.conf'
'30-metric-aliases.conf'
'30-urw-aliases.conf'
'35-ttf-arphic-uming-aliases.conf'
'40-nonlatin.conf'
'41-ttf-arphic-uming.conf'
'45-latin.conf'
'49-sansserif.conf'
'50-user.conf'
'51-local.conf'
'53-monospace-lcd-filter.conf'
'51-local.conf'
'60-latin.conf'
'64-ttf-arphic-uming.conf'
'64-ttf-thai-tlwg.conf'
'65-fonts-persian.conf'
'65-khmer.conf'
'65-nonlatin.conf'
'69-unifont.conf'
'70-no-bitmaps.conf'
'80-delicious.conf'
'90-synthetic.conf'
'90-ttf-arphic-uming-embolden.conf'
'90-ttf-thai-tlwg-synthetic.conf')
'90-synthetic.conf')
post_install() {
echo -n "updating font cache... "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment