Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

7 changed files with 4 additions and 76 deletions

View File

@ -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.2</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>

View File

@ -1,34 +0,0 @@
From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <ajohnson@redneon.com>
Date: Fri, 13 Sep 2024 06:28:39 +0930
Subject: [PATCH] cff: Don't fail if no local subs
Fixes: #870
---
src/cairo-cff-subset.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index 076cb2b0a..8a7de0065 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t *font,
decode_number (operand, nominal_width);
num_subs = _cairo_array_num_elements (local_sub_index);
- *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
- if (unlikely (*local_subs_used == NULL))
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ if (num_subs > 0) {
+ *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
+ if (unlikely (*local_subs_used == NULL))
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ } else {
+ *local_subs_used = NULL;
+ }
if (num_subs < 1240)
*local_sub_bias = 107;
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a21fd66ba9b5acb0091fd41432950b100163d9ddadcdc4dab4b9791ebbaa648
size 61616142

BIN
cairo-1.18.2.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,16 +1,3 @@
-------------------------------------------------------------------
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>

View File

@ -1,4 +0,0 @@
name: cairo
version: 1.18.2
mtime: 1725196163
commit: 200441e6855854eb4dbf338e44d67b00ababe07f

View File

@ -25,15 +25,13 @@ 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
Source0: %{name}-%{version}.tar.zst
Source0: %{url}/releases/%{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 b9eed915f9a67380e7ef9d8746656455c43f67e2.patch -- cff: Don't fail if no local subs. Fix regression when writing PDFs with fonts
Patch2: https://gitlab.freedesktop.org/cairo/cairo/-/commit/b9eed915f9a67380e7ef9d8746656455c43f67e2.patch
BuildRequires: c++_compiler
BuildRequires: c_compiler