[arch-commits] Commit in fontconfig/trunk (PKGBUILD fontconfig.install)

2020-06-18 Thread Jan Steffens via arch-commits 
Date: Friday, June 19, 2020 @ 01:00:56
  Author: heftig
Revision: 389520

2.13.91+48+gfcb0420-2: misc improvements

Modified:
  fontconfig/trunk/PKGBUILD
  fontconfig/trunk/fontconfig.install

+
 PKGBUILD   |   40 
 fontconfig.install |   36 +---
 2 files changed, 33 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-18 22:10:25 UTC (rev 389519)
+++ PKGBUILD2020-06-19 01:00:56 UTC (rev 389520)
@@ -1,19 +1,18 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
-pkgname=fontconfig
+pkgbase=fontconfig
+pkgname=(fontconfig fontconfig-docs)
 pkgver=2.13.91+48+gfcb0420
-pkgrel=1
+pkgrel=2
 epoch=2
-pkgdesc="A library for configuring and customizing font access"
+pkgdesc="Library for configuring and customizing font access"
+url="https://www.freedesktop.org/wiki/Software/fontconfig/;
 arch=(x86_64)
-url="https://www.freedesktop.org/wiki/Software/fontconfig/;
 license=(custom)
-depends=(expat freetype2)
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
- perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
-checkdepends=('unzip')
-install=fontconfig.install
+ perl-sgmls 'texlive-formatsextra>=2017' lynx json-c expat 
freetype2)
+checkdepends=(unzip)
 _commit=fcb042028126d79ea5a5fa015b2b034b98656e73  # master
 
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
@@ -39,7 +38,6 @@
   ./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 \
@@ -52,11 +50,29 @@
   make -k check
 }
 
