summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch27
-rw-r--r--PKGBUILD19
2 files changed, 39 insertions, 7 deletions
diff --git a/0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch b/0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
new file mode 100644
index 0000000..9d8f2d7
--- /dev/null
+++ b/0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
@@ -0,0 +1,27 @@
+From d0dccb92c520556aaa02bd1fdf8f2922cef00292 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sat, 5 Oct 2019 14:07:28 +0200
+Subject: [PATCH] image compositor: Remove the right glyph from pixman's cache
+
+We need to use the index including the phase. Otherwise we leave glyphs
+in the cache that cause problems later as indices are reused.
+---
+ src/cairo-image-compositor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
+index 6fccb79f1..79ad69f68 100644
+--- a/src/cairo-image-compositor.c
++++ b/src/cairo-image-compositor.c
+@@ -841,7 +841,7 @@ _cairo_image_scaled_glyph_fini (cairo_scaled_font_t *scaled_font,
+ if (global_glyph_cache) {
+ pixman_glyph_cache_remove (
+ global_glyph_cache, scaled_font,
+- (void *)_cairo_scaled_glyph_index (scaled_glyph));
++ (void *)scaled_glyph->hash_entry.hash);
+ }
+
+ CAIRO_MUTEX_UNLOCK (_cairo_glyph_cache_mutex);
+--
+2.23.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 9e6d076..93151fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=cairo-infinality-ultimate
_name=cairo
pkgver=1.17.2+17+g52a7c79fd
-pkgrel=1
+pkgrel=2
pkgdesc="2D graphics library with support for multiple output devices"
url="https://cairographics.org/"
arch=(x86_64)
@@ -19,12 +19,14 @@ source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
cairo-make-lcdfilter-default.patch
cairo-respect-fontconfig_pb.patch
cairo-server-side-gradients.patch
- cairo-webkit-html5-fix.patch)
-sha1sums=('SKIP'
- 'b0cc2466cc5479f055ca2148cfa37fe13a1e78a6'
- 'd8ffcb4c4745f7e61671109362a80a872ac989d3'
- '72ecf2dda8462e1588512de257ccbe18642d507f'
- '5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23')
+ cairo-webkit-html5-fix.patch
+ 0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch)
+sha256sums=('SKIP'
+ '9d692ffdbb13eaf5a66e7b5821fa6d67f2dbe3629d86d40e44f8bdcf0e6cdc2d'
+ '3ef17cfd14b3edc14092b5e96fc63673b6b020b7f05adaa59d3c3e4b0cfdde66'
+ 'b80c99b10fd48dbf98abd70ca2d1265ad6035383c47bfbee5e540a814b6d2a23'
+ 'e4fea537fae57f42a453dbace666482fc4de4cb7090d0141fdefb4388f842f32'
+ '262bf1cebc04eaae93dbfab56045ad800b3b027be303ca2611375645108f171f')
prepare(){
cd $_name
@@ -34,6 +36,9 @@ prepare(){
patch -Np1 -i "${srcdir}"/cairo-server-side-gradients.patch
patch -Np1 -i "${srcdir}"/cairo-webkit-html5-fix.patch
+ # https://bugs.archlinux.org/task/63856
+ patch -Np1 -i ../0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
+
# Update gtk-doc
cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc