[arch-commits] Commit in fontconfig/repos (10 files)
Christian Hesse
eworm at archlinux.org
Tue Jan 10 09:10:56 UTC 2017
Date: Tuesday, January 10, 2017 @ 09:10:55
Author: eworm
Revision: 285627
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
fontconfig/repos/testing-i686/
fontconfig/repos/testing-i686/0001-fix-test-with-freetype2-2.7.1.patch
(from rev 285626, fontconfig/trunk/0001-fix-test-with-freetype2-2.7.1.patch)
fontconfig/repos/testing-i686/PKGBUILD
(from rev 285626, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-i686/fontconfig.hook
(from rev 285626, fontconfig/trunk/fontconfig.hook)
fontconfig/repos/testing-i686/fontconfig.install
(from rev 285626, fontconfig/trunk/fontconfig.install)
fontconfig/repos/testing-x86_64/
fontconfig/repos/testing-x86_64/0001-fix-test-with-freetype2-2.7.1.patch
(from rev 285626, fontconfig/trunk/0001-fix-test-with-freetype2-2.7.1.patch)
fontconfig/repos/testing-x86_64/PKGBUILD
(from rev 285626, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-x86_64/fontconfig.hook
(from rev 285626, fontconfig/trunk/fontconfig.hook)
fontconfig/repos/testing-x86_64/fontconfig.install
(from rev 285626, fontconfig/trunk/fontconfig.install)
---------------------------------------------------------+
testing-i686/0001-fix-test-with-freetype2-2.7.1.patch | 42 ++++++++++
testing-i686/PKGBUILD | 58 ++++++++++++++
testing-i686/fontconfig.hook | 11 ++
testing-i686/fontconfig.install | 40 +++++++++
testing-x86_64/0001-fix-test-with-freetype2-2.7.1.patch | 42 ++++++++++
testing-x86_64/PKGBUILD | 58 ++++++++++++++
testing-x86_64/fontconfig.hook | 11 ++
testing-x86_64/fontconfig.install | 40 +++++++++
8 files changed, 302 insertions(+)
Copied: fontconfig/repos/testing-i686/0001-fix-test-with-freetype2-2.7.1.patch (from rev 285626, fontconfig/trunk/0001-fix-test-with-freetype2-2.7.1.patch)
===================================================================
--- testing-i686/0001-fix-test-with-freetype2-2.7.1.patch (rev 0)
+++ testing-i686/0001-fix-test-with-freetype2-2.7.1.patch 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,42 @@
+From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 Jan 2017 10:01:54 +0100
+Subject: [PATCH 1/1] fix test with freetype2 2.7.1
+
+Upstream freetype2 applied a patch from openSuSE [0]:
+
+[pcf] Enrich family name with foundry name and glyph width info.
+3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+This prepends the foundry name plus a space to the family name. We needs
+change the font name in expexted test output.
+
+[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ test/out.expected | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/out.expected b/test/out.expected
+index 39634c5..f3a8856 100644
+--- a/test/out.expected
++++ b/test/out.expected
+@@ -1,8 +1,8 @@
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+--
+2.11.0
+
Copied: fontconfig/repos/testing-i686/PKGBUILD (from rev 285626, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.12.1
+pkgrel=4
+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
+ fontconfig.hook
+ 0001-fix-test-with-freetype2-2.7.1.patch)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+ '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274'
+ 'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 < "$srcdir/0001-fix-test-with-freetype2-2.7.1.patch"
+}
+
+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 -Dm644 $srcdir/fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
+}
Copied: fontconfig/repos/testing-i686/fontconfig.hook (from rev 285626, fontconfig/trunk/fontconfig.hook)
===================================================================
--- testing-i686/fontconfig.hook (rev 0)
+++ testing-i686/fontconfig.hook 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*
+
+[Action]
+Description = Updating fontconfig cache...
+When = PostTransaction
+Exec = /usr/bin/fc-cache -s
Copied: fontconfig/repos/testing-i686/fontconfig.install (from rev 285626, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-i686/fontconfig.install (rev 0)
+++ testing-i686/fontconfig.install 2017-01-10 09:10:55 UTC (rev 285627)
@@ -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
+}
Copied: fontconfig/repos/testing-x86_64/0001-fix-test-with-freetype2-2.7.1.patch (from rev 285626, fontconfig/trunk/0001-fix-test-with-freetype2-2.7.1.patch)
===================================================================
--- testing-x86_64/0001-fix-test-with-freetype2-2.7.1.patch (rev 0)
+++ testing-x86_64/0001-fix-test-with-freetype2-2.7.1.patch 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,42 @@
+From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 Jan 2017 10:01:54 +0100
+Subject: [PATCH 1/1] fix test with freetype2 2.7.1
+
+Upstream freetype2 applied a patch from openSuSE [0]:
+
+[pcf] Enrich family name with foundry name and glyph width info.
+3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+This prepends the foundry name plus a space to the family name. We needs
+change the font name in expexted test output.
+
+[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ test/out.expected | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/out.expected b/test/out.expected
+index 39634c5..f3a8856 100644
+--- a/test/out.expected
++++ b/test/out.expected
+@@ -1,8 +1,8 @@
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+--
+2.11.0
+
Copied: fontconfig/repos/testing-x86_64/PKGBUILD (from rev 285626, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.12.1
+pkgrel=4
+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
+ fontconfig.hook
+ 0001-fix-test-with-freetype2-2.7.1.patch)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+ '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274'
+ 'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 < "$srcdir/0001-fix-test-with-freetype2-2.7.1.patch"
+}
+
+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 -Dm644 $srcdir/fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
+}
Copied: fontconfig/repos/testing-x86_64/fontconfig.hook (from rev 285626, fontconfig/trunk/fontconfig.hook)
===================================================================
--- testing-x86_64/fontconfig.hook (rev 0)
+++ testing-x86_64/fontconfig.hook 2017-01-10 09:10:55 UTC (rev 285627)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*
+
+[Action]
+Description = Updating fontconfig cache...
+When = PostTransaction
+Exec = /usr/bin/fc-cache -s
Copied: fontconfig/repos/testing-x86_64/fontconfig.install (from rev 285626, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-x86_64/fontconfig.install (rev 0)
+++ testing-x86_64/fontconfig.install 2017-01-10 09:10:55 UTC (rev 285627)
@@ -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