-package() {
+package_fontconfig() {
+  depends=(expat libfreetype.so)
+  provides=(libfontconfig.so)
+  install=fontconfig.install
+  backup=(etc/fonts/fonts.conf)
+
   cd fontconfig
   make DESTDIR="$pkgdir" install
 
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+  # Split -docs
+  mkdir -p "$srcdir/doc/usr/share/man"
+  mv {"$pkgdir","$srcdir"/doc}/usr/share/doc
+  mv {"$pkgdir","$srcdir"/doc}/usr/share/man/man3
 }
+
+package_fontconfig-docs() {
+  pkgdesc+=" (documentation)"
+
+  mv doc/* "$pkgdir"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 fontconfig/COPYING
+}
+
+# vim:set sw=2 et:

Modified: fontconfig.install
===
--- fontconfig.install  2020-06-18 22:10:25 UTC (rev 389519)
+++ fontconfig.install  2020-06-19 01:00:56 UTC (rev 389520)
@@ -1,38 +1,12 @@
-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
-
-  post_upgrade $1
-}
-
 post_upgrade() {
+  # a full forced directory scan is required here
   echo -n "Rebuilding fontconfig cache..."
-  # a full forced directory scan is required here
   /usr/bin/fc-cache -rs
   echo " done."
 }
 
-post_remove() {
-  cat << _EOF
+post_install() {
+  post_upgrade $1 0
+}
 
-  Check for dead symlinks and leftover files 
-  in /etc/fonts/conf.d/
-  
-_EOF
-}
+# vim:set sw=2 et:

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2020-06-16 Thread Andreas Radke via arch-commits 
Date: Tuesday, June 16, 2020 @ 19:13:28
  Author: andyrtr
Revision: 389382

upgpkg: fontconfig 2:2.13.91+48+gfcb0420-1: update to latest git commit

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-16 18:40:19 UTC (rev 389381)
+++ PKGBUILD2020-06-16 19:13:28 UTC (rev 389382)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.91+24+g75eadca
-pkgrel=2
+pkgver=2.13.91+48+gfcb0420
+pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
@@ -12,8 +12,9 @@
 depends=(expat freetype2)
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
+checkdepends=('unzip')
 install=fontconfig.install
-_commit=75eadca26648abf69497691ff0f4c7803b9ff23c  # master
+_commit=fcb042028126d79ea5a5fa015b2b034b98656e73  # master
 
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD fontconfig.hook)

2020-01-19 Thread Andreas Radke via arch-commits 
Date: Sunday, January 19, 2020 @ 10:26:08
  Author: andyrtr
Revision: 373698

upgpkg: fontconfig 2:2.13.91+24+g75eadca-2: alpm-hooks should use Type = Path, 
not File

Modified:
  fontconfig/trunk/PKGBUILD
  fontconfig/trunk/fontconfig.hook

-+
 PKGBUILD|4 ++--
 fontconfig.hook |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-19 09:54:18 UTC (rev 373697)
+++ PKGBUILD2020-01-19 10:26:08 UTC (rev 373698)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.13.91+24+g75eadca
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
@@ -17,7 +17,7 @@
 
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'
-'672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274')
+'8883f7e6e9d574ed52b89256507a6224507925715ddc85b3dfab9683df2f1e25')
 
 # a nice page to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html

Modified: fontconfig.hook
===
--- fontconfig.hook 2020-01-19 09:54:18 UTC (rev 373697)
+++ fontconfig.hook 2020-01-19 10:26:08 UTC (rev 373698)
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2019-10-14 Thread Jan Steffens via arch-commits 
Date: Monday, October 14, 2019 @ 13:39:54
  Author: heftig
Revision: 364798

2.13.91+24+g75eadca-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |   25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-14 12:10:23 UTC (rev 364797)
+++ PKGBUILD2019-10-14 13:39:54 UTC (rev 364798)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.91+23+g65087ac
+pkgver=2.13.91+24+g75eadca
 pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
@@ -13,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=65087ac7ce4cc5f2109967c1380b474955dcb590  # master
+_commit=75eadca26648abf69497691ff0f4c7803b9ff23c  # master
 
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'
@@ -24,17 +24,17 @@
 # http://getemoji.com/
 
 pkgver() {
-  cd $pkgname
+  cd fontconfig
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd fontconfig
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
+  cd fontconfig
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --with-templatedir=/etc/fonts/conf.avail \
@@ -47,18 +47,15 @@
 }
 
 check() {
-  cd $pkgname
+  cd fontconfig
   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
+  cd fontconfig
   make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  install -Dm644 ../fontconfig.hook 
"$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
+
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 }

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2019-09-19 Thread Andreas Radke via arch-commits 
Date: Thursday, September 19, 2019 @ 17:52:01
  Author: andyrtr
Revision: 363085

upgpkg: fontconfig 2:2.13.91+23+g65087ac-1

update to recent git master

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-19 17:40:48 UTC (rev 363084)
+++ PKGBUILD2019-09-19 17:52:01 UTC (rev 363085)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.1+12+g5f5ec56
+pkgver=2.13.91+23+g65087ac
 pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
@@ -13,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=5f5ec5676c61b9773026a9335c9b0dfa73a73353  # master
+_commit=65087ac7ce4cc5f2109967c1380b474955dcb590  # master
 
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2019-01-30 Thread Jan Steffens via arch-commits 
Date: Wednesday, January 30, 2019 @ 18:39:45
  Author: heftig
Revision: 344944

Update source URL

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-30 09:43:16 UTC (rev 344943)
+++ PKGBUILD2019-01-30 18:39:45 UTC (rev 344944)
@@ -14,7 +14,7 @@
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
 _commit=5f5ec5676c61b9773026a9335c9b0dfa73a73353  # master
-source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
+source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'
 '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274')

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-10-04 Thread Evangelos Foutras via arch-commits 
Date: Friday, October 5, 2018 @ 04:51:52
  Author: foutrelis
Revision: 335785

upgpkg: fontconfig 2:2.13.1+12+g5f5ec56-1

Bump to 2.13.1 (+ fixes) now that the following issues are fixed:

 - https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
 - https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-05 03:31:45 UTC (rev 335784)
+++ PKGBUILD2018-10-05 04:51:52 UTC (rev 335785)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.0+15+gc60ed9e
+pkgver=2.13.1+12+g5f5ec56
 pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
@@ -13,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=c60ed9ef66e59584f8b54323018e9e6c69925c7e  # master~45
+_commit=5f5ec5676c61b9773026a9335c9b0dfa73a73353  # master
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-09-03 Thread Evangelos Foutras via arch-commits 
Date: Monday, September 3, 2018 @ 20:54:19
  Author: foutrelis
Revision: 333234

2.13.0+15+gc60ed9e-1

Go back to previous version until these issues are fixed upstream:

 - https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
 - https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-03 19:15:29 UTC (rev 333233)
+++ PKGBUILD2018-09-03 20:54:19 UTC (rev 333234)
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.1
+pkgver=2.13.0+15+gc60ed9e
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/fontconfig/;
@@ -13,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=844d8709a1f3ecab45015b24b72dd775c13b2421  # tags/2.13.1^0
+_commit=c60ed9ef66e59584f8b54323018e9e6c69925c7e  # master~45
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-08-30 Thread Jan Steffens via arch-commits 
Date: Thursday, August 30, 2018 @ 19:28:27
  Author: heftig
Revision: 333133

2.13.1-1

Modified:
  fontconfig/trunk/PKGBUILD (contents, properties)

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-30 19:24:12 UTC (rev 333132)
+++ PKGBUILD2018-08-30 19:28:27 UTC (rev 333133)
@@ -1,8 +1,8 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.0+15+gc60ed9e
+pkgver=2.13.1
 pkgrel=1
 epoch=1
 pkgdesc="A library for configuring and customizing font access"
@@ -11,9 +11,9 @@
 license=(custom)
 depends=(expat freetype2)
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
- perl-sgmls 'texlive-formatsextra>=2017' lynx)
+ perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=c60ed9ef66e59584f8b54323018e9e6c69925c7e  # master~45
+_commit=844d8709a1f3ecab45015b24b72dd775c13b2421  # tags/2.13.1^0
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'


Property changes on: fontconfig/trunk/PKGBUILD
___
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-08-24 Thread Jan Steffens via arch-commits 
Date: Friday, August 24, 2018 @ 06:54:24
  Author: heftig
Revision: 332917

2.13.0+15+gc60ed9e-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-24 06:47:44 UTC (rev 332916)
+++ PKGBUILD2018-08-24 06:54:24 UTC (rev 332917)
@@ -2,8 +2,9 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.0+17+gc78afa9
+pkgver=2.13.0+15+gc60ed9e
 pkgrel=1
+epoch=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/fontconfig/;
@@ -12,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=c78afa906699933e87889895ca2039887943b639  # master~43
+_commit=c60ed9ef66e59584f8b54323018e9e6c69925c7e  # master~45
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-08-21 Thread Jan Steffens via arch-commits 
Date: Tuesday, August 21, 2018 @ 19:18:07
  Author: heftig
Revision: 332771

2.13.0+17+gc78afa9-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-21 19:11:23 UTC (rev 332770)
+++ PKGBUILD2018-08-21 19:18:07 UTC (rev 332771)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.0+10+g58f5285
+pkgver=2.13.0+17+gc78afa9
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=58f52853d5689e897525a5926c1a222340d3f404  # master
+_commit=c78afa906699933e87889895ca2039887943b639  # master~43
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-03-17 Thread Jan Steffens via arch-commits 
Date: Saturday, March 17, 2018 @ 17:45:05
  Author: heftig
Revision: 319556

2.13.0+10+g58f5285-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-17 15:42:26 UTC (rev 319555)
+++ PKGBUILD2018-03-17 17:45:05 UTC (rev 319556)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.13.0
+pkgver=2.13.0+10+g58f5285
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=f075ca1aeaedbc288d42a70df5cf2fd069ea0d10  # tags/2.13.0^0
+_commit=58f52853d5689e897525a5926c1a222340d3f404  # master
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2018-03-08 Thread Jan Steffens via arch-commits 
Date: Thursday, March 8, 2018 @ 17:01:28
  Author: heftig
Revision: 318240

2.13.0-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-08 16:51:27 UTC (rev 318239)
+++ PKGBUILD2018-03-08 17:01:28 UTC (rev 318240)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.6+5+g665584a
+pkgver=2.13.0
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=665584a19b0ec227c93643ffb0540d11ac8ecf7f # fc-2-12
+_commit=f075ca1aeaedbc288d42a70df5cf2fd069ea0d10  # tags/2.13.0^0
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-11-14 Thread Andreas Radke 
Date: Tuesday, November 14, 2017 @ 20:04:07
  Author: andyrtr
Revision: 309978

upgpkg: fontconfig 2.12.6+5+g665584a-1

update to latest git commit of stable branch

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-14 19:56:15 UTC (rev 309977)
+++ PKGBUILD2017-11-14 20:04:07 UTC (rev 309978)
@@ -2,10 +2,10 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.6
+pkgver=2.12.6+5+g665584a
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/fontconfig/;
 license=(custom)
 depends=(expat freetype2)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=b546940435ebfb0df575bc7a2350d1e913919c34  # tags/2.12.6^0
+_commit=665584a19b0ec227c93643ffb0540d11ac8ecf7f # fc-2-12
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-09-21 Thread Jan Steffens 
Date: Thursday, September 21, 2017 @ 10:14:19
  Author: heftig
Revision: 306052

2.12.6-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-21 10:10:19 UTC (rev 306051)
+++ PKGBUILD2017-09-21 10:14:19 UTC (rev 306052)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.5
+pkgver=2.12.6
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=4d3410bd08a0f61272ca1dbb1dd27ac8c5f222de  # tags/2.12.5^0
+_commit=b546940435ebfb0df575bc7a2350d1e913919c34  # tags/2.12.6^0
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-09-09 Thread Jan Steffens 
Date: Saturday, September 9, 2017 @ 15:40:52
  Author: heftig
Revision: 305176

2.12.5-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-09 11:58:43 UTC (rev 305175)
+++ PKGBUILD2017-09-09 15:40:52 UTC (rev 305176)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.4+29+g92da67a
+pkgver=2.12.5
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=92da67a9fcf9fa48ebb40f2032d47291d5427d41  # master
+_commit=4d3410bd08a0f61272ca1dbb1dd27ac8c5f222de  # tags/2.12.5^0
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-09-08 Thread Jan Steffens 
Date: Friday, September 8, 2017 @ 17:03:25
  Author: heftig
Revision: 305072

2.12.4+29+g92da67a-1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-08 17:00:26 UTC (rev 305071)
+++ PKGBUILD2017-09-08 17:03:25 UTC (rev 305072)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.4
+pkgver=2.12.4+29+g92da67a
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
  perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
-_commit=01085e07857cddf382db736a9e061f92f50397d6  # tags/2.12.4
+_commit=92da67a9fcf9fa48ebb40f2032d47291d5427d41  # master
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;
 fontconfig.hook)
 sha256sums=('SKIP'

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-07-05 Thread Jan Steffens 
Date: Wednesday, July 5, 2017 @ 21:14:03
  Author: heftig
Revision: 299722

fix with texlive 2017

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-05 21:13:33 UTC (rev 299721)
+++ PKGBUILD2017-07-05 21:14:03 UTC (rev 299722)
@@ -10,7 +10,7 @@
 license=(custom)
 depends=(expat freetype2)
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils 
docbook-sgml
- perl-sgmls texlive-htmlxml lynx)
+ perl-sgmls 'texlive-formatsextra>=2017' lynx)
 install=fontconfig.install
 _commit=690f822a1b26b089d86e9843746cab80f3c07fe3  # tags/2.12.3^0
 source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit;

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-06-03 Thread Jan Steffens 
Date: Saturday, June 3, 2017 @ 21:42:17
  Author: heftig
Revision: 297758

FS#54236 /usr/local/share/fonts

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-03 18:03:51 UTC (rev 297757)
+++ PKGBUILD2017-06-03 21:42:17 UTC (rev 297758)
@@ -44,7 +44,7 @@
 --localstatedir=/var \
 --disable-static \
 --with-default-fonts=/usr/share/fonts \
---with-add-fonts=/usr/share/fonts
+--with-add-fonts=/usr/local/share/fonts
   make
 }

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2017-01-10 Thread Jan Steffens 
Date: Tuesday, January 10, 2017 @ 19:19:54
  Author: heftig
Revision: 285637

Update URLs; some syntax

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-10 19:05:34 UTC (rev 285636)
+++ PKGBUILD2017-01-10 19:19:54 UTC (rev 285637)
@@ -6,12 +6,12 @@
 pkgrel=4
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
-url="http://www.fontconfig.org/release/;
+url="https://www.freedesktop.org/wiki/Software/fontconfig/;
 license=('custom')
 depends=('expat' 'freetype2')
 makedepends=('python2' 'docbook2x')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
+source=(https://www.freedesktop.org/software/$pkgname/release/$pkgname-$pkgver.tar.bz2
 fontconfig.hook
 0001-fix-test-with-freetype2-2.7.1.patch)
 sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
@@ -24,7 +24,7 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 < "$srcdir/0001-fix-test-with-freetype2-2.7.1.patch"
+  patch -Np1 -i ../0001-fix-test-with-freetype2-2.7.1.patch
 }
 
 build() {
@@ -54,5 +54,5 @@
   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"
+  install -Dm644 ../fontconfig.hook 
"$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
 }

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2016-08-05 Thread Andreas Radke 
Date: Friday, August 5, 2016 @ 17:59:19
  Author: andyrtr
Revision: 273238

upgpkg: fontconfig 2.12.1-1

upstream update 2.12.1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-05 17:59:14 UTC (rev 273237)
+++ PKGBUILD2016-08-05 17:59:19 UTC (rev 273238)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.12.0
+pkgver=2.12.1
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@
 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=('b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224'
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
 '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
 
   # a nice page to test font matching:

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2016-06-15 Thread Andreas Radke 
Date: Wednesday, June 15, 2016 @ 19:09:53
  Author: andyrtr
Revision: 269996

upgpkg: fontconfig 2.12.0-1

upstream update 2.12.0

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-15 19:06:50 UTC (rev 269995)
+++ PKGBUILD2016-06-15 19:09:53 UTC (rev 269996)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=fontconfig
-pkgver=2.11.95
+pkgver=2.12.0
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@
 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=('7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89'
+sha256sums=('b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224'
 '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
 
   # a nice page to test font matching:

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2014-03-24 Thread Andreas Radke 
Date: Monday, March 24, 2014 @ 17:28:41
  Author: andyrtr
Revision: 208603

upgpkg: fontconfig 2.11.1-1

upstream update 2.11.1

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-24 16:15:29 UTC (rev 208602)
+++ PKGBUILD2014-03-24 16:28:41 UTC (rev 208603)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.11.0
+pkgver=2.11.1
 pkgrel=1
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 depends=('expat' 'freetype2')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2)
-sha256sums=('cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467')
+sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99')
 
   # a nice page to test font matching:
   # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2013-08-31 Thread Bartłomiej Piotrowski 
Date: Saturday, August 31, 2013 @ 08:42:29
  Author: bpiotrowski
Revision: 193782

upgpkg: fontconfig 2.10.95-1

- new upstream release

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-31 05:34:23 UTC (rev 193781)
+++ PKGBUILD2013-08-31 06:42:29 UTC (rev 193782)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.10.94
+pkgver=2.10.95
 pkgrel=1
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
 29-replace-bitmap-fonts.conf)
-sha256sums=('bf2c8504e015a955a4dbd1cb869968209fa321b8da2e55740a8064c7a89af63c'
+sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b'
 '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6')
 
   # a nice page to test font matching:

[arch-commits] Commit in fontconfig/trunk (PKGBUILD git_fixes.diff)

2013-08-30 Thread Andreas Radke 
Date: Friday, August 30, 2013 @ 10:46:37
  Author: andyrtr
Revision: 193755

upgpkg: fontconfig 2.10.94-1

upstream update 2.10.94

Modified:
  fontconfig/trunk/PKGBUILD
Deleted:
  fontconfig/trunk/git_fixes.diff

+
 PKGBUILD   |   12 
 git_fixes.diff |  732 ---
 2 files changed, 4 insertions(+), 740 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-30 08:16:24 UTC (rev 193754)
+++ PKGBUILD2013-08-30 08:46:37 UTC (rev 193755)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.10.93
+pkgver=2.10.94
 pkgrel=1
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
@@ -12,10 +12,9 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-29-replace-bitmap-fonts.conf git_fixes.diff)
-sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c'
-'2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6'
-'7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
+29-replace-bitmap-fonts.conf)
+sha256sums=('bf2c8504e015a955a4dbd1cb869968209fa321b8da2e55740a8064c7a89af63c'
+'2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6')
 
   # a nice page to test font matching:
   # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
@@ -23,9 +22,6 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # post release fixes
-  #patch -Np1 -i ${srcdir}/git_fixes.diff
-
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo 
do this as well
   libtoolize -f
   autoreconf -fi

Deleted: git_fixes.diff
===
--- git_fixes.diff  2013-08-30 08:16:24 UTC (rev 193754)
+++ git_fixes.diff  2013-08-30 08:46:37 UTC (rev 193755)
@@ -1,732 +0,0 @@
-From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
-From: Akira TAGOH ak...@tagoh.org
-Date: Mon, 01 Apr 2013 09:16:28 +
-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 1.0
--   * which would means the lang didn't satisfy the 
requirements
--   */
--  if (nodeps[f]-score[PRI_LANG_STRONG]  1.0)
--  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
--  if (nodeps[f]-score[PRI_LANG_WEAK]  1.0)
--  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
-   break;
-   }
-   }
-@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig*config FC_UNUSED,
-   }
-   if (!satisfies)
-   {
--  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
--  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
-+  nodeps[f]-score[PRI_LANG] = 1.0;
-   }
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001
-From: Sebastian Freundt hropta...@fresse.org
-Date: Sun, 07 Apr 2013 00:02:58 +
-Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS
-
-As of automake-13.1 the INCLUDES

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2013-05-20 Thread Andreas Radke 
Date: Monday, May 20, 2013 @ 20:21:52
  Author: andyrtr
