diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-04 12:27:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-04 12:27:54 -0300 |
commit | 39b243b89b29a461bba953d0130b32513477efdd (patch) | |
tree | 66e5d5eb3abbd71786bd14bba2a20a9bc5228d73 /extra/cairo | |
parent | 399a563eb2c30475d66ced8203aff23d65e540e8 (diff) | |
parent | c3ff6b4da8966c22dcbf0f5d8a957b875242789f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/hedgewars/PKGBUILD
community-testing/alex/PKGBUILD
community-testing/gtk2hs-buildtools/PKGBUILD
community-testing/haddock/PKGBUILD
community-testing/happy/PKGBUILD
community-testing/haskell-bytestring-show/PKGBUILD
community-testing/haskell-cairo/PKGBUILD
community-testing/haskell-dataenc/PKGBUILD
community-testing/haskell-ghc-paths/PKGBUILD
community-testing/haskell-glib/PKGBUILD
community-testing/haskell-gtk/PKGBUILD
community-testing/haskell-haskeline/PKGBUILD
community-testing/haskell-hslogger/PKGBUILD
community-testing/haskell-html/PKGBUILD
community-testing/haskell-pango/PKGBUILD
community-testing/haskell-quickcheck/PKGBUILD
community-testing/haskell-regex-base/PKGBUILD
community-testing/haskell-regex-compat/PKGBUILD
community-testing/haskell-regex-posix/PKGBUILD
community-testing/haskell-stm/PKGBUILD
community-testing/haskell-syb/PKGBUILD
community-testing/haskell-tar/PKGBUILD
community-testing/haskell-terminfo/PKGBUILD
community-testing/haskell-utf8-string/PKGBUILD
community-testing/haskell-x11-xft/PKGBUILD
community-testing/haskell-x11/PKGBUILD
community-testing/haskell-xhtml/PKGBUILD
community-testing/hedgewars/PKGBUILD
community-testing/xmobar/PKGBUILD
community-testing/xmonad-contrib/PKGBUILD
community-testing/xmonad/PKGBUILD
community/osdbattery/PKGBUILD
community/packeth/PKGBUILD
extra/kdenetwork/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/mutter/PKGBUILD
staging/kdebindings-python/PKGBUILD
staging/mesa/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/btrfs-progs/initcpio-install-btrfs
testing/ghc/PKGBUILD
testing/ghc/build.mk
testing/haskell-http/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-random/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/kactivities/PKGBUILD
testing/kdeaccessibility-jovie/PKGBUILD
testing/kdeaccessibility-kaccessible/PKGBUILD
testing/kdeaccessibility-kmag/PKGBUILD
testing/kdeaccessibility-kmousetool/PKGBUILD
testing/kdeaccessibility-kmouth/PKGBUILD
testing/kdeadmin/PKGBUILD
testing/kdeartwork/PKGBUILD
testing/kdebase-konsole/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase/PKGBUILD
testing/kdebindings-kimono/PKGBUILD
testing/kdebindings-korundum/PKGBUILD
testing/kdebindings-kross/PKGBUILD
testing/kdebindings-perlkde/PKGBUILD
testing/kdebindings-perlqt/PKGBUILD
testing/kdebindings-python/PKGBUILD
testing/kdebindings-qtruby/PKGBUILD
testing/kdebindings-qyoto/PKGBUILD
testing/kdebindings-smokegen/PKGBUILD
testing/kdebindings-smokekde/PKGBUILD
testing/kdebindings-smokeqt/PKGBUILD
testing/kdeedu-analitza/PKGBUILD
testing/kdeedu-blinken/PKGBUILD
testing/kdeedu-cantor/PKGBUILD
testing/kdeedu-kalgebra/PKGBUILD
testing/kdeedu-kalzium/PKGBUILD
testing/kdeedu-kanagram/PKGBUILD
testing/kdeedu-kbruch/PKGBUILD
testing/kdeedu-kgeography/PKGBUILD
testing/kdeedu-khangman/PKGBUILD
testing/kdeedu-kig/PKGBUILD
testing/kdeedu-kiten/PKGBUILD
testing/kdeedu-klettres/PKGBUILD
testing/kdeedu-kmplot/PKGBUILD
testing/kdeedu-kstars/PKGBUILD
testing/kdeedu-ktouch/PKGBUILD
testing/kdeedu-kturtle/PKGBUILD
testing/kdeedu-kwordquiz/PKGBUILD
testing/kdeedu-marble/PKGBUILD
testing/kdeedu-pairs/PKGBUILD
testing/kdeedu-parley/PKGBUILD
testing/kdeedu-rocs/PKGBUILD
testing/kdeedu-step/PKGBUILD
testing/kdegames/PKGBUILD
testing/kdegraphics-gwenview/PKGBUILD
testing/kdegraphics-kamera/PKGBUILD
testing/kdegraphics-kcolorchooser/PKGBUILD
testing/kdegraphics-kgamma/PKGBUILD
testing/kdegraphics-kolourpaint/PKGBUILD
testing/kdegraphics-kruler/PKGBUILD
testing/kdegraphics-ksaneplugin/PKGBUILD
testing/kdegraphics-ksnapshot/PKGBUILD
testing/kdegraphics-mobipocket/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/kdegraphics-svgpart/PKGBUILD
testing/kdegraphics-thumbnailers/PKGBUILD
testing/kdemultimedia-audiocd-kio/PKGBUILD
testing/kdemultimedia-dragonplayer/PKGBUILD
testing/kdemultimedia-ffmpegthumbs/PKGBUILD
testing/kdemultimedia-juk/PKGBUILD
testing/kdemultimedia-kmix/PKGBUILD
testing/kdemultimedia-kscd/PKGBUILD
testing/kdemultimedia-mplayerthumbs/PKGBUILD
testing/kdenetwork/PKGBUILD
testing/kdepim-runtime/PKGBUILD
testing/kdepim/PKGBUILD
testing/kdepimlibs/PKGBUILD
testing/kdeplasma-addons/PKGBUILD
testing/kdesdk-kate/PKGBUILD
testing/kdesdk/PKGBUILD
testing/kdetoys/PKGBUILD
testing/kdeutils-filelight/PKGBUILD
testing/kdeutils-kcalc/PKGBUILD
testing/kdeutils-kcharselect/PKGBUILD
testing/kdeutils-kdf/PKGBUILD
testing/kdeutils-kfloppy/PKGBUILD
testing/kdeutils-kgpg/PKGBUILD
testing/kdeutils-kremotecontrol/PKGBUILD
testing/kdeutils-ktimer/PKGBUILD
testing/kdeutils-kwallet/PKGBUILD
testing/kdeutils-superkaramba/PKGBUILD
testing/kdeutils-sweeper/PKGBUILD
testing/kdewebdev/PKGBUILD
testing/libkcddb/PKGBUILD
testing/libkcompactdisc/PKGBUILD
testing/libkdcraw/PKGBUILD
testing/libkdeedu/PKGBUILD
testing/libkexiv2/PKGBUILD
testing/libkipi/PKGBUILD
testing/libksane/PKGBUILD
testing/nepomuk-core/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/initcpio-install-udev
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/cairo')
-rw-r--r-- | extra/cairo/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch | 37 |
2 files changed, 44 insertions, 3 deletions
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 118ff4047..b83e58225 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161326 2012-06-09 14:55:04Z foutrelis $ +# $Id: PKGBUILD 167546 2012-10-02 15:03:57Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> @@ -6,7 +6,7 @@ pkgname=cairo #_gitdate=20120426 #_gitver=957a9cc619965178a8927d114fe852034fc2385c pkgver=1.12.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'MPL') @@ -21,11 +21,13 @@ source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz cairo-1.10.0-buggy_gradients.patch cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch #git_fixes.patch ) md5sums=('87649eb75789739d517c743e94879e51' '9b323790dab003e228c6955633cb888e' - '75ec73746cfaefcbed0e9b2a9f76bf00') + '75ec73746cfaefcbed0e9b2a9f76bf00' + '56f64466fd70ead732b00691464144f2') build() { cd "$srcdir/$pkgname-$pkgver" @@ -33,6 +35,8 @@ build() { patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch # https://bugs.freedesktop.org/show_bug.cgi?id=50852 patch -Np1 -i ${srcdir}/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=51443 + patch -Np1 -i ${srcdir}/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch # status is 2012-04-26 last commit: image: Fix typo in _blit_spans() #patch -Np1 -i ${srcdir}/git_fixes.patch autoreconf -vfi diff --git a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch new file mode 100644 index 000000000..e43a10312 --- /dev/null +++ b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch @@ -0,0 +1,37 @@ +From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohnson@redneon.com> +Date: Thu, 07 Jun 2012 09:48:52 +0000 +Subject: cff-subsetting: Ignore charset for non cid fonts + +Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422 +--- +diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c +index db6fdf7..6f0cd66 100644 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font) + goto fail; + font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index); + +- operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); +- if (font->is_cid && !operand) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ if (font->is_cid) { ++ operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); ++ if (!operand) ++ return CAIRO_INT_STATUS_UNSUPPORTED; + +- decode_integer (operand, &offset); +- font->charset = font->data + offset; +- if (font->charset >= font->data_end) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ decode_integer (operand, &offset); ++ font->charset = font->data + offset; ++ if (font->charset >= font->data_end) ++ return CAIRO_INT_STATUS_UNSUPPORTED; ++ } + + if (!font->is_opentype) + cairo_cff_font_read_font_metrics (font, font->top_dict); +-- +cgit v0.9.0.2-2-gbebe |