diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
commit | b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch) | |
tree | 376cc5751d9a587815d7270caa61070f38832766 /extra/fontconfig | |
parent | 8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff) | |
parent | 76ee9007095484a113d1856786b81e2d2fae8202 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/bmp-musepack/PKGBUILD
community/bmp-wma/PKGBUILD
community/bonnie++/PKGBUILD
community/cantata/PKGBUILD
community/checkinstall/PKGBUILD
community/chrootuid/PKGBUILD
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/compiz/PKGBUILD
community/compizconfig-backend-gconf/PKGBUILD
community/compizconfig-python/PKGBUILD
community/ekg2/PKGBUILD
community/emerald/PKGBUILD
community/fbgetty/PKGBUILD
community/flumotion/PKGBUILD
community/leafnode/PKGBUILD
community/libcompizconfig/PKGBUILD
community/libdnet/PKGBUILD
community/libee/PKGBUILD
community/libtxc_dxtn/PKGBUILD
community/linux-tools/PKGBUILD
community/openntpd/PKGBUILD
community/osiris/PKGBUILD
community/perl-package-stash-xs/PKGBUILD
community/perl-params-util/PKGBUILD
community/procstatd/PKGBUILD
community/scponly/PKGBUILD
community/sniffit/PKGBUILD
community/synergy/PKGBUILD
community/turbojpeg/PKGBUILD
community/unbound/PKGBUILD
community/uucp/PKGBUILD
core/gawk/PKGBUILD
core/ifenslave/PKGBUILD
core/jfsutils/PKGBUILD
core/openldap/PKGBUILD
core/rfkill/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
core/xinetd/PKGBUILD
extra/avahi/PKGBUILD
extra/calligra/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/flac/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libbluray/PKGBUILD
extra/libdmx/PKGBUILD
extra/libfs/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/libtiff/PKGBUILD
extra/libxau/PKGBUILD
extra/libxfixes/PKGBUILD
extra/licq/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-guard/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/pidgin/PKGBUILD
extra/pigeonhole/PKGBUILD
extra/poppler/PKGBUILD
extra/postgresql/PKGBUILD
extra/python-geoip/PKGBUILD
extra/python/PKGBUILD
extra/samba/PKGBUILD
extra/sqlite/PKGBUILD
extra/vde2/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-dict/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/xscreensaver-libre/PKGBUILD
Diffstat (limited to 'extra/fontconfig')
-rw-r--r-- | extra/fontconfig/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index d04e83746..611ae6a84 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $ +# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@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 'mips64el') url="http://www.fontconfig.org/release/" @@ -13,7 +13,7 @@ options=('!libtool') 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 @@ build() { 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 |