pool/cairo
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 520690 from GNOME:Factory

Browse Source 
Scripted push of project GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/520690
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2017-09-13 19:40:35 +00:00 committed by Git OBS Bridge
commit a968a16711
6 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cairo-1.15.6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c
size 41836012

3
cairo-1.15.8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3224260a4f8e22e7ea95faf706ae111b974833dd74185be1db5ebc7618a98464
size 41841808

23
cairo-fix-off-by-one-check.patch
View File

@ -1,23 +0,0 @@
From 57b40507dda3f58dfc8635548d606b86dc7bcf51 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <ajohnson@redneon.com>
Date: Thu, 15 Jun 2017 20:53:29 +0930
Subject: Fix off by one check in cairo-image-info.c
https://bugs.freedesktop.org/show_bug.cgi?id=101427
diff --git a/src/cairo-image-info.c b/src/cairo-image-info.c
index 2ecce95..3b4cf6e 100644
--- a/src/cairo-image-info.c
+++ b/src/cairo-image-info.c
@@ -154,7 +154,7 @@ _cairo_image_info_get_jpeg_info (cairo_image_info_t *info,
break;
}
- if (p + 2 > data + length)
+ if (p + 3 > data + length)
return CAIRO_INT_STATUS_UNSUPPORTED;
p = _jpeg_skip_segment (p);
--
cgit v0.10.2

0
0001-image-prevent-invalid-ptr-access-for-4GB-images.patch → cairo-image-prevent-invalid-ptr-access.patch
View File

30
cairo.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Wed Aug 30 14:35:46 UTC 2017 - zaitor@opensuse.org
- Update to version 1.15.8:
+ This small snapshot provides new colored emoji glyph support,
and a handful of minor fixes. For a complete log of changes,
please see
http://cairographics.org/releases/ChangeLog.1.15.8
+ Features and Enhancements: Support colored emoji glyphs, stored
as PNG images in OpenType fonts.
+ Bug Fixes:
- pdf:
. Fix internal links pointing to other pages, by
pre-calculating page heights so that link positions can be
calculated more accurately.
. Don't emit /PageLabel dict when no labels defined.
- image: Fix crash on negative lengths.
- win32: Fix initialization of mutexes for static builds.
- font:
. Fix color font loading on big-endian systems.
. Fix color font support infinite-loop with empty glyphs.
- Fix off by one check in cairo-image-info.c.
- Drop cairo-fix-off-by-one-check.patch: Fixed upstream.
- Run spec-cleaner, modernize spec.
- Rename 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
to cairo-image-prevent-invalid-ptr-access.patch.
- Pass enable-gtk-doc instead of disable-gtk-doc to configure, we
already have the gtk-doc BuildRequires in place so I can only
assume that this was an honest error.
-------------------------------------------------------------------
Tue Jun 20 11:20:29 UTC 2017 - alarrosa@suse.com

40
cairo.spec
View File

@ -19,10 +19,10 @@
%define build_xcb_backend 1
%define build_gl_backend 1
Name: cairo
Version: 1.15.6
Version: 1.15.8
Release: 0
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPL-2.1+ or MPL-1.1
License: LGPL-2.1+ OR MPL-1.1
Group: Development/Libraries/C and C++
Url: http://cairographics.org/
Source: http://cairographics.org/snapshots/%{name}-%{version}.tar.xz
@ -31,12 +31,10 @@ 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-off-by-one-check.patch fdo#101427 zaitor@opensuse.org -- Fix off by one check in cairo-image-info.c
Patch2: cairo-fix-off-by-one-check.patch
# PATCH-FIX-UPSTREAM 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch bsc#1007255 fdo#98165 CVE-2016-9082 alarrosa@suse.com -- Fix segfault when using >4GB images
Patch3: 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch
# PATCH-FIX-UPSTREAM cairo-image-prevent-invalid-ptr-access.patch bsc#1007255 fdo#98165 CVE-2016-9082 alarrosa@suse.com -- Fix segfault when using >4GB images
Patch2: cairo-image-prevent-invalid-ptr-access.patch
BuildRequires: gtk-doc
BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gobject-2.0)
@ -45,7 +43,6 @@ BuildRequires: pkgconfig(pixman-1) >= 0.30.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrender)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel
@ -66,7 +63,7 @@ hardware acceleration when available.
%package -n libcairo2
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPL-2.1+ or MPL-1.1
License: LGPL-2.1+ OR MPL-1.1
Group: System/Libraries
Provides: cairo = %{version}
Obsoletes: cairo < %{version}
@ -80,7 +77,7 @@ hardware acceleration when available.
%package -n libcairo-gobject2
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPL-2.1+ or MPL-1.1
License: LGPL-2.1+ OR MPL-1.1
Group: System/Libraries
%description -n libcairo-gobject2
@ -95,7 +92,7 @@ meant to support gobject-introspection binding creation.
%package -n libcairo-script-interpreter2
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPL-2.1+ or MPL-1.1
License: LGPL-2.1+ OR MPL-1.1
Group: System/Libraries
%description -n libcairo-script-interpreter2
@ -126,7 +123,7 @@ This package contains various cairo utilities.
%package devel
Summary: Development environment for cairo
License: LGPL-2.1+ or MPL-1.1
License: LGPL-2.1+ OR MPL-1.1
Group: Development/Libraries/X11
Requires: libcairo-gobject2 = %{version}
Requires: libcairo-script-interpreter2 = %{version}
@ -143,7 +140,6 @@ cairo.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure \
@ -161,42 +157,33 @@ cairo.
--enable-xcb \
%endif
--enable-xlib \
--disable-gtk-doc \
--enable-gtk-doc \
--disable-static
make %{?_smp_mflags} V=1
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%post -n libcairo2 -p /sbin/ldconfig
%postun -n libcairo2 -p /sbin/ldconfig
%post -n libcairo-gobject2 -p /sbin/ldconfig
%postun -n libcairo-gobject2 -p /sbin/ldconfig
%post -n libcairo-script-interpreter2 -p /sbin/ldconfig
%postun -n libcairo-script-interpreter2 -p /sbin/ldconfig
%files -n libcairo2
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README
%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
%{_libdir}/libcairo.so.*
%files -n libcairo-gobject2
%defattr(-, root, root)
%{_libdir}/libcairo-gobject.so.2*
%files -n libcairo-script-interpreter2
%defattr(-, root, root)
%doc util/cairo-script/COPYING
%{_libdir}/libcairo-script-interpreter.so.*
%files tools
%defattr(-, root, root)
%doc util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3
%{_bindir}/cairo-sphinx
%{_bindir}/cairo-trace
@ -206,8 +193,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/cairo/libcairo-trace.so
%files devel
%defattr(-, root, root)
%doc PORTING_GUIDE
%doc AUTHORS ChangeLog NEWS PORTING_GUIDE README
%doc %{_datadir}/gtk-doc/html/cairo
%{_includedir}/cairo/
%{_libdir}/*.so