rpm/cairo
SHA256
1
0
Fork 0
forked from pool/cairo
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/cairo revision 32.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=f97138e04d30cd8f014eba89a2e721a1
This commit is contained in:
OBS User buildservice-autocommit 2010-08-09 14:43:36 +00:00 committed by Git OBS Bridge
parent 77b8ca18c9
commit faa9aeaf58
8 changed files with 210 additions and 1128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
baselibs.conf
View File

@ -1,3 +1,6 @@
cairo libcairo2
provides "cairo-<targettype> = <version>"
obsoletes "cairo-<targettype> < <version>"
libcairo-script-interpreter2
arch ppc package cairo-devel arch ppc package cairo-devel
arch sparcv9 package cairo-devel arch sparcv9 package cairo-devel

3
cairo-1.8.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ea375f4eed6b58b63b5c7c1ae6451ddfa15d014aa24ab61ebf45368d3df1c9c
size 6146974

33
cairo-1.8.6-repeat-modes.patch
View File

@ -1,33 +0,0 @@
Index: cairo-1.8.8/src/cairo-xlib-surface.c
===================================================================
--- cairo-1.8.8.orig/src/cairo-xlib-surface.c
+++ cairo-1.8.8/src/cairo-xlib-surface.c
@@ -1425,7 +1425,11 @@ _cairo_xlib_surface_set_attributes (cair
_cairo_xlib_surface_set_repeat (surface, RepeatNormal);
break;
case CAIRO_EXTEND_REFLECT:
+ _cairo_xlib_surface_set_repeat (surface, RepeatReflect);
+ break;
case CAIRO_EXTEND_PAD:
+ _cairo_xlib_surface_set_repeat (surface, RepeatPad);
+ break;
default:
return CAIRO_INT_STATUS_UNSUPPORTED;
}
Index: cairo-1.8.8/src/cairo-xcb-surface.c
===================================================================
--- cairo-1.8.8.orig/src/cairo-xcb-surface.c
+++ cairo-1.8.8/src/cairo-xcb-surface.c
@@ -845,7 +845,12 @@ _cairo_xcb_surface_set_attributes (cairo
_cairo_xcb_surface_set_repeat (surface, 1);
break;
case CAIRO_EXTEND_REFLECT:
+ _cairo_xcb_surface_set_repeat (surface, 3);
+ break;
case CAIRO_EXTEND_PAD:
+ _cairo_xcb_surface_set_repeat (surface, 2);
+ break;
+ default:
return CAIRO_INT_STATUS_UNSUPPORTED;
}

3
cairo-1.9.14.tar.bz2 Normal file
View File

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

1051
cairo-lcd-filter.patch
View File

File diff suppressed because it is too large Load Diff

24
cairo-modules-no-version.patch Normal file
View File

@ -0,0 +1,24 @@
Index: cairo-1.9.12/util/cairo-fdr/Makefile.am
===================================================================
--- cairo-1.9.12.orig/util/cairo-fdr/Makefile.am
+++ cairo-1.9.12/util/cairo-fdr/Makefile.am
@@ -9,5 +9,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
-cairo_fdr_la_LDFLAGS = -module -no-undefined
+cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version
cairo_fdr_la_LIBADD = -ldl
Index: cairo-1.9.12/util/cairo-trace/Makefile.am
===================================================================
--- cairo-1.9.12.orig/util/cairo-trace/Makefile.am
+++ cairo-1.9.12/util/cairo-trace/Makefile.am
@@ -11,7 +11,7 @@ libcairo_trace_la_SOURCES = trace.c
libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
-libcairo_trace_la_LDFLAGS = -no-undefined
+libcairo_trace_la_LDFLAGS = -no-undefined -module -avoid-version
libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz
if CAIRO_HAS_DL

87
cairo.changes
View File

