[arch-commits] Commit in fontconfig/repos (14 files)
Jan Steffens
heftig at archlinux.org
Sat Aug 6 10:59:10 UTC 2016
Date: Saturday, August 6, 2016 @ 10:59:10
Author: heftig
Revision: 273391
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
fontconfig/repos/extra-i686/52-emoji.conf
(from rev 273390, fontconfig/trunk/52-emoji.conf)
fontconfig/repos/extra-i686/PKGBUILD
(from rev 273390, fontconfig/trunk/PKGBUILD)
fontconfig/repos/extra-i686/fontconfig.install
(from rev 273390, fontconfig/trunk/fontconfig.install)
fontconfig/repos/extra-x86_64/52-emoji.conf
(from rev 273390, fontconfig/trunk/52-emoji.conf)
fontconfig/repos/extra-x86_64/PKGBUILD
(from rev 273390, fontconfig/trunk/PKGBUILD)
fontconfig/repos/extra-x86_64/fontconfig.install
(from rev 273390, fontconfig/trunk/fontconfig.install)
Deleted:
fontconfig/repos/extra-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
fontconfig/repos/extra-i686/0002-Update-aliases-for-new-URW-fonts.patch
fontconfig/repos/extra-i686/PKGBUILD
fontconfig/repos/extra-i686/fontconfig.install
fontconfig/repos/extra-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
fontconfig/repos/extra-x86_64/0002-Update-aliases-for-new-URW-fonts.patch
fontconfig/repos/extra-x86_64/PKGBUILD
fontconfig/repos/extra-x86_64/fontconfig.install
----------------------------------------------------------------------------+
/PKGBUILD | 110 ++++++++++
/fontconfig.install | 80 +++++++
extra-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch | 43 ---
extra-i686/0002-Update-aliases-for-new-URW-fonts.patch | 49 ----
extra-i686/52-emoji.conf | 35 +++
extra-i686/PKGBUILD | 66 ------
extra-i686/fontconfig.install | 40 ---
extra-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch | 43 ---
extra-x86_64/0002-Update-aliases-for-new-URW-fonts.patch | 49 ----
extra-x86_64/52-emoji.conf | 35 +++
extra-x86_64/PKGBUILD | 66 ------
extra-x86_64/fontconfig.install | 40 ---
12 files changed, 260 insertions(+), 396 deletions(-)
Deleted: extra-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
===================================================================
--- extra-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,43 +0,0 @@
-From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Fri, 3 Oct 2014 12:26:42 +0900
-Subject: Revert "Bug 73291 - poppler does not show fl ligature"
-
-This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7.
-
-This issue has been fixed in poppler and we no longer need to patch it out in fontconfig.
-
-diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
-index 08c8ba3..49a9602 100644
---- a/conf.d/30-metric-aliases.conf
-+++ b/conf.d/30-metric-aliases.conf
-@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps:
- </default>
- </alias>
-
--<!--
-- Due to Bug#73291, commented out those lines until the broken font are fixed.
- <alias binding="same">
- <family>TeX Gyre Termes</family>
- <default>
- <family>Times</family>
- </default>
- </alias>
---->
-
- <alias binding="same">
- <family>Nimbus Mono L</family>
-@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps:
- <alias binding="same">
- <family>Times</family>
- <accept>
--<!--
-- Due to Bug#73291, commented out this line until the broken font are fixed.
- <family>TeX Gyre Termes</family>
---->
- <family>Nimbus Roman No9 L</family>
- </accept>
- </alias>
---
-cgit v0.10.2
-
Deleted: extra-i686/0002-Update-aliases-for-new-URW-fonts.patch
===================================================================
--- extra-i686/0002-Update-aliases-for-new-URW-fonts.patch 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-i686/0002-Update-aliases-for-new-URW-fonts.patch 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,49 +0,0 @@
-From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Thu, 6 Nov 2014 13:15:09 +0900
-Subject: Update aliases for new URW fonts
-
-Patch from Tom Yan
-
-https://bugs.freedesktop.org/show_bug.cgi?id=85225
-
-diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
-index 996fb81..72490f3 100644
---- a/conf.d/45-latin.conf
-+++ b/conf.d/45-latin.conf
-@@ -34,6 +34,10 @@
- <default><family>serif</family></default>
- </alias>
- <alias>
-+ <family>Nimbus Roman</family>
-+ <default><family>serif</family></default>
-+ </alias>
-+ <alias>
- <family>Luxi Serif</family>
- <default><family>serif</family></default>
- </alias>
-@@ -97,6 +101,10 @@
- <default><family>sans-serif</family></default>
- </alias>
- <alias>
-+ <family>Nimbus Sans</family>
-+ <default><family>sans-serif</family></default>
-+ </alias>
-+ <alias>
- <family>Luxi Sans</family>
- <default><family>sans-serif</family></default>
- </alias>
-@@ -151,6 +159,10 @@
- <family>Nimbus Mono L</family>
- <default><family>monospace</family></default>
- </alias>
-+ <alias>
-+ <family>Nimbus Mono</family>
-+ <default><family>monospace</family></default>
-+ </alias>
- <!--
- Fantasy faces
- -->
---
-cgit v0.10.2
-
Copied: fontconfig/repos/extra-i686/52-emoji.conf (from rev 273390, fontconfig/trunk/52-emoji.conf)
===================================================================
--- extra-i686/52-emoji.conf (rev 0)
+++ extra-i686/52-emoji.conf 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias binding="strong">
+ <family>serif</family>
+ <prefer>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </prefer>
+ </alias>
+ <alias binding="strong">
+ <family>sans-serif</family>
+ <prefer>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <accept>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </accept>
+ </alias>
+</fontconfig>
+<!-- vim:set ft=xml sw=8 noet: -->
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-i686/PKGBUILD 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=fontconfig
-pkgver=2.12.1
-pkgrel=1
-pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('expat' 'freetype2')
-makedepends=('python2' 'docbook2x')
-#makedepends=('python2' 'python2-lxml' 'gperf' 'git') # for git build
-install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
- #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT)
- 0002-Update-aliases-for-new-URW-fonts.patch)
-sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
- '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
-
- # a nice page to test font matching:
- # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
-
-prepare() {
- cd $pkgname-$pkgver
-
- #cd $pkgname
-
- # Upstream patches implementing FS#45928
- # changes in 30-metric-aliases.conf and 60-latin.conf went upstream,
- # keep changes in 45-latin.conf - is this really required? - disable for testing purpose
-# patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch
-
-}
-
-build() {
- cd $pkgname-$pkgver
- #cd $pkgname
-
- # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
-# libtoolize -f
-# autoreconf -fi
-
- ./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
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- #cd $pkgname
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- #cd $pkgname
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
Copied: fontconfig/repos/extra-i686/PKGBUILD (from rev 273390, fontconfig/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.12.1
+pkgrel=2
+pkgdesc="A library for configuring and customizing font access"
+arch=(i686 x86_64)
+url="http://www.fontconfig.org/release/"
+license=('custom')
+depends=('expat' 'freetype2')
+makedepends=('python2' 'docbook2x')
+install=fontconfig.install
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
+ 52-emoji.conf)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+ '48740f38359a268f396e4c39d3da0868c9af336f5e5063cdd9a07ef783c56e43')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./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
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+_install_conf() {
+ install -m644 "$1" "$pkgdir/etc/fonts/conf.avail"
+ ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d"
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ _install_conf ../52-emoji.conf
+}
Deleted: extra-i686/fontconfig.install
===================================================================
--- extra-i686/fontconfig.install 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-i686/fontconfig.install 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,40 +0,0 @@
-post_install() {
- cat << _EOF
-
- Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
- Read /etc/fonts/conf.d/README for more information.
-
- Configuration via /etc/fonts/local.conf is still possible,
- but is no longer recommended for options available in conf.avail.
-
- Main systemwide configuration should be done by symlinks
- (especially for autohinting, sub-pixel and lcdfilter):
-
- cd /etc/fonts/conf.d
- ln -s ../conf.avail/XX-foo.conf
-
- Check also https://wiki.archlinux.org/index.php/Font_Configuration
- and https://wiki.archlinux.org/index.php/Fonts.
-
-_EOF
-
- echo -n "updating font cache... "
- # a full forced directory scan is required here
- /usr/bin/fc-cache -f
- echo "done."
-}
-
-post_upgrade() {
- echo -n "updating font cache... "
- /usr/bin/fc-cache -f
- echo "done."
-}
-
-post_remove() {
- cat << _EOF
-
- Check for dead symlinks and leftover files
- in /etc/fonts/conf.d/
-
-_EOF
-}
Copied: fontconfig/repos/extra-i686/fontconfig.install (from rev 273390, fontconfig/trunk/fontconfig.install)
===================================================================
--- extra-i686/fontconfig.install (rev 0)
+++ extra-i686/fontconfig.install 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,40 @@
+post_install() {
+ cat << _EOF
+
+ Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
+ Read /etc/fonts/conf.d/README for more information.
+
+ Configuration via /etc/fonts/local.conf is still possible,
+ but is no longer recommended for options available in conf.avail.
+
+ Main systemwide configuration should be done by symlinks
+ (especially for autohinting, sub-pixel and lcdfilter):
+
+ cd /etc/fonts/conf.d
+ ln -s ../conf.avail/XX-foo.conf
+
+ Check also https://wiki.archlinux.org/index.php/Font_Configuration
+ and https://wiki.archlinux.org/index.php/Fonts.
+
+_EOF
+
+ echo -n "updating font cache... "
+ # a full forced directory scan is required here
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_upgrade() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_remove() {
+ cat << _EOF
+
+ Check for dead symlinks and leftover files
+ in /etc/fonts/conf.d/
+
+_EOF
+}
Deleted: extra-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
===================================================================
--- extra-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,43 +0,0 @@
-From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Fri, 3 Oct 2014 12:26:42 +0900
-Subject: Revert "Bug 73291 - poppler does not show fl ligature"
-
-This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7.
-
-This issue has been fixed in poppler and we no longer need to patch it out in fontconfig.
-
-diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
-index 08c8ba3..49a9602 100644
---- a/conf.d/30-metric-aliases.conf
-+++ b/conf.d/30-metric-aliases.conf
-@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps:
- </default>
- </alias>
-
--<!--
-- Due to Bug#73291, commented out those lines until the broken font are fixed.
- <alias binding="same">
- <family>TeX Gyre Termes</family>
- <default>
- <family>Times</family>
- </default>
- </alias>
---->
-
- <alias binding="same">
- <family>Nimbus Mono L</family>
-@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps:
- <alias binding="same">
- <family>Times</family>
- <accept>
--<!--
-- Due to Bug#73291, commented out this line until the broken font are fixed.
- <family>TeX Gyre Termes</family>
---->
- <family>Nimbus Roman No9 L</family>
- </accept>
- </alias>
---
-cgit v0.10.2
-
Deleted: extra-x86_64/0002-Update-aliases-for-new-URW-fonts.patch
===================================================================
--- extra-x86_64/0002-Update-aliases-for-new-URW-fonts.patch 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-x86_64/0002-Update-aliases-for-new-URW-fonts.patch 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,49 +0,0 @@
-From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Thu, 6 Nov 2014 13:15:09 +0900
-Subject: Update aliases for new URW fonts
-
-Patch from Tom Yan
-
-https://bugs.freedesktop.org/show_bug.cgi?id=85225
-
-diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
-index 996fb81..72490f3 100644
---- a/conf.d/45-latin.conf
-+++ b/conf.d/45-latin.conf
-@@ -34,6 +34,10 @@
- <default><family>serif</family></default>
- </alias>
- <alias>
-+ <family>Nimbus Roman</family>
-+ <default><family>serif</family></default>
-+ </alias>
-+ <alias>
- <family>Luxi Serif</family>
- <default><family>serif</family></default>
- </alias>
-@@ -97,6 +101,10 @@
- <default><family>sans-serif</family></default>
- </alias>
- <alias>
-+ <family>Nimbus Sans</family>
-+ <default><family>sans-serif</family></default>
-+ </alias>
-+ <alias>
- <family>Luxi Sans</family>
- <default><family>sans-serif</family></default>
- </alias>
-@@ -151,6 +159,10 @@
- <family>Nimbus Mono L</family>
- <default><family>monospace</family></default>
- </alias>
-+ <alias>
-+ <family>Nimbus Mono</family>
-+ <default><family>monospace</family></default>
-+ </alias>
- <!--
- Fantasy faces
- -->
---
-cgit v0.10.2
-
Copied: fontconfig/repos/extra-x86_64/52-emoji.conf (from rev 273390, fontconfig/trunk/52-emoji.conf)
===================================================================
--- extra-x86_64/52-emoji.conf (rev 0)
+++ extra-x86_64/52-emoji.conf 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias binding="strong">
+ <family>serif</family>
+ <prefer>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </prefer>
+ </alias>
+ <alias binding="strong">
+ <family>sans-serif</family>
+ <prefer>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <accept>
+ <family>EmojiOne</family>
+ <family>EmojiOne Mozilla</family>
+ <family>Noto Color Emoji</family>
+ <family>Apple Color Emoji</family>
+ <family>Noto Emoji</family>
+ </accept>
+ </alias>
+</fontconfig>
+<!-- vim:set ft=xml sw=8 noet: -->
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-x86_64/PKGBUILD 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=fontconfig
-pkgver=2.12.1
-pkgrel=1
-pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('expat' 'freetype2')
-makedepends=('python2' 'docbook2x')
-#makedepends=('python2' 'python2-lxml' 'gperf' 'git') # for git build
-install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
- #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT)
- 0002-Update-aliases-for-new-URW-fonts.patch)
-sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
- '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
-
- # a nice page to test font matching:
- # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
-
-prepare() {
- cd $pkgname-$pkgver
-
- #cd $pkgname
-
- # Upstream patches implementing FS#45928
- # changes in 30-metric-aliases.conf and 60-latin.conf went upstream,
- # keep changes in 45-latin.conf - is this really required? - disable for testing purpose
-# patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch
-
-}
-
-build() {
- cd $pkgname-$pkgver
- #cd $pkgname
-
- # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
-# libtoolize -f
-# autoreconf -fi
-
- ./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
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- #cd $pkgname
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- #cd $pkgname
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
Copied: fontconfig/repos/extra-x86_64/PKGBUILD (from rev 273390, fontconfig/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.12.1
+pkgrel=2
+pkgdesc="A library for configuring and customizing font access"
+arch=(i686 x86_64)
+url="http://www.fontconfig.org/release/"
+license=('custom')
+depends=('expat' 'freetype2')
+makedepends=('python2' 'docbook2x')
+install=fontconfig.install
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
+ 52-emoji.conf)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+ '48740f38359a268f396e4c39d3da0868c9af336f5e5063cdd9a07ef783c56e43')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./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
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+_install_conf() {
+ install -m644 "$1" "$pkgdir/etc/fonts/conf.avail"
+ ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d"
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ _install_conf ../52-emoji.conf
+}
Deleted: extra-x86_64/fontconfig.install
===================================================================
--- extra-x86_64/fontconfig.install 2016-08-06 10:58:22 UTC (rev 273390)
+++ extra-x86_64/fontconfig.install 2016-08-06 10:59:10 UTC (rev 273391)
@@ -1,40 +0,0 @@
-post_install() {
- cat << _EOF
-
- Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
- Read /etc/fonts/conf.d/README for more information.
-
- Configuration via /etc/fonts/local.conf is still possible,
- but is no longer recommended for options available in conf.avail.
-
- Main systemwide configuration should be done by symlinks
- (especially for autohinting, sub-pixel and lcdfilter):
-
- cd /etc/fonts/conf.d
- ln -s ../conf.avail/XX-foo.conf
-
- Check also https://wiki.archlinux.org/index.php/Font_Configuration
- and https://wiki.archlinux.org/index.php/Fonts.
-
-_EOF
-
- echo -n "updating font cache... "
- # a full forced directory scan is required here
- /usr/bin/fc-cache -f
- echo "done."
-}
-
-post_upgrade() {
- echo -n "updating font cache... "
- /usr/bin/fc-cache -f
- echo "done."
-}
-
-post_remove() {
- cat << _EOF
-
- Check for dead symlinks and leftover files
- in /etc/fonts/conf.d/
-
-_EOF
-}
Copied: fontconfig/repos/extra-x86_64/fontconfig.install (from rev 273390, fontconfig/trunk/fontconfig.install)
===================================================================
--- extra-x86_64/fontconfig.install (rev 0)
+++ extra-x86_64/fontconfig.install 2016-08-06 10:59:10 UTC (rev 273391)
@@ -0,0 +1,40 @@
+post_install() {
+ cat << _EOF
+
+ Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
+ Read /etc/fonts/conf.d/README for more information.
+
+ Configuration via /etc/fonts/local.conf is still possible,
+ but is no longer recommended for options available in conf.avail.
+
+ Main systemwide configuration should be done by symlinks
+ (especially for autohinting, sub-pixel and lcdfilter):
+
+ cd /etc/fonts/conf.d
+ ln -s ../conf.avail/XX-foo.conf
+
+ Check also https://wiki.archlinux.org/index.php/Font_Configuration
+ and https://wiki.archlinux.org/index.php/Fonts.
+
+_EOF
+
+ echo -n "updating font cache... "
+ # a full forced directory scan is required here
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_upgrade() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_remove() {
+ cat << _EOF
+
+ Check for dead symlinks and leftover files
+ in /etc/fonts/conf.d/
+
+_EOF
+}
More information about the arch-commits
mailing list