forked from pool/cairo
Accepting request 640135 from GNOME:Next
New upstream release OBS-URL: https://build.opensuse.org/request/show/640135 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=143
This commit is contained in:
Git OBS Bridge
parent
a2a01827dc
commit
3810c47205
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
|
||||
size 41883440
|
||||
3
cairo-1.15.14.tar.xz
Normal file
3
cairo-1.15.14.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:16566b6c015a761bb0b7595cf879b77f8de85f90b443119083c4c2769b93298d
|
||||
size 41996528
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,51 +0,0 @@
|
||||
From 7554822dd0b52d33ec7898e81b59e97164b00142 Mon Sep 17 00:00:00 2001
|
||||
From: Uli Schlachter <psychon@znc.in>
|
||||
Date: Sat, 21 Apr 2018 09:37:06 +0200
|
||||
Subject: Fix assertion failure in the freetype backend
|
||||
|
||||
Fonts are kept in a hash table, so when creating a new font, the code
|
||||
first checks the hash table for an already-existing entry and only then
|
||||
is a new instance really created. There is an assert that checks that
|
||||
the key used for the hash table lookup is the same as the instance that
|
||||
is created later has, because otherwise the hash table was checked
|
||||
incorrectly.
|
||||
|
||||
This assert failed in some conditions.
|
||||
|
||||
Fix this by fixing some places that initialised ft hash keys in a wrong
|
||||
way.
|
||||
|
||||
Patch by Behdad Esfahbod and submitted via bugzilla.
|
||||
|
||||
Source: https://bugs.freedesktop.org/show_bug.cgi?id=105746#c4
|
||||
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=105746
|
||||
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
||||
---
|
||||
src/cairo-ft-font.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
|
||||
index 79aef78..9b10708 100644
|
||||
--- a/src/cairo-ft-font.c
|
||||
+++ b/src/cairo-ft-font.c
|
||||
@@ -445,7 +445,7 @@ _cairo_ft_unscaled_font_init (cairo_ft_unscaled_font_t *unscaled,
|
||||
|
||||
if (from_face) {
|
||||
unscaled->from_face = TRUE;
|
||||
- _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, face->face_index, face);
|
||||
+ _cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, id, face);
|
||||
|
||||
|
||||
unscaled->have_color = FT_HAS_COLOR (face) != 0;
|
||||
@@ -640,7 +640,7 @@ static cairo_status_t
|
||||
_cairo_ft_unscaled_font_create_from_face (FT_Face face,
|
||||
cairo_ft_unscaled_font_t **out)
|
||||
{
|
||||
- return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, out);
|
||||
+ return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, face->face_index, face, out);
|
||||
}
|
||||
|
||||
static cairo_bool_t
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 5 20:36:19 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 1.15.14:
|
||||
+ Features and Enhancements:
|
||||
- Add more FreeeType font color conversions to support
|
||||
COLR/CPAL.
|
||||
- Update test reference images against current pixman.
|
||||
+ Bugs fixed:
|
||||
- Fix crash when rendering Microsoft's Segoe UI Emoji Regular
|
||||
font.
|
||||
- Fix build breakage with glesv3 enabled due to non-existant
|
||||
glesv3.pc.
|
||||
- Fix memory leaks found by Coverity.
|
||||
- Fix incorrect null ptr handling found by Coverity.
|
||||
- Fix test compilation when font-config is disabled.
|
||||
- Use _cairo_malloc instead of malloc
|
||||
(fdo#101547, CVE-2017-9814).
|
||||
- Fix assertion failure in the freetype backend (fdo#105746).
|
||||
- Drop upstream fixed patches:
|
||||
+ cairo-fix-assertion-failure-in-freetype-backend.patch.
|
||||
+ cairo-CVE-2017-9814.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 20 06:26:30 UTC 2018 - qzheng@suse.com
|
||||
|
||||
|
||||
11
cairo.spec
11
cairo.spec
@ -12,14 +12,14 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define build_xcb_backend 1
|
||||
%define build_gl_backend 1
|
||||
Name: cairo
|
||||
Version: 1.15.12
|
||||
Version: 1.15.14
|
||||
Release: 0
|
||||
Summary: Vector Graphics Library with Cross-Device Output Support
|
||||
License: LGPL-2.1-or-later OR MPL-1.1
|
||||
@ -31,10 +31,7 @@ Source99: baselibs.conf
|
||||
Patch0: cairo-xlib-endianness.patch
|
||||
# PATCH-FIX-UPSTREAM cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff alarrosa@suse.com -- Fix segfault in get_bitmap_surface
|
||||
Patch1: cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
|
||||
# PATCH-FIX-UPSTREAM cairo-fix-assertion-failure-in-freetype-backend.patch fdo#105746 -- Fix assertion failure in the freetype backend
|
||||
Patch2: cairo-fix-assertion-failure-in-freetype-backend.patch
|
||||
# PATCH-FIX-UPSTREAM cairo-CVE-2017-9814.patch boo#1049092 CVE-2017-9814 fdo#101547 qzheng@suse.com -- Replace malloc with _cairo_malloc and check cmap size before allocating.
|
||||
Patch3: cairo-CVE-2017-9814.patch
|
||||
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
@ -144,8 +141,6 @@ cairo.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user