Revision: 186041

upgpkg: fontconfig 2.10.93-1

upstream update 2.10.93

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-20 18:16:41 UTC (rev 186040)
+++ PKGBUILD2013-05-20 18:21:52 UTC (rev 186041)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.10.92
-pkgrel=4
+pkgver=2.10.93
+pkgrel=1
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
 url=http://www.fontconfig.org/release/;
@@ -13,7 +13,7 @@
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
 29-replace-bitmap-fonts.conf git_fixes.diff)
-sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
+sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c'
 '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6'
 '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
 
@@ -24,7 +24,7 @@
   cd $srcdir/$pkgname-$pkgver
 
   # post release fixes
-  patch -Np1 -i ${srcdir}/git_fixes.diff
+  #patch -Np1 -i ${srcdir}/git_fixes.diff
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo 
do this as well
   libtoolize -f

[arch-commits] Commit in fontconfig/trunk (PKGBUILD bug62980.patch git_fixes.diff)

2013-04-12 Thread Andreas Radke 
Date: Friday, April 12, 2013 @ 15:49:19
  Author: andyrtr
Revision: 182662

upgpkg: fontconfig 2.10.92-3

update to latest git commits

Added:
  fontconfig/trunk/git_fixes.diff
Modified:
  fontconfig/trunk/PKGBUILD
