diff --git a/cairo-1.2.4.tar.bz2 b/cairo-1.2.4.tar.bz2 deleted file mode 100644 index ecb40ea..0000000 --- a/cairo-1.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44088c499e0d6be0a207275e4c333aa016b117ad03c90a8453ad254fd5680be3 -size 2415658 diff --git a/cairo-1.4.0.tar.bz2 b/cairo-1.4.0.tar.bz2 new file mode 100644 index 0000000..aa5d57d --- /dev/null +++ b/cairo-1.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5741a3df492de8a24b04927c8ffe38728216ccaa76fea1ea47442f99400390b4 +size 2532573 diff --git a/cairo-snprintf-overflow.patch b/cairo-snprintf-overflow.patch new file mode 100644 index 0000000..5ed25e6 --- /dev/null +++ b/cairo-snprintf-overflow.patch @@ -0,0 +1,15 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=10267 +Fixes following warning: +cairo-truetype-subset.c:698: warning: call to __builtin___snprintf_chk will always overflow destination buffer +================================================================================ +--- src/cairo-truetype-subset.c ++++ src/cairo-truetype-subset.c +@@ -676,7 +676,7 @@ + cairo_truetype_font_write_post_table (cairo_truetype_font_t *font, + unsigned long tag) + { +- char buf[10]; ++ char buf[11]; + int n; + unsigned i; + diff --git a/cairo.changes b/cairo.changes index af2e838..4fe6d17 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 13 12:03:10 CET 2007 - sbrabec@suse.cz + +- Updated to version 1.4.0: + * Performance improvements. + * API additions. + * Many bug fixes. + * Documentation improvements. +- Enabled XCB and DirectFB backends. + ------------------------------------------------------------------- Fri Feb 2 16:47:27 CET 2007 - sbrabec@suse.cz diff --git a/cairo.spec b/cairo.spec index 13402cd..7b9c906 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,5 +1,5 @@ # -# spec file for package cairo (Version 1.2.4) +# spec file for package cairo (Version 1.4.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,21 +11,28 @@ # norootforbuild Name: cairo -BuildRequires: freetype2-devel glitz-devel libpng-devel -# FIXME: Only for directory ownership: +BuildRequires: DirectFB-devel freetype2-devel glitz-devel libpng-devel pkg-config xorg-x11-devel +%if %suse_version > 1020 +BuildRequires: xorg-x11-libxcb-devel +%endif +# These libraries are needed only for tests. +# Do not enable tests in build systems, it causes build loop! +#BuildRequires: librsvg-devel poppler-devel +# Needed only for directory ownership: BuildRequires: gtk-doc License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), MOZILLA PUBLIC LICENSE (MPL/NPL) Group: Development/Libraries/X11 Summary: Vector Graphics Library with Cross-Device Output Support URL: http://cairographics.org/ -Version: 1.2.4 -Release: 20 +Version: 1.4.0 +Release: 1 Source: %{name}-%{version}.tar.bz2 Patch2: cairo-remove-requires-private.patch Patch3: cairo-defines.patch Patch4: cairo-1.0.2-depth-fix-1.patch Patch6: bugzilla-104365.patch Patch7: cairo-1.2.4-lcd-filter-1.patch +Patch8: cairo-snprintf-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman @@ -46,9 +53,13 @@ Authors: %package devel Summary: Development environment for cairo Group: Development/Libraries/X11 -Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel libpng-devel glitz-devel +Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel +Requires: DirectFB-devel libpng-devel glitz-devel %if %(rpm -q --queryformat=%%{version} xorg-x11-devel | sed 's/\..*$//') >= 7 Requires: xorg-x11-libXrender-devel xorg-x11-libX11-devel +%if %suse_version > 1020 +Requires: xorg-x11-libxcb-devel +%endif %endif # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman-devel @@ -79,22 +90,29 @@ Authors: Carl D. Worth %prep -%setup +%setup -q #%patch2 -%patch3 -p1 +# FIXME: It is not obvious, whether this patch is still valid: +#%patch3 -p1 %patch4 #%patch6 -p1 %patch7 -p1 +%patch8 %build autoreconf -f -i %if %suse_version > 1000 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" %endif +# xcb-renderutil is not yet available in openSUSE 10.2 +# Only for tests: --enable-pdf --enable-svg %configure\ --enable-glitz\ + --enable-directfb\ --enable-ps\ - --enable-pdf\ +%if %suse_version > 1020 + --enable-xcb\ +%endif --disable-gtk-doc make %{?jobs:-j %jobs} @@ -106,11 +124,12 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root) -%doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog INSTALL NEWS README TODO +%doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README ROADMAP TODO %{_libdir}/libcairo.so.* %files devel %defattr(-, root, root) +%doc PORTING_GUIDE %{_includedir}/cairo %{_libdir}/libcairo.so %{_libdir}/libcairo.*a @@ -120,7 +139,14 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-, root, root) %{_datadir}/gtk-doc/html/* -%changelog -n cairo +%changelog +* Tue Mar 13 2007 - sbrabec@suse.cz +- Updated to version 1.4.0: + * Performance improvements. + * API additions. + * Many bug fixes. + * Documentation improvements. +- Enabled XCB and DirectFB backends. * Fri Feb 02 2007 - sbrabec@suse.cz - Removed references to /opt/gnome. - Fixed devel dependencies.