@ -1,3 +1,90 @@
-------------------------------------------------------------------
Wed Jul 28 12:38:42 CEST 2010 - dimstar@opensuse.org
- Update to version 1.9.14:
+ fdo#29008: Clip doesn't work for text on the image backend
+ fdo#29114: Add explicit dependency for cxx
+ fdo#29120, fdo#29121, fdo#29122, fdo#29124, fdo#29125: Fix
regressions in reporting clip extents
-------------------------------------------------------------------
Wed Jul 21 16:36:50 CEST 2010 - vuntz@opensuse.org
- Clean up update to 1.9.12.
- Split main package in libcairo2, libcairo-script-interpreter2 and
cairo-utils subpackages, to follow the shared library policy.
Note that libcairo2 provides/obsoletes cairo.
- Change freetype2-devel, libpng-devel, xorg-x11-devel,
xorg-x11-libxcb-devel BuildRequires to pkgconfig() BuildRequires
for: fontconfig, freetype2, libpng, pixman-1, x11, xcb, xrender.
- Remove Provides/Obsoletes for libpixman <= 0.1.1 (this was for
very old versions of SUSE Linux).
- Remove fontconfig-devel, freetype2-devel, libpng-devel,
xorg-x11-devel, xorg-x11-libX11-devel, xorg-x11-libXrender-devel,
xorg-x11-libxcb-devel Requires of devel package: they're now all
required with the automatically added pkgconfig().
- Fix self-obsoletion of cairo-doc.
-------------------------------------------------------------------
Mon Jul 19 12:13:18 UTC 2010 - dimstar@opensuse.org
- Update to version 1.9.12:
+ Various API additions (see NEWS for details).
+ Bug fixes.
+ Updated documentation.
- Remove gcc-c++ BuildRequires.
-------------------------------------------------------------------
Thu Jul 8 23:00:26 CEST 2010 - dimstar@opensuse.org
- Update to version 1.9.10:
+ Fix many bugs introduced in 1.9.x releases.
+ Add WGL interface for cairo-gl
+ Include the downstream patch to honour the user's LCD filtering
preferences for subpixel rendering of fonts
- Changes from version 1.9.8:
+ Various API additions (see NEWS for details).
+ Backend-specific improvements:
- cairo-gl: many changes
- cairo-xlib:
. access to the underlying connection to the Display is now
thread-safe
. attempt to use PolyModeImprecise when compositing
trapezoids
- cairo-svg: enable SVG to reference external image through the
use an extended MIME data type.
- Changes from version 1.9.6:
+ Various API additions (see NEWS for details).
+ Completely drop cairo-glitz.
+ Many improvements for drawing of dashed strokes.
+ Optimize spans-based renderers for repeated rows.
+ Backend-specific improvements:
- add cairo-drm backend
- start using GLSL to accelerate many operations in cairo-gl
- make cairo-image faster
- cairo-quartz fixes
- improvement to embedding jpeg/jpeg2000 data in cairo-pdf
- fix printing of rotated user fonts in cairo-ps
- Changes from version 1.9.4:
+ Various API additions (see NEWS for details).
+ New cairo-test-trace utility.
+ Add server-side gradients to xlib backend.
+ New experimental backends: Qt, OpenVG, OpenGL.
+ Fix long-standing bug with self-intersecting strokes.
- Changes from version 1.9.2:
+ Various API additions (see NEWS for details).
+ New CairoScript experimental backend.
+ New cairo-trace and cairo-perf-trace utilities.
+ Test suite overhaul.
+ Add polygon rasterisation.
+ Add copy-on-write snapshot support.
+ Various bug fixes.
- Add gcc-c++ BuildRequires: one linker stage requires it.
- Add cairo-modules-no-version.patch to build the modules not as
versioned shared objects
- Drop cairo-1.8.6-repeat-modes.patch and cairo-lcd-filter.patch,
obsoleted by upstream changes.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 21 17:43:17 CET 2010 - vuntz@opensuse.org Sun Feb 21 17:43:17 CET 2010 - vuntz@opensuse.org

