diff options
| author | TBK <tbk@jjtc.eu> | 2018-06-23 19:42:17 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-07-02 09:11:16 +0200 |
| commit | 8bc218069d87377a38e42af82ef12daf0459e524 (patch) | |
| tree | a94412661e199a36f54b5b11438a10e39c9f8124 /main | |
| parent | ca9782a16b5e92c6a9ede26b398cffc1f1c8c36e (diff) | |
| download | aports-8bc218069d87377a38e42af82ef12daf0459e524.tar.bz2 aports-8bc218069d87377a38e42af82ef12daf0459e524.tar.xz | |
main/cairo: upgrade to 1.15.12
Diffstat (limited to 'main')
| -rw-r--r-- | main/cairo/APKBUILD | 16 | ||||
| -rw-r--r-- | main/cairo/cairo-1.14.6-colored-emojis.patch | 13 |
2 files changed, 7 insertions, 22 deletions
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD index adb51c3204..e8022ecdc8 100644 --- a/main/cairo/APKBUILD +++ b/main/cairo/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cairo -pkgver=1.14.12 -pkgrel=2 +pkgver=1.15.12 +pkgrel=0 pkgdesc="A vector graphics library" -url="http://cairographics.org/" +url="https://cairographics.org/" arch="all" options="!check" # Recursive dependency on gtk+2.0 for check. license="LGPL-2.0-or-later MPL-1.1" @@ -14,16 +14,15 @@ makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev autoconf automa subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools $pkgname-dbg" # fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate _ultver="2016-04-23" -source="http://cairographics.org/releases/$pkgname-$pkgver.tar.xz +source="https://cairographics.org/snapshots/$pkgname-$pkgver.tar.xz fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz musl-stacksize.patch - cairo-1.14.6-colored-emojis.patch " builddir="$srcdir/$pkgname-$pkgver" prepare() { - cd "$builddir" default_prepare + cd "$builddir" # infinality for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do @@ -77,7 +76,6 @@ tools() { "$subpkgdir"/usr/lib/cairo/ } -sha512sums="ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1 cairo-1.14.12.tar.xz +sha512sums="97fb2c515f6449c1d84dc3187d11187290a219d39f8168a4367ca43505da80167df93b609a69b7e3938e9d38a2b7db459ad7130d9b5f12ff8c898994dfaa6d7e cairo-1.15.12.tar.xz d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz -86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch -d178d413f0e258c7970340bea6e2fcaf8d9c6cfed3d831c29dcbd7b1a782e0b8c9106fca0d2d4beb6939a8993cc2554464b6fb4df888a736f8083cde226a41c6 cairo-1.14.6-colored-emojis.patch" +86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch" diff --git a/main/cairo/cairo-1.14.6-colored-emojis.patch b/main/cairo/cairo-1.14.6-colored-emojis.patch deleted file mode 100644 index 613b6d34dd..0000000000 --- a/main/cairo/cairo-1.14.6-colored-emojis.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urp cairo-1.14.6.orig/src/cairo-ft-font.c cairo-1.14.6/src/cairo-ft-font.c ---- cairo-1.14.6.orig/src/cairo-ft-font.c 2016-12-05 15:58:48.292450747 -0800 -+++ cairo-1.14.6/src/cairo-ft-font.c 2016-12-05 16:00:16.972824582 -0800 -@@ -2260,7 +2260,7 @@ _cairo_ft_scaled_glyph_init (void *abs - * Moreover, none of our backends and compositors currently support - * color glyphs. As such, this is currently disabled. - */ -- /* load_flags |= FT_LOAD_COLOR; */ -+ load_flags |= FT_LOAD_COLOR; - #endif - - error = FT_Load_Glyph (face, - |