Compare commits
No commits in common. "c10s" and "c8s" have entirely different histories.
29
.gitignore
vendored
29
.gitignore
vendored
@ -1,29 +1,2 @@
|
|||||||
cairo-1.9.14.tar.gz
|
SOURCES/cairo-1.15.12.tar.xz
|
||||||
/cairo-1.10.0.tar.gz
|
|
||||||
/cairo-1.10.2.tar.gz
|
|
||||||
/cairo-1.12.0.tar.gz
|
|
||||||
/cairo-1.12.2.tar.xz
|
|
||||||
/cairo-1.12.4.tar.xz
|
|
||||||
/cairo-1.12.6.tar.xz
|
|
||||||
/cairo-1.12.8.tar.gz
|
|
||||||
/cairo-1.12.8.tar.xz
|
|
||||||
/cairo-1.12.10.tar.xz
|
|
||||||
/cairo-1.12.14.tar.xz
|
|
||||||
/cairo-1.12.16.tar.xz
|
|
||||||
/cairo-1.13.1-337ab1f.tar.xz
|
|
||||||
/cairo-1.14.0.tar.xz
|
|
||||||
/cairo-1.14.2.tar.xz
|
|
||||||
/cairo-1.14.4.tar.xz
|
|
||||||
/cairo-1.14.6.tar.xz
|
|
||||||
/cairo-1.14.8.tar.xz
|
|
||||||
/cairo-1.14.10.tar.xz
|
|
||||||
/cairo-1.15.8.tar.xz
|
|
||||||
/cairo-1.15.10.tar.xz
|
|
||||||
/cairo-1.15.12.tar.xz
|
/cairo-1.15.12.tar.xz
|
||||||
/cairo-1.15.14.tar.xz
|
|
||||||
/cairo-1.16.0.tar.xz
|
|
||||||
/cairo-1.17.4.tar.xz
|
|
||||||
/cairo-1.17.6.tar.xz
|
|
||||||
/cairo-1.17.8.tar.xz
|
|
||||||
/cairo-1.18.0.tar.xz
|
|
||||||
/cairo-1.18.2.tar.xz
|
|
||||||
|
51
0001-Fix-assertion-failure-in-the-freetype-backend.patch
Normal file
51
0001-Fix-assertion-failure-in-the-freetype-backend.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
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: [PATCH] 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 79aef78f5b0d..9b10708988d7 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
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
56
0001-Set-default-LCD-filter-to-FreeType-s-default.patch
Normal file
56
0001-Set-default-LCD-filter-to-FreeType-s-default.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From 12a5b7384f35d9a3f4c6b151fac4857444db3d6a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nikolaus Waxweiler <madigens@gmail.com>
|
||||||
|
Date: Sat, 10 Nov 2018 16:44:23 +0000
|
||||||
|
Subject: [PATCH] Set default LCD filter to FreeType's default
|
||||||
|
|
||||||
|
---
|
||||||
|
src/cairo-ft-font.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
|
||||||
|
index 325dd61b4..3c47dc12e 100644
|
||||||
|
--- a/src/cairo-ft-font.c
|
||||||
|
+++ b/src/cairo-ft-font.c
|
||||||
|
@@ -1404,7 +1404,7 @@ _render_glyph_outline (FT_Face face,
|
||||||
|
cairo_image_surface_t **surface)
|
||||||
|
{
|
||||||
|
int rgba = FC_RGBA_UNKNOWN;
|
||||||
|
- int lcd_filter = FT_LCD_FILTER_LEGACY;
|
||||||
|
+ int lcd_filter = FT_LCD_FILTER_DEFAULT;
|
||||||
|
FT_GlyphSlot glyphslot = face->glyph;
|
||||||
|
FT_Outline *outline = &glyphslot->outline;
|
||||||
|
FT_Bitmap bitmap;
|
||||||
|
@@ -1439,13 +1439,13 @@ _render_glyph_outline (FT_Face face,
|
||||||
|
case CAIRO_LCD_FILTER_NONE:
|
||||||
|
lcd_filter = FT_LCD_FILTER_NONE;
|
||||||
|
break;
|
||||||
|
- case CAIRO_LCD_FILTER_DEFAULT:
|
||||||
|
case CAIRO_LCD_FILTER_INTRA_PIXEL:
|
||||||
|
lcd_filter = FT_LCD_FILTER_LEGACY;
|
||||||
|
break;
|
||||||
|
case CAIRO_LCD_FILTER_FIR3:
|
||||||
|
lcd_filter = FT_LCD_FILTER_LIGHT;
|
||||||
|
break;
|
||||||
|
+ case CAIRO_LCD_FILTER_DEFAULT:
|
||||||
|
case CAIRO_LCD_FILTER_FIR5:
|
||||||
|
lcd_filter = FT_LCD_FILTER_DEFAULT;
|
||||||
|
break;
|
||||||
|
@@ -3416,7 +3416,6 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
|
||||||
|
case CAIRO_LCD_FILTER_NONE:
|
||||||
|
lcd_filter = FT_LCD_FILTER_NONE;
|
||||||
|
break;
|
||||||
|
- case CAIRO_LCD_FILTER_DEFAULT:
|
||||||
|
case CAIRO_LCD_FILTER_INTRA_PIXEL:
|
||||||
|
lcd_filter = FT_LCD_FILTER_LEGACY;
|
||||||
|
break;
|
||||||
|
@@ -3424,6 +3423,7 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
|
||||||
|
lcd_filter = FT_LCD_FILTER_LIGHT;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
+ case CAIRO_LCD_FILTER_DEFAULT:
|
||||||
|
case CAIRO_LCD_FILTER_FIR5:
|
||||||
|
lcd_filter = FT_LCD_FILTER_DEFAULT;
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
199
cairo-1.15.12-CVE-2020-35492.patch
Normal file
199
cairo-1.15.12-CVE-2020-35492.patch
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
From 40e9d1a0a69f01b55b4fa131bc253c7c09a0ae91 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Heiko Lewin <heiko.lewin@worldiety.de>
|
||||||
|
Date: Tue, 15 Dec 2020 16:48:19 +0100
|
||||||
|
Subject: [PATCH 1/2] Fix mask usage in image-compositor
|
||||||
|
|
||||||
|
---
|
||||||
|
src/cairo-image-compositor.c | 8 ++--
|
||||||
|
test/Makefile.sources | 1 +
|
||||||
|
test/bug-image-compositor.c | 39 ++++++++++++++++++++
|
||||||
|
test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes
|
||||||
|
4 files changed, 44 insertions(+), 4 deletions(-)
|
||||||
|
create mode 100644 test/bug-image-compositor.c
|
||||||
|
create mode 100644 test/reference/bug-image-compositor.ref.png
|
||||||
|
|
||||||
|
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
|
||||||
|
index 122a8ca42..b20e2ec78 100644
|
||||||
|
--- a/src/cairo-image-compositor.c
|
||||||
|
+++ b/src/cairo-image-compositor.c
|
||||||
|
@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||||
|
unsigned num_spans)
|
||||||
|
{
|
||||||
|
cairo_image_span_renderer_t *r = abstract_renderer;
|
||||||
|
- uint8_t *m;
|
||||||
|
+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask);
|
||||||
|
int x0;
|
||||||
|
|
||||||
|
if (num_spans == 0)
|
||||||
|
return CAIRO_STATUS_SUCCESS;
|
||||||
|
|
||||||
|
x0 = spans[0].x;
|
||||||
|
- m = r->_buf;
|
||||||
|
+ m = base;
|
||||||
|
do {
|
||||||
|
int len = spans[1].x - spans[0].x;
|
||||||
|
if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) {
|
||||||
|
@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||||
|
spans[0].x, y,
|
||||||
|
spans[1].x - spans[0].x, h);
|
||||||
|
|
||||||
|
- m = r->_buf;
|
||||||
|
+ m = base;
|
||||||
|
x0 = spans[1].x;
|
||||||
|
} else if (spans[0].coverage == 0x0) {
|
||||||
|
if (spans[0].x != x0) {
|
||||||
|
@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
- m = r->_buf;
|
||||||
|
+ m = base;
|
||||||
|
x0 = spans[1].x;
|
||||||
|
} else {
|
||||||
|
*m++ = spans[0].coverage;
|
||||||
|
diff --git a/test/Makefile.sources b/test/Makefile.sources
|
||||||
|
index c47131faf..86fd53d15 100644
|
||||||
|
--- a/test/Makefile.sources
|
||||||
|
+++ b/test/Makefile.sources
|
||||||
|
@@ -33,6 +33,7 @@ test_sources = \
|
||||||
|
bug-source-cu.c \
|
||||||
|
bug-extents.c \
|
||||||
|
bug-seams.c \
|
||||||
|
+ bug-image-compositor.c \
|
||||||
|
caps.c \
|
||||||
|
checkerboard.c \
|
||||||
|
caps-joins.c \
|
||||||
|
diff --git a/test/bug-image-compositor.c b/test/bug-image-compositor.c
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..fc4fd370b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/bug-image-compositor.c
|
||||||
|
@@ -0,0 +1,39 @@
|
||||||
|
+#include "cairo-test.h"
|
||||||
|
+
|
||||||
|
+static cairo_test_status_t
|
||||||
|
+draw (cairo_t *cr, int width, int height)
|
||||||
|
+{
|
||||||
|
+ cairo_set_source_rgb (cr, 0., 0., 0.);
|
||||||
|
+ cairo_paint (cr);
|
||||||
|
+
|
||||||
|
+ cairo_set_source_rgb (cr, 1., 1., 1.);
|
||||||
|
+ cairo_set_line_width (cr, 1.);
|
||||||
|
+
|
||||||
|
+ cairo_pattern_t *p = cairo_pattern_create_linear (0, 0, width, height);
|
||||||
|
+ cairo_pattern_add_color_stop_rgb (p, 0, 0.99, 1, 1);
|
||||||
|
+ cairo_pattern_add_color_stop_rgb (p, 1, 1, 1, 1);
|
||||||
|
+ cairo_set_source (cr, p);
|
||||||
|
+
|
||||||
|
+ cairo_move_to (cr, 0.5, -1);
|
||||||
|
+ for (int i = 0; i < width; i+=3) {
|
||||||
|
+ cairo_rel_line_to (cr, 2, 2);
|
||||||
|
+ cairo_rel_line_to (cr, 1, -2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
|
||||||
|
+ cairo_stroke (cr);
|
||||||
|
+
|
||||||
|
+ cairo_pattern_destroy(p);
|
||||||
|
+
|
||||||
|
+ return CAIRO_TEST_SUCCESS;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+CAIRO_TEST (bug_image_compositor,
|
||||||
|
+ "Crash in image-compositor",
|
||||||
|
+ "stroke, stress", /* keywords */
|
||||||
|
+ NULL, /* requirements */
|
||||||
|
+ 10000, 1,
|
||||||
|
+ NULL, draw)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
diff --git a/test/reference/bug-image-compositor.ref.png b/test/reference/bug-image-compositor.ref.png
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..939f659d2c8620e9927a3a79f5e96fb639c418be
|
||||||
|
GIT binary patch
|
||||||
|
literal 185
|
||||||
|
zcmeAS@N?(olHy`uVBq!ia0y~yP!|BQ89A7M<o7+wF+hqf$=lt9;Xep2*t>i(P$bXO
|
||||||
|
z#WAE}&f8-f1se=_SPWL_NSx=C)BnJ0eBr6Z%1egFEOv(*t#+|{>X&v^RS7GQe(vez
|
||||||
|
lf)$wgmAfM(p2Sx&&i!{gWy)N&qd=P(JYD@<);T3K0RWsgHuC@g
|
||||||
|
|
||||||
|
literal 0
|
||||||
|
HcmV?d00001
|
||||||
|
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
||||||
|
From afc23bfdc3c2597b9fe0ee34b9b4bfa47fa03698 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Heiko Lewin <heiko.lewin@worldiety.de>
|
||||||
|
Date: Tue, 15 Dec 2020 17:14:18 +0100
|
||||||
|
Subject: [PATCH 2/2] Minor cleanups
|
||||||
|
|
||||||
|
---
|
||||||
|
test/bug-image-compositor.c | 33 ++++++++++++++++++++++++++++++---
|
||||||
|
1 file changed, 30 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/bug-image-compositor.c b/test/bug-image-compositor.c
|
||||||
|
index fc4fd370b..304ea089c 100644
|
||||||
|
--- a/test/bug-image-compositor.c
|
||||||
|
+++ b/test/bug-image-compositor.c
|
||||||
|
@@ -1,5 +1,34 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright © 2020 Uli Schlachter, Heiko Lewin
|
||||||
|
+ *
|
||||||
|
+ * Permission is hereby granted, free of charge, to any person
|
||||||
|
+ * obtaining a copy of this software and associated documentation
|
||||||
|
+ * files (the "Software"), to deal in the Software without
|
||||||
|
+ * restriction, including without limitation the rights to use, copy,
|
||||||
|
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||||
|
+ * of the Software, and to permit persons to whom the Software is
|
||||||
|
+ * furnished to do so, subject to the following conditions:
|
||||||
|
+ *
|
||||||
|
+ * The above copyright notice and this permission notice shall be
|
||||||
|
+ * included in all copies or substantial portions of the Software.
|
||||||
|
+ *
|
||||||
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||||
|
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||||
|
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
+ * SOFTWARE.
|
||||||
|
+ *
|
||||||
|
+ * Author: Uli Schlachter <psychon@znc.in>
|
||||||
|
+ * Author: Heiko Lewin <hlewin@gmx.de>
|
||||||
|
+ */
|
||||||
|
#include "cairo-test.h"
|
||||||
|
|
||||||
|
+
|
||||||
|
+/* This test reproduces an overflow of a mask-buffer in cairo-image-compositor.c */
|
||||||
|
+
|
||||||
|
static cairo_test_status_t
|
||||||
|
draw (cairo_t *cr, int width, int height)
|
||||||
|
{
|
||||||
|
@@ -13,6 +42,7 @@ draw (cairo_t *cr, int width, int height)
|
||||||
|
cairo_pattern_add_color_stop_rgb (p, 0, 0.99, 1, 1);
|
||||||
|
cairo_pattern_add_color_stop_rgb (p, 1, 1, 1, 1);
|
||||||
|
cairo_set_source (cr, p);
|
||||||
|
+ cairo_pattern_destroy(p);
|
||||||
|
|
||||||
|
cairo_move_to (cr, 0.5, -1);
|
||||||
|
for (int i = 0; i < width; i+=3) {
|
||||||
|
@@ -23,8 +53,6 @@ draw (cairo_t *cr, int width, int height)
|
||||||
|
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
|
||||||
|
cairo_stroke (cr);
|
||||||
|
|
||||||
|
- cairo_pattern_destroy(p);
|
||||||
|
-
|
||||||
|
return CAIRO_TEST_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -36,4 +64,3 @@ CAIRO_TEST (bug_image_compositor,
|
||||||
|
10000, 1,
|
||||||
|
NULL, draw)
|
||||||
|
|
||||||
|
-
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
228
cairo.spec
228
cairo.spec
@ -1,32 +1,51 @@
|
|||||||
%define pixman_version 0.36.0
|
%define pixman_version 0.30.0
|
||||||
%define freetype_version 9.7.3
|
%define freetype_version 2.1.9
|
||||||
%define fontconfig_version 2.2.95
|
%define fontconfig_version 2.2.95
|
||||||
|
|
||||||
Name: cairo
|
%if 0%{?fedora} > 26 || 0%{?rhel} > 7
|
||||||
Version: 1.18.2
|
%global cairogl --disable-gl
|
||||||
Release: 2%{?dist}
|
%else
|
||||||
Summary: A 2D graphics library
|
%global cairogl --enable-gl
|
||||||
|
%global with_gl 1
|
||||||
|
%endif
|
||||||
|
|
||||||
License: LGPL-2.1-only OR MPL-1.1
|
Name: cairo
|
||||||
URL: https://cairographics.org
|
Version: 1.15.12
|
||||||
Source: https://cairographics.org/releases/%{name}-%{version}.tar.xz
|
Release: 6%{?dist}
|
||||||
|
Summary: A 2D graphics library
|
||||||
|
|
||||||
Patch: cairo-multilib.patch
|
License: LGPLv2 or MPLv1.1
|
||||||
|
URL: http://cairographics.org
|
||||||
|
Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
BuildRequires: gcc
|
# Backported from upstream
|
||||||
BuildRequires: gcc-c++
|
Patch0: 0001-Fix-assertion-failure-in-the-freetype-backend.patch
|
||||||
BuildRequires: gtk-doc
|
|
||||||
BuildRequires: meson
|
Patch3: cairo-multilib.patch
|
||||||
BuildRequires: pkgconfig(expat)
|
|
||||||
BuildRequires: pkgconfig(pixman-1) >= %{pixman_version}
|
# https://gitlab.freedesktop.org/cairo/cairo/merge_requests/1
|
||||||
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
|
Patch4: 0001-Set-default-LCD-filter-to-FreeType-s-default.patch
|
||||||
BuildRequires: pkgconfig(fontconfig) >= %{fontconfig_version}
|
|
||||||
BuildRequires: pkgconfig(gobject-2.0)
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1908113
|
||||||
BuildRequires: pkgconfig(libpng)
|
Patch5: cairo-1.15.12-CVE-2020-35492.patch
|
||||||
BuildRequires: pkgconfig(librsvg-2.0)
|
|
||||||
BuildRequires: pkgconfig(xext)
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(xcb-render)
|
BuildRequires: libXrender-devel
|
||||||
BuildRequires: pkgconfig(xrender)
|
BuildRequires: libX11-devel
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
|
BuildRequires: pixman-devel >= %{pixman_version}
|
||||||
|
BuildRequires: freetype-devel >= %{freetype_version}
|
||||||
|
BuildRequires: fontconfig-devel >= %{fontconfig_version}
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: librsvg2-devel
|
||||||
|
%if 0%{?with_gl}
|
||||||
|
BuildRequires: mesa-libGL-devel
|
||||||
|
BuildRequires: mesa-libEGL-devel
|
||||||
|
%endif
|
||||||
|
# Required for Patch5.
|
||||||
|
BuildRequires: autoconf automake libtool
|
||||||
|
BuildRequires: git-core
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Cairo is a 2D graphics library designed to provide high-quality display
|
Cairo is a 2D graphics library designed to provide high-quality display
|
||||||
@ -72,7 +91,6 @@ needed for developing software which uses the cairo Gobject library.
|
|||||||
|
|
||||||
%package tools
|
%package tools
|
||||||
Summary: Development tools for cairo
|
Summary: Development tools for cairo
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description tools
|
%description tools
|
||||||
Cairo is a 2D graphics library designed to provide high-quality display
|
Cairo is a 2D graphics library designed to provide high-quality display
|
||||||
@ -82,33 +100,40 @@ This package contains tools for working with the cairo graphics library.
|
|||||||
* cairo-trace: Record cairo library calls for later playback
|
* cairo-trace: Record cairo library calls for later playback
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -S git
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson \
|
autoreconf --force --install
|
||||||
-Dfreetype=enabled \
|
%configure --disable-static \
|
||||||
-Dfontconfig=enabled \
|
--enable-xlib \
|
||||||
-Dglib=enabled \
|
--enable-ft \
|
||||||
-Dgtk_doc=true \
|
--enable-ps \
|
||||||
-Dspectre=disabled \
|
--enable-pdf \
|
||||||
-Dsymbol-lookup=disabled \
|
--enable-svg \
|
||||||
-Dtee=enabled \
|
--enable-tee \
|
||||||
-Dtests=disabled \
|
--enable-gobject \
|
||||||
-Dxcb=enabled \
|
%{cairogl} \
|
||||||
-Dxlib=enabled \
|
--disable-gtk-doc
|
||||||
%{nil}
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
%meson_build
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
|
make V=1 %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%make_install
|
||||||
|
find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||||
|
|
||||||
|
%ldconfig_scriptlets
|
||||||
|
%ldconfig_scriptlets gobject
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
|
%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
|
||||||
%doc AUTHORS BUGS NEWS README.md
|
%doc AUTHORS BIBLIOGRAPHY BUGS NEWS README
|
||||||
%{_libdir}/libcairo.so.2*
|
%{_libdir}/libcairo.so.*
|
||||||
%{_libdir}/libcairo-script-interpreter.so.2*
|
%{_libdir}/libcairo-script-interpreter.so.*
|
||||||
|
%{_bindir}/cairo-sphinx
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
%doc ChangeLog PORTING_GUIDE
|
||||||
%dir %{_includedir}/cairo/
|
%dir %{_includedir}/cairo/
|
||||||
%{_includedir}/cairo/cairo-deprecated.h
|
%{_includedir}/cairo/cairo-deprecated.h
|
||||||
%{_includedir}/cairo/cairo-features.h
|
%{_includedir}/cairo/cairo-features.h
|
||||||
@ -132,7 +157,6 @@ This package contains tools for working with the cairo graphics library.
|
|||||||
%{_libdir}/pkgconfig/cairo-pdf.pc
|
%{_libdir}/pkgconfig/cairo-pdf.pc
|
||||||
%{_libdir}/pkgconfig/cairo-png.pc
|
%{_libdir}/pkgconfig/cairo-png.pc
|
||||||
%{_libdir}/pkgconfig/cairo-ps.pc
|
%{_libdir}/pkgconfig/cairo-ps.pc
|
||||||
%{_libdir}/pkgconfig/cairo-script-interpreter.pc
|
|
||||||
%{_libdir}/pkgconfig/cairo-svg.pc
|
%{_libdir}/pkgconfig/cairo-svg.pc
|
||||||
%{_libdir}/pkgconfig/cairo-tee.pc
|
%{_libdir}/pkgconfig/cairo-tee.pc
|
||||||
%{_libdir}/pkgconfig/cairo-xlib.pc
|
%{_libdir}/pkgconfig/cairo-xlib.pc
|
||||||
@ -141,9 +165,15 @@ This package contains tools for working with the cairo graphics library.
|
|||||||
%{_libdir}/pkgconfig/cairo-xcb-shm.pc
|
%{_libdir}/pkgconfig/cairo-xcb-shm.pc
|
||||||
%{_libdir}/pkgconfig/cairo-xcb.pc
|
%{_libdir}/pkgconfig/cairo-xcb.pc
|
||||||
%{_datadir}/gtk-doc/html/cairo
|
%{_datadir}/gtk-doc/html/cairo
|
||||||
|
%if 0%{?with_gl}
|
||||||
|
%{_includedir}/cairo/cairo-gl.h
|
||||||
|
%{_libdir}/pkgconfig/cairo-egl.pc
|
||||||
|
%{_libdir}/pkgconfig/cairo-gl.pc
|
||||||
|
%{_libdir}/pkgconfig/cairo-glx.pc
|
||||||
|
%endif
|
||||||
|
|
||||||
%files gobject
|
%files gobject
|
||||||
%{_libdir}/libcairo-gobject.so.2*
|
%{_libdir}/libcairo-gobject.so.*
|
||||||
|
|
||||||
%files gobject-devel
|
%files gobject-devel
|
||||||
%{_includedir}/cairo/cairo-gobject.h
|
%{_includedir}/cairo/cairo-gobject.h
|
||||||
@ -155,110 +185,18 @@ This package contains tools for working with the cairo graphics library.
|
|||||||
%{_libdir}/cairo/
|
%{_libdir}/cairo/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.18.2-2
|
* Thu Jan 20 2022 David King <dking@redhat.com> - 1.15.12-6
|
||||||
- Bump release for October 2024 mass rebuild:
|
- Fix CVE reference test (#1908113)
|
||||||
Resolves: RHEL-64018
|
|
||||||
|
|
||||||
* Tue Sep 10 2024 Matthias Clasen <mclasen@redhat.com> - 1.18.2-1
|
* Thu Jan 20 2022 David King <dking@redhat.com> - 1.15.12-5
|
||||||
- Update to 1.18.2
|
- Add reference test to CVE fix (#1908113)
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.18.0-4
|
* Mon Jan 17 2022 David King <dking@redhat.com> - 1.15.12-4
|
||||||
- Bump release for June 2024 mass rebuild
|
- Fix CVE-2020-35492 (#1908113)
|
||||||
|
|
||||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
|
* Thu Dec 6 2018 Marek Kasik <mkasik@redhat.com> - 1.15.12-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Sep 27 2023 Kalev Lember <klember@redhat.com> - 1.18.0-1
|
|
||||||
- Update to 1.18.0
|
|
||||||
- Drop the xml surface and cairo-sphinx tool as they've been removed upstream
|
|
||||||
|
|
||||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.8-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon May 15 2023 Scott Talbert <swt@techie.net> - 1.17.8-4
|
|
||||||
- Fix crash due to scaled_glyph->dev_private reuse (#2189228)
|
|
||||||
|
|
||||||
* Wed Mar 15 2023 David King <amigadave@amigadave.com> - 1.17.8-3
|
|
||||||
- Fix missing glyphs in ft-font
|
|
||||||
|
|
||||||
* Sat Feb 25 2023 Marek Kasik <mkasik@redhat.com> - 1.17.8-2
|
|
||||||
- Rebuild for new freetype-2.13.0
|
|
||||||
|
|
||||||
* Mon Feb 20 2023 David King <amigadave@amigadave.com> - 1.17.8-1
|
|
||||||
- Update to 1.17.8 (#2166624)
|
|
||||||
|
|
||||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Mar 18 2022 David King <amigadave@amigadave.com> - 1.17.6-1
|
|
||||||
- Update to 1.17.6
|
|
||||||
|
|
||||||
* Fri Feb 25 2022 David King <amigadave@amigadave.com> - 1.17.4-7
|
|
||||||
- Fix permissions on cairo-trace
|
|
||||||
- Add explicit Requires to tools subpackage
|
|
||||||
|
|
||||||
* Tue Feb 15 2022 David King <amigadave@amigadave.com> - 1.17.4-6
|
|
||||||
- Switch to meson
|
|
||||||
- Use pkgconfig for BuildRequires
|
|
||||||
|
|
||||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.4-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.4-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Mar 16 2021 Kalev Lember <klember@redhat.com> - 1.17.4-3
|
|
||||||
- Backport an upstream patch to fix generating PDF font names (#1939399)
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.4-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Dec 11 2020 Kalev Lember <klember@redhat.com> - 1.17.4-1
|
|
||||||
- Update to 1.17.4
|
|
||||||
- Tighten soname globs
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Apr 24 2020 Marek Kasik <mkasik@redhat.com> - 1.16.0-8
|
|
||||||
- Allow empty array of operands for certain operators in CFF fonts
|
|
||||||
- Resolves: #1817958
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 03 2019 Kalev Lember <klember@redhat.com> - 1.16.0-5
|
|
||||||
- Fix a thinko in composite_color_glyphs
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Dec 7 2018 Marek Kasik <mkasik@redhat.com> - 1.16.0-3
|
|
||||||
- Use FT_Done_MM_Var instead of free when available in
|
|
||||||
- cairo_ft_apply_variations
|
|
||||||
|
|
||||||
* Fri Dec 7 2018 Marek Kasik <mkasik@redhat.com> - 1.16.0-2
|
|
||||||
- Set default LCD filter to FreeType's default
|
- Set default LCD filter to FreeType's default
|
||||||
- Resolves: #1645763
|
- Resolves: #1651240
|
||||||
|
|
||||||
* Mon Oct 22 2018 Kalev Lember <klember@redhat.com> - 1.16.0-1
|
|
||||||
- Update to 1.16.0
|
|
||||||
|
|
||||||
* Sat Sep 22 2018 Kalev Lember <klember@redhat.com> - 1.15.14-1
|
|
||||||
- Update to 1.15.14
|
|
||||||
- Drop ldconfig scriptlets
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.12-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Apr 21 2018 Kalev Lember <klember@redhat.com> - 1.15.12-2
|
* Sat Apr 21 2018 Kalev Lember <klember@redhat.com> - 1.15.12-2
|
||||||
- Fix assertion failure in the freetype backend (#1567633)
|
- Fix assertion failure in the freetype backend (#1567633)
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-10
|
- rhel-8
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cairo-1.18.2.tar.xz) = 9b533ef65da120bdf6ec6e66b76c9a9a489b91951925357c2db9f399ce27fe03d10e500c4c03b72ad43d73bb5beb4d51e36c24443977a52ecfe1d24b07c99bef
|
SHA512 (cairo-1.15.12.tar.xz) = 97fb2c515f6449c1d84dc3187d11187290a219d39f8168a4367ca43505da80167df93b609a69b7e3938e9d38a2b7db459ad7130d9b5f12ff8c898994dfaa6d7e
|
||||||
|
Loading…
Reference in New Issue
Block a user