132
cairo.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package cairo (Version 1.8.10) # spec file for package cairo (Version 1.9.14)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -15,40 +15,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: cairo Name: cairo
BuildRequires: freetype2-devel Version: 1.9.14
BuildRequires: gtk-doc Release: 1
BuildRequires: libpng-devel License: LGPLv2.1+ ; MPL ..
BuildRequires: pkg-config Summary: Vector Graphics Library with Cross-Device Output Support
BuildRequires: xorg-x11-devel Url: http://cairographics.org/
BuildRequires: xorg-x11-libxcb-devel Group: Development/Libraries/X11
Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version.
Patch0: cairo-modules-no-version.patch
# These libraries are needed only for tests. # These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop! # Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel #BuildRequires: librsvg-devel poppler-devel
License: LGPLv2.1+ ; MPL .. BuildRequires: gtk-doc
Group: Development/Libraries/X11 BuildRequires: pkg-config
Summary: Vector Graphics Library with Cross-Device Output Support BuildRequires: pkgconfig(fontconfig)
Url: http://cairographics.org/ BuildRequires: pkgconfig(freetype2)
Version: 1.8.10 BuildRequires: pkgconfig(libpng)
Release: 1 BuildRequires: pkgconfig(pixman-1)
Source: %{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(x11)
Source99: baselibs.conf BuildRequires: pkgconfig(xcb)
# PATCH-FIX-UPSTREAM cairo-1.8.6-repeat-modes.patch vuntz@opensuse.org -- Based on patch from Fedora & Ubuntu BuildRequires: pkgconfig(xrender)
Patch0: cairo-1.8.6-repeat-modes.patch
# PATCH-FIX-UPSTREAM cairo-lcd-filter.patch vuntz@opensuse.org -- Improve font rendering on LCD, patch used by Debian, Mandriva & Ubuntu
Patch1: cairo-lcd-filter.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Last present in SuSE Linux 10.0 (and NLD9):
Obsoletes: libpixman <= 0.1.1
Provides: libpixman <= 0.1.1
# bug437293
%ifarch ppc64
Obsoletes: cairo-64bit
%endif
#
%description %description
Cairo is a vector graphics library with cross-device output support. Cairo is a vector graphics library with cross-device output support.
@ -57,16 +49,61 @@ in-memory image buffers, and PostScript. Cairo is designed to produce
identical output on all output media while taking advantage of display identical output on all output media while taking advantage of display
hardware acceleration when available. hardware acceleration when available.
%package -n libcairo2
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPLv2.1+ ; MPL ..
Group: Development/Libraries/X11
Provides: cairo = %{version}
Obsoletes: cairo < %{version}
# bug437293
%ifarch ppc64
Obsoletes: cairo-64bit
%endif
#
%description -n libcairo2
Cairo is a vector graphics library with cross-device output support.
Currently supported output targets include the X Window System,
in-memory image buffers, and PostScript. Cairo is designed to produce
identical output on all output media while taking advantage of display
hardware acceleration when available.
%package -n libcairo-script-interpreter2
Summary: Vector Graphics Library with Cross-Device Output Support
License: LGPLv2.1+ ; MPL ..
Group: Development/Libraries/X11
%description -n libcairo-script-interpreter2
Cairo is a vector graphics library with cross-device output support.
Currently supported output targets include the X Window System,
in-memory image buffers, and PostScript. Cairo is designed to produce
identical output on all output media while taking advantage of display
hardware acceleration when available.
%package utils
Summary: Vector Graphics Library with Cross-Device Output Support -- Utilities
License: LGPLv2.1+ ; MPL ..
Group: Development/Libraries/X11
# We need an explicit requires since nothing links to the cairo library
Requires: libcairo2 = %{version}
%description utils
Cairo is a vector graphics library with cross-device output support.
Currently supported output targets include the X Window System,
in-memory image buffers, and PostScript. Cairo is designed to produce
identical output on all output media while taking advantage of display
hardware acceleration when available.
This package contains various cairo utilities.
%package devel %package devel
License: LGPLv2.1+ ; MPL .. License: LGPLv2.1+ ; MPL ..
Summary: Development environment for cairo Summary: Development environment for cairo
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: %{name} = %{version} freetype2-devel fontconfig-devel libpng-devel xorg-x11-devel xorg-x11-libXrender-devel xorg-x11-libX11-devel xorg-x11-libxcb-devel Requires: libcairo2 = %{version}
Requires: libcairo-script-interpreter2 = %{version}
Provides: cairo-doc = %{version} Provides: cairo-doc = %{version}
Obsoletes: cairo-doc <= %{version} Obsoletes: cairo-doc < %{version}
# Last present in SuSE Linux 10.0 (and NLD9):
Provides: libpixman-devel <= 0.1.1
Obsoletes: libpixman-devel <= 0.1.1
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: cairo-devel-64bit Obsoletes: cairo-devel-64bit
@ -80,9 +117,9 @@ cairo.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
NOCONFIGURE=1 ./autogen.sh
%configure \ %configure \
--with-pic \ --with-pic \
--enable-ps \ --enable-ps \
@ -100,27 +137,42 @@ cairo.
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%endif %endif
%post -p /sbin/ldconfig %post -n libcairo2 -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n libcairo2 -p /sbin/ldconfig
%post -n libcairo-script-interpreter2 -p /sbin/ldconfig
%postun -n libcairo-script-interpreter2 -p /sbin/ldconfig
%clean %clean
%{__rm} -rf ${RPM_BUILD_ROOT} %{__rm} -rf %{buildroot}
%files %files -n libcairo2
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README
%{_libdir}/*.so.* %{_libdir}/libcairo.so.*
%files -n libcairo-script-interpreter2
%defattr(-, root, root)
%{_libdir}/libcairo-script-interpreter.so.*
%files utils
%defattr(-, root, root)
%{_bindir}/cairo-trace
%dir %{_libdir}/cairo
%{_libdir}/cairo/libcairo-trace.so
%{_libdir}/cairo/cairo-fdr.so
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%doc PORTING_GUIDE %doc PORTING_GUIDE
%doc %{_datadir}/gtk-doc/html/cairo
%{_includedir}/cairo %{_includedir}/cairo
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
%{_libdir}/*.la %{_libdir}/*.la
%endif %endif
%{_datadir}/gtk-doc/html/*
%changelog %changelog