Deleted:
  fontconfig/trunk/bug62980.patch

+
 PKGBUILD   |   10 
 bug62980.patch |   73 -
 git_fixes.diff |  732 +++
 3 files changed, 738 insertions(+), 77 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-12 12:59:58 UTC (rev 182661)
+++ PKGBUILD2013-04-12 13:49:19 UTC (rev 182662)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.10.92
-pkgrel=2
+pkgrel=3
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
 url=http://www.fontconfig.org/release/;
@@ -12,17 +12,19 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-bug62980.patch)
+   git_fixes.diff)
 sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
-'d0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce')
+'7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
 
   # a nice page to test font matching:
   # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../bug62980.patch
 
+  # post release fixes
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo 
do this as well
   libtoolize -f
   autoreconf -fi

Deleted: bug62980.patch
===
--- bug62980.patch  2013-04-12 12:59:58 UTC (rev 182661)
+++ bug62980.patch  2013-04-12 13:49:19 UTC (rev 182662)
@@ -1,73 +0,0 @@
-From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
-From: Akira TAGOH ak...@tagoh.org
-Date: Mon, 01 Apr 2013 09:16:28 +
-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 1.0
--   * which would means the lang didn't satisfy the 
requirements
--   */
--  if (nodeps[f]-score[PRI_LANG_STRONG]  1.0)
--  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
--  if (nodeps[f]-score[PRI_LANG_WEAK]  1.0)
--  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
-   break;
-   }
-   }
-@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig*config FC_UNUSED,
-   }
-   if (!satisfies)
-   {
--  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
--  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
-+  nodeps[f]-score[PRI_LANG] = 1.0;
-   }
- }
- 
---
-cgit v0.9.0.2-2-gbebe

