Date: Monday, April 1, 2013 @ 11:51:43 Author: jgc Revision: 181143 archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added: fontconfig/repos/gnome-unstable-i686/ fontconfig/repos/gnome-unstable-i686/29-replace-bitmap-fonts.conf (from rev 181142, fontconfig/trunk/29-replace-bitmap-fonts.conf) fontconfig/repos/gnome-unstable-i686/PKGBUILD (from rev 181142, fontconfig/trunk/PKGBUILD) fontconfig/repos/gnome-unstable-i686/bug62980.patch (from rev 181142, fontconfig/trunk/bug62980.patch) fontconfig/repos/gnome-unstable-i686/fontconfig.install (from rev 181142, fontconfig/trunk/fontconfig.install) fontconfig/repos/gnome-unstable-x86_64/ fontconfig/repos/gnome-unstable-x86_64/29-replace-bitmap-fonts.conf (from rev 181142, fontconfig/trunk/29-replace-bitmap-fonts.conf) fontconfig/repos/gnome-unstable-x86_64/PKGBUILD (from rev 181142, fontconfig/trunk/PKGBUILD) fontconfig/repos/gnome-unstable-x86_64/bug62980.patch (from rev 181142, fontconfig/trunk/bug62980.patch) fontconfig/repos/gnome-unstable-x86_64/fontconfig.install (from rev 181142, fontconfig/trunk/fontconfig.install) ----------------------------------------------------+ gnome-unstable-i686/29-replace-bitmap-fonts.conf | 37 +++++++++ gnome-unstable-i686/PKGBUILD | 59 +++++++++++++++ gnome-unstable-i686/bug62980.patch | 73 +++++++++++++++++++ gnome-unstable-i686/fontconfig.install | 39 ++++++++++ gnome-unstable-x86_64/29-replace-bitmap-fonts.conf | 37 +++++++++ gnome-unstable-x86_64/PKGBUILD | 59 +++++++++++++++ gnome-unstable-x86_64/bug62980.patch | 73 +++++++++++++++++++ gnome-unstable-x86_64/fontconfig.install | 39 ++++++++++ 8 files changed, 416 insertions(+) Copied: fontconfig/repos/gnome-unstable-i686/29-replace-bitmap-fonts.conf (from rev 181142, fontconfig/trunk/29-replace-bitmap-fonts.conf) =================================================================== --- gnome-unstable-i686/29-replace-bitmap-fonts.conf (rev 0) +++ gnome-unstable-i686/29-replace-bitmap-fonts.conf 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <!-- Replace generic bitmap font names by generic font families. + These font-families will get replaced by other rules and + default to scaled ones. --> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Helvetica</string> + </test> + <edit mode="assign" name="family"> + <string>Arial</string> + <string>Liberation Sans</string> + <string>sans-serif</string> + </edit> + </match> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Courier</string> + </test> + <edit mode="assign" name="family"> + <string>Courier New</string> + <string>Liberation Mono</string> + <string>monospace</string> + </edit> + </match> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Times</string> + </test> + <edit mode="assign" name="family"> + <string>Times New Roman</string> + <string>Liberation Serif</string> + <string>serif</string> + </edit> + </match> +</fontconfig> Copied: fontconfig/repos/gnome-unstable-i686/PKGBUILD (from rev 181142, fontconfig/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=fontconfig +pkgver=2.10.92 +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') +options=('!libtool') +install=fontconfig.install +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 + 29-replace-bitmap-fonts.conf + bug62980.patch) +sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' + '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc' + 'd0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../bug62980.patch + + # 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 "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd + + #Install license + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" +} Copied: fontconfig/repos/gnome-unstable-i686/bug62980.patch (from rev 181142, fontconfig/trunk/bug62980.patch) =================================================================== --- gnome-unstable-i686/bug62980.patch (rev 0) +++ gnome-unstable-i686/bug62980.patch 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,73 @@ +From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <ak...@tagoh.org> +Date: Mon, 01 Apr 2013 09:16:28 +0000 +Subject: Bug 62980 - matching native fonts with even :lang=en + +Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc +to deal with both strong and weak of FC_LANG as the same location in the score +--- +diff --git a/src/fcmatch.c b/src/fcmatch.c +index 68f39ae..2d7b798 100644 +--- a/src/fcmatch.c ++++ b/src/fcmatch.c +@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { + #undef FC_OBJECT + + #undef PRI1 +-#define PRI1(n) \ +- PRI_ ## n ## _STRONG, \ +- PRI_ ## n ## _WEAK ++#define PRI1(n) \ ++ PRI_ ## n, \ ++ PRI_ ## n ## _STRONG = PRI_ ## n, \ ++ PRI_ ## n ## _WEAK = PRI_ ## n + + typedef enum _FcMatcherPriority { + PRI1(HASH), +@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { + PRI1(FOUNDRY), + PRI1(CHARSET), + PRI_FAMILY_STRONG, +- PRI_LANG_STRONG, + PRI_POSTSCRIPT_NAME_STRONG, +- PRI_LANG_WEAK, ++ PRI1(LANG), + PRI_FAMILY_WEAK, + PRI_POSTSCRIPT_NAME_WEAK, + PRI1(SPACING), +@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + * If this node matches any language, go check + * which ones and satisfy those entries + */ +- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || +- nodeps[f]->score[PRI_LANG_WEAK] < 2000) ++ if (nodeps[f]->score[PRI_LANG] < 2000) + { + for (i = 0; i < nPatternLang; i++) + { +@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + patternLangSat[i] = FcTrue; + satisfies = FcTrue; +- /* adjust score to ensure it's not more than 10000.0 +- * which would means the lang didn't satisfy the requirements +- */ +- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; + break; + } + } +@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + if (!satisfies) + { +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; ++ nodeps[f]->score[PRI_LANG] = 10000.0; + } + } + +-- +cgit v0.9.0.2-2-gbebe Copied: fontconfig/repos/gnome-unstable-i686/fontconfig.install (from rev 181142, fontconfig/trunk/fontconfig.install) =================================================================== --- gnome-unstable-i686/fontconfig.install (rev 0) +++ gnome-unstable-i686/fontconfig.install 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,39 @@ +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... " + /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/gnome-unstable-x86_64/29-replace-bitmap-fonts.conf (from rev 181142, fontconfig/trunk/29-replace-bitmap-fonts.conf) =================================================================== --- gnome-unstable-x86_64/29-replace-bitmap-fonts.conf (rev 0) +++ gnome-unstable-x86_64/29-replace-bitmap-fonts.conf 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <!-- Replace generic bitmap font names by generic font families. + These font-families will get replaced by other rules and + default to scaled ones. --> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Helvetica</string> + </test> + <edit mode="assign" name="family"> + <string>Arial</string> + <string>Liberation Sans</string> + <string>sans-serif</string> + </edit> + </match> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Courier</string> + </test> + <edit mode="assign" name="family"> + <string>Courier New</string> + <string>Liberation Mono</string> + <string>monospace</string> + </edit> + </match> + <match target="pattern" name="family"> + <test name="family" qual="any"> + <string>Times</string> + </test> + <edit mode="assign" name="family"> + <string>Times New Roman</string> + <string>Liberation Serif</string> + <string>serif</string> + </edit> + </match> +</fontconfig> Copied: fontconfig/repos/gnome-unstable-x86_64/PKGBUILD (from rev 181142, fontconfig/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=fontconfig +pkgver=2.10.92 +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') +options=('!libtool') +install=fontconfig.install +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 + 29-replace-bitmap-fonts.conf + bug62980.patch) +sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' + '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc' + 'd0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../bug62980.patch + + # 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 "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd + + #Install license + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" +} Copied: fontconfig/repos/gnome-unstable-x86_64/bug62980.patch (from rev 181142, fontconfig/trunk/bug62980.patch) =================================================================== --- gnome-unstable-x86_64/bug62980.patch (rev 0) +++ gnome-unstable-x86_64/bug62980.patch 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,73 @@ +From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <ak...@tagoh.org> +Date: Mon, 01 Apr 2013 09:16:28 +0000 +Subject: Bug 62980 - matching native fonts with even :lang=en + +Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc +to deal with both strong and weak of FC_LANG as the same location in the score +--- +diff --git a/src/fcmatch.c b/src/fcmatch.c +index 68f39ae..2d7b798 100644 +--- a/src/fcmatch.c ++++ b/src/fcmatch.c +@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { + #undef FC_OBJECT + + #undef PRI1 +-#define PRI1(n) \ +- PRI_ ## n ## _STRONG, \ +- PRI_ ## n ## _WEAK ++#define PRI1(n) \ ++ PRI_ ## n, \ ++ PRI_ ## n ## _STRONG = PRI_ ## n, \ ++ PRI_ ## n ## _WEAK = PRI_ ## n + + typedef enum _FcMatcherPriority { + PRI1(HASH), +@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { + PRI1(FOUNDRY), + PRI1(CHARSET), + PRI_FAMILY_STRONG, +- PRI_LANG_STRONG, + PRI_POSTSCRIPT_NAME_STRONG, +- PRI_LANG_WEAK, ++ PRI1(LANG), + PRI_FAMILY_WEAK, + PRI_POSTSCRIPT_NAME_WEAK, + PRI1(SPACING), +@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + * If this node matches any language, go check + * which ones and satisfy those entries + */ +- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || +- nodeps[f]->score[PRI_LANG_WEAK] < 2000) ++ if (nodeps[f]->score[PRI_LANG] < 2000) + { + for (i = 0; i < nPatternLang; i++) + { +@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + patternLangSat[i] = FcTrue; + satisfies = FcTrue; +- /* adjust score to ensure it's not more than 10000.0 +- * which would means the lang didn't satisfy the requirements +- */ +- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; + break; + } + } +@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + if (!satisfies) + { +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; ++ nodeps[f]->score[PRI_LANG] = 10000.0; + } + } + +-- +cgit v0.9.0.2-2-gbebe Copied: fontconfig/repos/gnome-unstable-x86_64/fontconfig.install (from rev 181142, fontconfig/trunk/fontconfig.install) =================================================================== --- gnome-unstable-x86_64/fontconfig.install (rev 0) +++ gnome-unstable-x86_64/fontconfig.install 2013-04-01 09:51:43 UTC (rev 181143) @@ -0,0 +1,39 @@ +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... " + /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 +}