[arch-commits] Commit in fontconfig/repos (12 files)
Andreas Radke
andyrtr at archlinux.org
Sun Mar 13 17:28:39 UTC 2016
Date: Sunday, March 13, 2016 @ 18:28:39
Author: andyrtr
Revision: 261412
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
fontconfig/repos/testing-i686/
fontconfig/repos/testing-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
(from rev 261411, fontconfig/trunk/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch)
fontconfig/repos/testing-i686/0002-Update-aliases-for-new-URW-fonts.patch
(from rev 261411, fontconfig/trunk/0002-Update-aliases-for-new-URW-fonts.patch)
fontconfig/repos/testing-i686/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
(from rev 261411, fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
fontconfig/repos/testing-i686/PKGBUILD
(from rev 261411, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-i686/fontconfig.install
(from rev 261411, fontconfig/trunk/fontconfig.install)
fontconfig/repos/testing-x86_64/
fontconfig/repos/testing-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch
(from rev 261411, fontconfig/trunk/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch)
fontconfig/repos/testing-x86_64/0002-Update-aliases-for-new-URW-fonts.patch
(from rev 261411, fontconfig/trunk/0002-Update-aliases-for-new-URW-fonts.patch)
fontconfig/repos/testing-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
(from rev 261411, fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
fontconfig/repos/testing-x86_64/PKGBUILD
(from rev 261411, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-x86_64/fontconfig.install
(from rev 261411, fontconfig/trunk/fontconfig.install)
------------------------------------------------------------------------------------+
testing-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch | 43 ++++++
testing-i686/0002-Update-aliases-for-new-URW-fonts.patch | 49 ++++++
testing-i686/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff | 23 +++
testing-i686/PKGBUILD | 71 ++++++++++
testing-i686/fontconfig.install | 40 +++++
testing-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch | 43 ++++++
testing-x86_64/0002-Update-aliases-for-new-URW-fonts.patch | 49 ++++++
testing-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff | 23 +++
testing-x86_64/PKGBUILD | 71 ++++++++++
testing-x86_64/fontconfig.install | 40 +++++
10 files changed, 452 insertions(+)
Copied: fontconfig/repos/testing-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch (from rev 261411, fontconfig/trunk/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch)
===================================================================
--- testing-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch (rev 0)
+++ testing-i686/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,43 @@
+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
+
Copied: fontconfig/repos/testing-i686/0002-Update-aliases-for-new-URW-fonts.patch (from rev 261411, fontconfig/trunk/0002-Update-aliases-for-new-URW-fonts.patch)
===================================================================
--- testing-i686/0002-Update-aliases-for-new-URW-fonts.patch (rev 0)
+++ testing-i686/0002-Update-aliases-for-new-URW-fonts.patch 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,49 @@
+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/testing-i686/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (from rev 261411, fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
===================================================================
--- testing-i686/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (rev 0)
+++ testing-i686/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,23 @@
+From 04763135d47ae24a808fc15c4482e2bb6f847ab9 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Wed, 25 Nov 2015 11:58:14 +0900
+Subject: Avoid an error message on testing when no fonts.conf installed
+
+This test case doesn't require any config files so no need to ensure loading them.
+
+diff --git a/test/test-bz89617.c b/test/test-bz89617.c
+index 587214a..35df885 100644
+--- a/test/test-bz89617.c
++++ b/test/test-bz89617.c
+@@ -28,7 +28,7 @@
+ int
+ main (void)
+ {
+- FcConfig *config = FcConfigGetCurrent ();
++ FcConfig *config = FcConfigCreate ();
+
+ if (!FcConfigAppFontAddFile (config, (const FcChar8 *)SRCDIR "/4x6.pcf") ||
+ FcConfigAppFontAddFile (config, (const FcChar8 *)"/dev/null"))
+--
+cgit v0.10.2
+
Copied: fontconfig/repos/testing-i686/PKGBUILD (from rev 261411, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.11.94
+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
+ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
+ #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT)
+ 0002-Update-aliases-for-new-URW-fonts.patch)
+sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df'
+ '911ec42fe2c0b57b2115d61aa1bb327b40189374cc115e648c58b57c8a7f3aba'
+ '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
+
+ # a nice page to test font matching:
+ # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+
+prepare() {
+ cd $pkgname-$pkgver
+ # fix a bug in the testsuite
+ # https://cgit.freedesktop.org/fontconfig/commit/?id=04763135d47ae24a808fc15c4482e2bb6f847ab9
+ patch -Np1 -i $srcdir/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
+
+ #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/testing-i686/fontconfig.install (from rev 261411, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-i686/fontconfig.install (rev 0)
+++ testing-i686/fontconfig.install 2016-03-13 17:28:39 UTC (rev 261412)
@@ -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-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch (from rev 261411, fontconfig/trunk/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch)
===================================================================
--- testing-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch (rev 0)
+++ testing-x86_64/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,43 @@
+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
+
Copied: fontconfig/repos/testing-x86_64/0002-Update-aliases-for-new-URW-fonts.patch (from rev 261411, fontconfig/trunk/0002-Update-aliases-for-new-URW-fonts.patch)
===================================================================
--- testing-x86_64/0002-Update-aliases-for-new-URW-fonts.patch (rev 0)
+++ testing-x86_64/0002-Update-aliases-for-new-URW-fonts.patch 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,49 @@
+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/testing-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (from rev 261411, fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
===================================================================
--- testing-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (rev 0)
+++ testing-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,23 @@
+From 04763135d47ae24a808fc15c4482e2bb6f847ab9 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Wed, 25 Nov 2015 11:58:14 +0900
+Subject: Avoid an error message on testing when no fonts.conf installed
+
+This test case doesn't require any config files so no need to ensure loading them.
+
+diff --git a/test/test-bz89617.c b/test/test-bz89617.c
+index 587214a..35df885 100644
+--- a/test/test-bz89617.c
++++ b/test/test-bz89617.c
+@@ -28,7 +28,7 @@
+ int
+ main (void)
+ {
+- FcConfig *config = FcConfigGetCurrent ();
++ FcConfig *config = FcConfigCreate ();
+
+ if (!FcConfigAppFontAddFile (config, (const FcChar8 *)SRCDIR "/4x6.pcf") ||
+ FcConfigAppFontAddFile (config, (const FcChar8 *)"/dev/null"))
+--
+cgit v0.10.2
+
Copied: fontconfig/repos/testing-x86_64/PKGBUILD (from rev 261411, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-03-13 17:28:39 UTC (rev 261412)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.11.94
+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
+ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
+ #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT)
+ 0002-Update-aliases-for-new-URW-fonts.patch)
+sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df'
+ '911ec42fe2c0b57b2115d61aa1bb327b40189374cc115e648c58b57c8a7f3aba'
+ '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
+
+ # a nice page to test font matching:
+ # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+
+prepare() {
+ cd $pkgname-$pkgver
+ # fix a bug in the testsuite
+ # https://cgit.freedesktop.org/fontconfig/commit/?id=04763135d47ae24a808fc15c4482e2bb6f847ab9
+ patch -Np1 -i $srcdir/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
+
+ #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/testing-x86_64/fontconfig.install (from rev 261411, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-x86_64/fontconfig.install (rev 0)
+++ testing-x86_64/fontconfig.install 2016-03-13 17:28:39 UTC (rev 261412)
@@ -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