diff --git a/.cvsignore b/.cvsignore index b71b01f..149dea5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cairo-1.8.10.tar.gz +cairo-1.9.8.tar.gz diff --git a/cairo-1.8.6-repeat-modes.patch b/cairo-1.8.6-repeat-modes.patch deleted file mode 100644 index 3e16728..0000000 --- a/cairo-1.8.6-repeat-modes.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up cairo-1.8.6/src/cairo-xlib-surface.c.jx cairo-1.8.6/src/cairo-xlib-surface.c ---- cairo-1.8.6/src/cairo-xlib-surface.c.jx 2008-12-12 07:48:05.000000000 -0500 -+++ cairo-1.8.6/src/cairo-xlib-surface.c 2009-04-08 15:06:25.000000000 -0400 -@@ -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; - } diff --git a/cairo.spec b/cairo.spec index d2039d7..98d6615 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,13 +1,14 @@ -%define pixman_version 0.12.0 +%define pixman_version 0.17.5 %define freetype_version 2.1.9 -%define fontconfig_version 2.0 +%define fontconfig_version 2.2.95 Summary: A 2D graphics library Name: cairo -Version: 1.8.10 +Version: 1.9.8 Release: 1%{?dist} URL: http://cairographics.org -Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz +Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz +#Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz License: LGPLv2 or MPLv1.1 Group: System Environment/Libraries @@ -20,8 +21,6 @@ BuildRequires: pixman-devel >= %{pixman_version} BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: fontconfig-devel >= %{fontconfig_version} -Patch0: cairo-1.8.6-repeat-modes.patch - %description Cairo is a 2D graphics library designed to provide high-quality display and print output. Currently supported output targets include the X Window @@ -52,7 +51,6 @@ needed for developing software which uses the cairo graphics library. %prep %setup -q -%patch0 -p1 -b .repeat-modes %build %configure --disable-static \ @@ -63,7 +61,7 @@ needed for developing software which uses the cairo graphics library. --enable-pdf \ --enable-svg \ --disable-gtk-doc -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -91,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/cairo %changelog +* Thu Jun 17 2010 Benjamin Otte - 1.9.8-1 +- Update to 1.9.8 snapshot + * Sun Feb 21 2010 Matthias Clasen - 1.8.10-1 - Update to 1.8.10 diff --git a/sources b/sources index 232b71e..c9fec78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b60a82f405f9400bbfdcf850b1728d25 cairo-1.8.10.tar.gz +009b48085d93837377a25f625b8bdbc4 cairo-1.9.8.tar.gz