Added: git_fixes.diff
===
--- git_fixes.diff  (rev 0)
+++ git_fixes.diff  2013-04-12 13:49:19 UTC (rev 182662)
@@ -0,0 +1,732 @@
+From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
+From: Akira TAGOH ak...@tagoh.org
+Date: Mon, 01 Apr 2013 09:16:28 +
+Subject: Bug

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2013-04-11 Thread Andreas Radke 
Date: Thursday, April 11, 2013 @ 17:28:00
  Author: andyrtr
Revision: 182623

readd font testing URL

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-11 12:14:29 UTC (rev 182622)
+++ PKGBUILD2013-04-11 15:28:00 UTC (rev 182623)
@@ -16,6 +16,9 @@
 sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
 'd0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce')
 
+  # a nice page to test font matching:
+  # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ../bug62980.patch

[arch-commits] Commit in fontconfig/trunk (PKGBUILD bug62980.patch)

2013-04-01 Thread Jan de Groot 
Date: Monday, April 1, 2013 @ 11:51:18
  Author: jgc
Revision: 181142

upgpkg: fontconfig 2.10.92-1

Update to 2.11 RC2. Needed for Pango

Added:
  fontconfig/trunk/bug62980.patch
Modified:
  fontconfig/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++---
 bug62980.patch |   73 +++
 2 files changed, 81 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-01 08:12:16 UTC (rev 181141)
