Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 69222afae6 |
19
_service
19
_service
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<services>
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://gitlab.freedesktop.org/cairo/cairo.git</param>
|
||||
<param name="revision">1.18.4</param>
|
||||
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
|
||||
<param name="versionrewrite-pattern">v?(.*)\+0</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<!-- <param name="changesgenerate">enable</param> -->
|
||||
</service>
|
||||
<!-- <service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">zst</param>
|
||||
</service> -->
|
||||
<service name="set_version" mode="manual" />
|
||||
</services>
|
||||
|
||||
110
cairo-1.17.8-fix-tee-compilation.patch
Normal file
110
cairo-1.17.8-fix-tee-compilation.patch
Normal file
@@ -0,0 +1,110 @@
|
||||
From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||
Date: Fri, 3 Feb 2023 15:40:12 +0100
|
||||
Subject: [PATCH] tee: Fix cairo wrapper functions
|
||||
|
||||
Follow-up to !391 to apply the same changes to the (disabled by default)
|
||||
tee surface.
|
||||
|
||||
Fixes: #634
|
||||
---
|
||||
src/cairo-tee-surface.c | 24 ++++++++++++++----------
|
||||
1 file changed, 14 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
|
||||
index 7a94c9bca..4994a5a60 100644
|
||||
--- a/src/cairo-tee-surface.c
|
||||
+++ b/src/cairo-tee-surface.c
|
||||
@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void *abstract_surface,
|
||||
num_slaves = _cairo_array_num_elements (&surface->slaves);
|
||||
slaves = _cairo_array_index (&surface->slaves, 0);
|
||||
for (n = 0; n < num_slaves; n++) {
|
||||
- status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip);
|
||||
+ status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0, clip);
|
||||
if (unlikely (status))
|
||||
return status;
|
||||
}
|
||||
|
||||
- return _cairo_surface_wrapper_paint (&surface->master, op, source, clip);
|
||||
+ return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip);
|
||||
}
|
||||
|
||||
static cairo_int_status_t
|
||||
@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void *abstract_surface,
|
||||
slaves = _cairo_array_index (&surface->slaves, 0);
|
||||
for (n = 0; n < num_slaves; n++) {
|
||||
status = _cairo_surface_wrapper_mask (&slaves[n],
|
||||
- op, source, mask, clip);
|
||||
+ op, source, 0,
|
||||
+ mask, 0,
|
||||
+ clip);
|
||||
if (unlikely (status))
|
||||
return status;
|
||||
}
|
||||
|
||||
return _cairo_surface_wrapper_mask (&surface->master,
|
||||
- op, source, mask, clip);
|
||||
+ op, source, 0,
|
||||
+ mask, 0,
|
||||
+ clip);
|
||||
}
|
||||
|
||||
static cairo_int_status_t
|
||||
@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void *abstract_surface,
|
||||
slaves = _cairo_array_index (&surface->slaves, 0);
|
||||
for (n = 0; n < num_slaves; n++) {
|
||||
status = _cairo_surface_wrapper_stroke (&slaves[n],
|
||||
- op, source,
|
||||
+ op, source, 0,
|
||||
path, style,
|
||||
ctm, ctm_inverse,
|
||||
tolerance, antialias,
|
||||
@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void *abstract_surface,
|
||||
}
|
||||
|
||||
return _cairo_surface_wrapper_stroke (&surface->master,
|
||||
- op, source,
|
||||
+ op, source, 0,
|
||||
path, style,
|
||||
ctm, ctm_inverse,
|
||||
tolerance, antialias,
|
||||
@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void *abstract_surface,
|
||||
slaves = _cairo_array_index (&surface->slaves, 0);
|
||||
for (n = 0; n < num_slaves; n++) {
|
||||
status = _cairo_surface_wrapper_fill (&slaves[n],
|
||||
- op, source,
|
||||
+ op, source, 0,
|
||||
path, fill_rule,
|
||||
tolerance, antialias,
|
||||
clip);
|
||||
@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void *abstract_surface,
|
||||
}
|
||||
|
||||
return _cairo_surface_wrapper_fill (&surface->master,
|
||||
- op, source,
|
||||
+ op, source, 0,
|
||||
path, fill_rule,
|
||||
tolerance, antialias,
|
||||
clip);
|
||||
@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface,
|
||||
for (n = 0; n < num_slaves; n++) {
|
||||
memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
|
||||
status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op,
|
||||
- source,
|
||||
+ source, 0,
|
||||
utf8, utf8_len,
|
||||
glyphs_copy, num_glyphs,
|
||||
clusters, num_clusters,
|
||||
@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface,
|
||||
|
||||
memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
|
||||
status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
|
||||
- source,
|
||||
+ source, 0,
|
||||
utf8, utf8_len,
|
||||
glyphs_copy, num_glyphs,
|
||||
clusters, num_clusters,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
62
cairo-1.17.8-ft-font-missing-glyph.patch
Normal file
62
cairo-1.17.8-ft-font-missing-glyph.patch
Normal file
@@ -0,0 +1,62 @@
|
||||
From 2766d9feeccd5d66e346b0abab38726b8e0aa1e9 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Johnson <ajohnson@redneon.com>
|
||||
Date: Tue, 7 Mar 2023 19:40:21 +1030
|
||||
Subject: [PATCH] ft: Use normal font size when detecting the format
|
||||
|
||||
The format may depend on the font size.
|
||||
|
||||
Fixes #643
|
||||
---
|
||||
src/cairo-ft-font.c | 17 ++++++++++++++++-
|
||||
1 file changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
|
||||
index 22a6a622b..89af6193d 100644
|
||||
--- a/src/cairo-ft-font.c
|
||||
+++ b/src/cairo-ft-font.c
|
||||
@@ -3314,11 +3314,13 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font,
|
||||
if (scaled_font->unscaled->have_color && scaled_font->base.options.color_mode != CAIRO_COLOR_MODE_NO_COLOR)
|
||||
color_flag = FT_LOAD_COLOR;
|
||||
#endif
|
||||
+ /* Ensure use_em_size = FALSE as the format (bitmap or outline)
|
||||
+ * may change with the size. */
|
||||
status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
|
||||
scaled_glyph,
|
||||
face,
|
||||
load_flags | color_flag,
|
||||
- !hint_metrics,
|
||||
+ FALSE,
|
||||
vertical_layout);
|
||||
if (unlikely (status))
|
||||
return status;
|
||||
@@ -3344,6 +3346,18 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font,
|
||||
glyph_priv->format = CAIRO_FT_GLYPH_TYPE_BITMAP;
|
||||
}
|
||||
|
||||
+ /* If hinting is off, load the glyph with font size set the the em size. */
|
||||
+ if (!hint_metrics) {
|
||||
+ status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
|
||||
+ scaled_glyph,
|
||||
+ face,
|
||||
+ load_flags | color_flag,
|
||||
+ TRUE,
|
||||
+ vertical_layout);
|
||||
+ if (unlikely (status))
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
_cairo_ft_scaled_glyph_get_metrics (scaled_font,
|
||||
face,
|
||||
vertical_layout,
|
||||
@@ -3369,6 +3383,7 @@ _cairo_ft_scaled_glyph_init_metrics (cairo_ft_scaled_font_t *scaled_font,
|
||||
}
|
||||
|
||||
if (glyph_priv->format == CAIRO_FT_GLYPH_TYPE_COLR_V1) {
|
||||
+ /* Restore font size if previously loaded at em_size. */
|
||||
if (!hint_metrics) {
|
||||
status = _cairo_ft_scaled_glyph_load_glyph (scaled_font,
|
||||
scaled_glyph,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
BIN
cairo-1.17.8.tar.xz
(Stored with Git LFS)
Normal file
BIN
cairo-1.17.8.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
cairo-1.18.4.tar.xz
(Stored with Git LFS)
BIN
cairo-1.18.4.tar.xz
(Stored with Git LFS)
Binary file not shown.
@@ -1,8 +1,8 @@
|
||||
Index: cairo-1.18.0/src/cairo-ft-font.c
|
||||
Index: cairo-1.17.6/src/cairo-ft-font.c
|
||||
===================================================================
|
||||
--- cairo-1.18.0.orig/src/cairo-ft-font.c
|
||||
+++ cairo-1.18.0/src/cairo-ft-font.c
|
||||
@@ -1233,7 +1233,7 @@ _get_bitmap_surface (FT_Bitmap *bi
|
||||
--- cairo-1.17.6.orig/src/cairo-ft-font.c
|
||||
+++ cairo-1.17.6/src/cairo-ft-font.c
|
||||
@@ -1223,7 +1223,7 @@ _get_bitmap_surface (FT_Bitmap *bi
|
||||
width = bitmap->width;
|
||||
height = bitmap->rows;
|
||||
|
||||
|
||||
@@ -1,101 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 17 20:43:30 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.18.4:
|
||||
+ The dependency on LZO has been made optional through a build
|
||||
time configuration toggle.
|
||||
+ You can build Cairo against a Freetype installation that does
|
||||
not have the FT_Color type.
|
||||
+ Cairo tests now build on Solaris 11.4 with GCC 14.
|
||||
+ The DirectWrite backend now builds on MINGW 11.
|
||||
+ The DirectWrite backend now supports font variations and proper
|
||||
glyph coverage.
|
||||
+ Support for Windows 98 has been removed. The minimum
|
||||
requirement for Windows is now Vista.
|
||||
- Use tarball in lieu of source service due to freedesktop gitlab
|
||||
migration, will switch back at next release at the latest.
|
||||
- Drop b9eed915f9a67380e7ef9d8746656455c43f67e2.patch: Fixed
|
||||
upstream.
|
||||
- Add pkgconfig(lzo2) BuildRequires: New optional dependency, build
|
||||
lzo2 support feature.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 28 10:20:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Convert to source service: allows for easier upgrades by the
|
||||
GNOME team.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 20 07:40:13 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Add b9eed915f9a67380e7ef9d8746656455c43f67e2.patch: cff: Don't
|
||||
fail if no local subs. Fix regression when writing PDFs with
|
||||
fonts.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 2 16:35:56 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.18.2:
|
||||
+ The malloc-stats code has been removed from the tests directory
|
||||
the canonical location for it is:
|
||||
https://github.com/behdad/malloc-stats
|
||||
+ Cairo now requires a version of pixman equal to, or newer than,
|
||||
0.40.
|
||||
+ There have been multiple build fixes for newer versions of GCC
|
||||
for MSVC; for Solaris; and on macOS 10.7.
|
||||
+ PNG errors caused by loading malformed data are correctly
|
||||
propagated to callers, so they can handle the case.
|
||||
+ Both stroke and fill colors are now set when showing glyphs on
|
||||
a PDF surface.
|
||||
+ All the font options are copied when creating a fallback font
|
||||
object.
|
||||
+ When drawing text on macOS, Cairo now tries harder to select
|
||||
the appropriate font name.
|
||||
+ Cairo now prefers the COLRv1 table inside a font, if one is
|
||||
available.
|
||||
+ Cairo requires a C11 toolchain when building.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 23 17:18:14 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 1.18.0:
|
||||
+ The first stable cairo release in five years should be cause
|
||||
for celebration.
|
||||
+ All the API added in the 1.17 development cycle is now
|
||||
considered stable, and will not change.
|
||||
+ Many thanks to all the contributors for this release.
|
||||
+ The cairo-sphinx tool has been removed; we could not find any
|
||||
instruction on how to use it, and no user answered our call for
|
||||
help. If you were using cairo-sphinx, please reach out to the
|
||||
cairo maintainers.
|
||||
+ Cairo now implements Type 3 color fonts for PDF.
|
||||
+ Multiple documentation fixes, to ensure that the cairo API
|
||||
reference is up to date. Also fixed multiple compiler warnings
|
||||
generated when building cairo.
|
||||
+ The XML surface has been removed; it was disabled by default
|
||||
when building cairo, and we could not find any downstream
|
||||
distributor that would enable it.
|
||||
+ The Tee surface is now automatically enabled. Downstream
|
||||
distributors of cairo have been enabling for years it in order
|
||||
to build Firefox.
|
||||
+ Fixed multiple issues with the DWrite font backend.
|
||||
+ Improved the Quartz surface; mainly, Quartz surfaces now use
|
||||
the main display ColorSpace, speeding up rendering operations.
|
||||
+ Cairo now hides all private symbols by default on every
|
||||
platform; the old "slim" symbols hack to alias internally used
|
||||
symbols has been dropped, in favor of using
|
||||
`-Bsymbolic-functions` with toolchains that support it.
|
||||
+ Fixed multiple memory leaks in the code base and test suite,
|
||||
and general maintenance.
|
||||
+ Added new API to expose the Pixman dithering filter to cairo
|
||||
patterns; this is currently implemented only for image
|
||||
surfaces.
|
||||
- Drop patches fixed upstream:
|
||||
+ cairo-1.17.8-fix-tee-compilation.patch
|
||||
+ cairo-1.17.8-ft-font-missing-glyph.patch
|
||||
- Rebase patches with quilt.
|
||||
- Stop passing xml=disabled to meson setup, xml backend is dropped.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 17 13:27:04 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
name: cairo
|
||||
version: 1.18.2
|
||||
mtime: 1725196163
|
||||
commit: 200441e6855854eb4dbf338e44d67b00ababe07f
|
||||
18
cairo.spec
18
cairo.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package cairo
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -19,21 +19,23 @@
|
||||
%define build_xcb_backend 1
|
||||
|
||||
Name: cairo
|
||||
Version: 1.18.4
|
||||
Version: 1.17.8
|
||||
Release: 0
|
||||
Summary: Vector Graphics Library with Cross-Device Output Support
|
||||
License: LGPL-2.1-or-later OR MPL-1.1
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://cairographics.org
|
||||
### FIXME ### - Switch back to using source service!
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
%dnl #Source0: %{name}-%{version}.tar.zst
|
||||
URL: https://cairographics.org/
|
||||
Source0: https://cairographics.org/snapshots/%{name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
|
||||
# PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 fcrozat@suse.com -- Fix crash when client and server have different endianness
|
||||
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-1.17.8-fix-tee-compilation.patch -- https://gitlab.freedesktop.org/cairo/cairo/-/issues/634 tee: Fix cairo wrapper functions
|
||||
Patch2: cairo-1.17.8-fix-tee-compilation.patch
|
||||
# PATCH-FIX-UPSTREAM cairo-1.17.8-ft-font-missing-glyph.patch -- https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/467 ft: Use normal font size when detecting the format
|
||||
Patch3: cairo-1.17.8-ft-font-missing-glyph.patch
|
||||
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: c_compiler
|
||||
@@ -44,7 +46,6 @@ BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(lzo2)
|
||||
BuildRequires: pkgconfig(pixman-1) >= 0.36.0
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
@@ -157,6 +158,7 @@ cairo.
|
||||
-D tee=enabled \
|
||||
-D tests=disabled \
|
||||
-D xlib=enabled \
|
||||
-D xml=disabled
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
@@ -180,9 +182,11 @@ cairo.
|
||||
|
||||
%files tools
|
||||
%license util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
|
||||
%{_bindir}/cairo-sphinx
|
||||
%{_bindir}/cairo-trace
|
||||
%dir %{_libdir}/cairo
|
||||
%{_libdir}/cairo/libcairo-fdr.so
|
||||
%{_libdir}/cairo/libcairo-sphinx.so
|
||||
%{_libdir}/cairo/libcairo-trace.so
|
||||
|
||||
%files devel
|
||||
|
||||
Reference in New Issue
Block a user