diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-10 16:01:04 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-10 16:02:09 +0200 |
| commit | 34077cda99974a8bf769d0a11e9e9fb2db1bf4ad (patch) | |
| tree | 0d6283265cf5366d78ed42222188236ca13cec3b /main/fontconfig | |
| parent | 15b42a28d057715c50231316a00af6753acb7e11 (diff) | |
| download | aports-34077cda99974a8bf769d0a11e9e9fb2db1bf4ad.tar.bz2 aports-34077cda99974a8bf769d0a11e9e9fb2db1bf4ad.tar.xz | |
Revert "main/fontconfig: add infinality support"
This reverts commit 12448bc47c54f3cc5897a549a077765879d8d8bd.
Diffstat (limited to 'main/fontconfig')
| -rw-r--r-- | main/fontconfig/APKBUILD | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD index c045c5a216..a8496b4602 100644 --- a/main/fontconfig/APKBUILD +++ b/main/fontconfig/APKBUILD @@ -2,21 +2,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fontconfig pkgver=2.11.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Fontconfig package is a library for configuring and customizing font access." url="http://fontconfig.org" arch="all" license="GPL" depends= depends_dev="freetype-dev expat-dev" -makedepends="$depends_dev zlib-dev autoconf automake libtool py-lxml gperf" +makedepends="$depends_dev zlib-dev" install= triggers="$pkgname.trigger=/usr/share/fonts/*" -subpackages="$pkgname-doc $pkgname-dev infinality-presets:infinality_presets" -# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate -_ultver="2015-06-09" -source="http://fontconfig.org/release/${pkgname}-${pkgver}.tar.gz - fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz" +subpackages="$pkgname-doc $pkgname-dev" +source="http://fontconfig.org/release/${pkgname}-${pkgver}.tar.gz" _builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -27,18 +24,11 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - # infinality - for j in "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/*.patch; do - msg "Applying ${j}" - patch -p1 -i $j || return 1 - done - cp -r "$srcdir"/fontconfig-ultimate-$_ultver/conf.d.infinality . || return 1 } build() { cd "$_builddir" - autoreconf -vif || return 1 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -55,31 +45,9 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la - install -m644 -D COPYING \ - "$pkgdir"/usr/share/licenses/"${pkgname}"/COPYING || return 1 - - # infinality - mkdir -p "$pkgdir"/etc/fonts/conf.avail.infinality || return 1 - cp -r "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/combi \ - "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/free \ - "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/ms \ - "$pkgdir"/etc/fonts/conf.avail.infinality/ || return 1 - mkdir -p "$pkgdir"/usr/share/doc/fontconfig/fonts-settings - cp -r "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/fonts-settings \ - "$pkgdir"/usr/share/doc/fontconfig/ || return 1 -} - -infinality_presets() { - pkgdesc="infinality presets script" - depends="bash" - arch="noarch" - install -Dm755 "$srcdir"/fontconfig-ultimate-$_ultver/fontconfig_patches/fc-presets \ - "$subpkgdir"/usr/bin/fc-presets || return 1 + install -m644 -D COPYING "$pkgdir"/usr/share/licenses/"${pkgname}"/COPYING } -md5sums="e75e303b4f7756c2b16203a57ac87eba fontconfig-2.11.1.tar.gz -70a971a34af0974bb61201925aab6929 fontconfig-ultimate-2015-06-09.tar.gz" -sha256sums="b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d fontconfig-2.11.1.tar.gz -0195e8bff84ab973c001f04b9f5e9d59711444bfeebbed57ef76518975c91394 fontconfig-ultimate-2015-06-09.tar.gz" -sha512sums="a3eecb35a59c2f83e7fec1238ff288978643a1b2a2a7bff7b07bb62b2ccd48aa7a6b5b164472f019efd390e9eea5391313c070dcbd680a2e1227ea8ec125e28b fontconfig-2.11.1.tar.gz -766562cb90651936edb43c206b30653a50fc401c2b9affe7cad73d69adfba3aaa6362830153eda6631dc3b8f5d0fd9b02934326ff1c4a68d136555bd6a48db86 fontconfig-ultimate-2015-06-09.tar.gz" +md5sums="e75e303b4f7756c2b16203a57ac87eba fontconfig-2.11.1.tar.gz" +sha256sums="b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d fontconfig-2.11.1.tar.gz" +sha512sums="a3eecb35a59c2f83e7fec1238ff288978643a1b2a2a7bff7b07bb62b2ccd48aa7a6b5b164472f019efd390e9eea5391313c070dcbd680a2e1227ea8ec125e28b fontconfig-2.11.1.tar.gz" |