+++ PKGBUILD2013-04-01 09:51:18 UTC (rev 181142)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.10.2
-pkgrel=2
+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/;
@@ -12,12 +12,15 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-29-replace-bitmap-fonts.conf)
-sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
-'5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
+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

Added: bug62980.patch
===
--- bug62980.patch  (rev 0)
+++ bug62980.patch  2013-04-01 09:51:18 UTC (rev 181142)
@@ -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 +
+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 1.0
+-   * which would means the lang didn't satisfy the 
requirements
+-   */
+-  if (nodeps[f]-score[PRI_LANG_STRONG]  1.0)
+-  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
+-  if (nodeps[f]-score[PRI_LANG_WEAK]  1.0)
+-  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
+   break;
+   }
+   }
+@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig*config FC_UNUSED,
+   }
+   if (!satisfies)
+   {
+-  nodeps[f]-score[PRI_LANG_STRONG] = 1.0;
+-  nodeps[f]-score[PRI_LANG_WEAK] = 1.0;
++  nodeps[f]-score[PRI_LANG] = 1.0;
+   }
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2013-01-16 Thread andyrtr 
Date: Wednesday, January 16, 2013 @ 12:38:36
  Author: andyrtr
Revision: 175207

fix build; FS#33406

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-16 16:38:53 UTC (rev 175206)
+++ PKGBUILD2013-01-16 17:38:36 UTC (rev 175207)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
 url=http://www.fontconfig.org/release/;
@@ -21,7 +21,7 @@
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo 
do this as well
   libtoolize -f
-  autoreconf -f
+  autoreconf -fi
 
   ./configure --prefix=/usr \
 --sysconfdir=/etc \

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2012-11-27 Thread andyrtr 
Date: Tuesday, November 27, 2012 @ 10:22:36
  Author: andyrtr
Revision: 172071

upgpkg: fontconfig 2.10.2-1

upstream update 2.10.2

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-27 15:12:40 UTC (rev 172070)
+++ PKGBUILD2012-11-27 15:22:36 UTC (rev 172071)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=fontconfig
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
 url=http://www.fontconfig.org/release/;
@@ -11,10 +11,10 @@
 depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
 29-replace-bitmap-fonts.conf)
-md5sums=('c94e380eea42f2f23ca9537035ef1899'
- 'f6b67e8cc79197ed6abd4701911e83da')
+sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
+'5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2012-09-05 Thread andyrtr 
Date: Wednesday, September 5, 2012 @ 10:35:10
  Author: andyrtr
Revision: 166193

upgpkg: fontconfig 2.10.1-2

bring back proper font family wrapping required for helvetica famliy

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-05 13:26:53 UTC (rev 166192)
+++ PKGBUILD2012-09-05 14:35:10 UTC (rev 166193)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A library for configuring and customizing font access
 arch=(i686 x86_64)
 url=http://www.fontconfig.org/release/;
@@ -43,12 +43,13 @@
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 
-  # not upstream, not in FC and not in Gentoo, let's drop it for testing - 
should be covered in 30-metric-aliases.conf
-  #install -m644 $srcdir/29-replace-bitmap-fonts.conf 
$pkgdir/etc/fonts/conf.avail
+  # 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
 
-  # we should keep upstream presettings and not leave them all up to the users 
decision - so FC and Gentoo do
-  #rm -f $pkgdir/etc/fonts/conf.d/*.conf
-
   #Install license
   install -m755 -d $pkgdir/usr/share/licenses/$pkgname
   install -m644 COPYING $pkgdir/usr/share/licenses/$pkgname

[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

2012-02-23 Thread Ionut Biru 
Date: Thursday, February 23, 2012 @ 07:59:49
  Author: ibiru
Revision: 150856

rebuild for signing

Modified:
  fontconfig/trunk/PKGBUILD

--+
 PKGBUILD |   32 ++--
 1 file changed, 18 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-23 12:59:29 UTC (rev 150855)
+++ PKGBUILD2012-02-23 12:59:49 UTC (rev 150856)
@@ -2,15 +2,15 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 pkgname=fontconfig
 pkgver=2.8.0
-pkgrel=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=2.0.1' 'freetype2=2.3.11')
+depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
 29-replace-bitmap-fonts.conf
 30-urw-aliases.patch)
 md5sums=('77e15a92006ddc2adbb06f840d591c0e'
@@ -18,18 +18,22 @@
  '51bc6cb633b50f3c28793361738aac5b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/30-urw-aliases.patch || return 1
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/30-urw-aliases.patch
   # enable Position Independent Code for prelinking
-  export CFLAGS=${CFLAGS} -fPIC
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m644 ${srcdir}/29-replace-bitmap-fonts.conf \
-  ${pkgdir}/etc/fonts/conf.avail || return 1
-  rm -f ${pkgdir}/etc/fonts/conf.d/*.conf
+  export CFLAGS=$CFLAGS -fPIC
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -m644 $srcdir/29-replace-bitmap-fonts.conf \
+  $pkgdir/etc/fonts/conf.avail
+  rm -f $pkgdir/etc/fonts/conf.d/*.conf
+
   #Install license
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -m755 -d $pkgdir/usr/share/licenses/$pkgname
+  install -m644 COPYING $pkgdir/usr/share/licenses/$pkgname
 }