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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=17

Browse Source
This commit is contained in:
OBS User unknown 2008-11-07 13:59:17 +00:00 committed by Git OBS Bridge
parent 64b5337782
commit 79739f4646
4 changed files with 36 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cairo-1.0.2-depth-fix-1.patch
View File

@ -1,20 +0,0 @@
This fixed a problem with libpixman getting the depth wrong for some
16bpp image formats but still render things correctly. Using
surface->depth instead of image->depth for the ximage was a quick way to
avoid this problem.
It's not the appropriate fix and should probably not go upstream.
libpixmap should be fixed if it hasn't already.
================================================================================
--- src/cairo-xlib-surface.c
+++ src/cairo-xlib-surface.c
@@ -796,7 +796,7 @@
ximage.bitmap_unit = 32; /* always for libpixman */
ximage.bitmap_bit_order = native_byte_order;
ximage.bitmap_pad = 32; /* always for libpixman */
- ximage.depth = image->depth;
+ ximage.depth = surface->depth;
ximage.bytes_per_line = image->stride;
ximage.bits_per_pixel = bpp;
ximage.red_mask = red;

13
cairo-pixman-version.patch
View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index fc875a8..5c87899 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,7 +421,7 @@ CAIRO_ENABLE(test_surfaces, test surfaces, no)
dnl ===========================================================================
CAIRO_ENABLE_SURFACE_BACKEND(image, image, always, [
- pixman_REQUIRES="pixman-1 >= 0.12.0"
+ pixman_REQUIRES="pixman-1 >= 0.11.8"
PKG_CHECK_MODULES(pixman, $pixman_REQUIRES, , [AC_MSG_RESULT(no)
use_image="no (requires $pixman_REQUIRES http://cairographics.org/releases/)"])
image_REQUIRES=$pixman_REQUIRES

12
cairo.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Nov 4 14:17:20 CST 2008 - maw@suse.de
- Disable the glitz backend (bnc#429280).
-------------------------------------------------------------------
Mon Nov 3 02:00:15 CET 2008 - vuntz@novell.com
- Remove cairo-1.0.2-depth-fix-1.patch: it's fixed upstream and I
trust upstream more than us about the right fix :-)
- Remove cairo-pixman-version.patch: not needed anymore.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 30 12:34:56 CET 2008 - olh@suse.de Thu Oct 30 12:34:56 CET 2008 - olh@suse.de

55
cairo.spec
View File

@ -20,7 +20,7 @@
Name: cairo Name: cairo
# Use rpmbuild -D 'DIRECTFB_SUPPORT 1' to build wíth DirectFB support. # Use rpmbuild -D 'DIRECTFB_SUPPORT 1' to build wíth DirectFB support.
BuildRequires: freetype2-devel glitz-devel libpng-devel pkg-config xorg-x11-devel BuildRequires: freetype2-devel libpng-devel pkg-config xorg-x11-devel
%if %suse_version > 1020 %if %suse_version > 1020
BuildRequires: xorg-x11-libxcb-devel BuildRequires: xorg-x11-libxcb-devel
%endif %endif
@ -35,19 +35,9 @@ Group: Development/Libraries/X11
Summary: Vector Graphics Library with Cross-Device Output Support Summary: Vector Graphics Library with Cross-Device Output Support
Url: http://cairographics.org/ Url: http://cairographics.org/
Version: 1.8.0 Version: 1.8.0
Release: 2 Release: 3
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch1: cairo-ac.patch Patch1: cairo-ac.patch
# PATCH-FIX-OPENSUSE cairo-pixman-version.patch maw@novell.com -- Allow builds against an old version of pixman. Remove it when xorg-x11-libs is finally accepted!
Patch2: cairo-pixman-version.patch
# This fixes a problem with libpixman getting the depth wrong for some
# 16bpp image formats but still render things correctly. Using
# surface->depth instead of image->depth for the ximage was a quick way to
# avoid this problem.
# It's not the appropriate fix and should probably not go upstream.
# libpixmap should be fixed if it hasn't already.
# PATCH-NEEDS-REBASE cairo-1.0.2-depth-fix-1.patch -- Well, it probably doesn't actually need a rebasing, but the comment above says it wrong, but it appears to have been landed upstream anyway.
Patch4: cairo-1.0.2-depth-fix-1.patch
# PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too! # PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too!
Patch6: bugzilla-104365.patch Patch6: bugzilla-104365.patch
# PATCH-NEEDS-REBASE cairo-1.4.10-lcd-filter-1.patch # PATCH-NEEDS-REBASE cairo-1.4.10-lcd-filter-1.patch
@ -83,7 +73,7 @@ License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
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 xorg-x11-devel Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel
Requires: libpng-devel glitz-devel Requires: libpng-devel
%if 0%{?DIRECTFB_SUPPORT} %if 0%{?DIRECTFB_SUPPORT}
Requires: DirectFB-devel Requires: DirectFB-devel
%endif %endif
@ -133,8 +123,6 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
# %patch4
# %patch6 -p1 # %patch6 -p1
# %patch7 -p1 # %patch7 -p1
@ -145,16 +133,15 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
%endif %endif
# xcb-renderutil is not yet available in openSUSE 10.2 # xcb-renderutil is not yet available in openSUSE 10.2
# Only for tests: --enable-pdf --enable-svg # Only for tests: --enable-pdf --enable-svg
%configure\ %configure \
--enable-glitz\
%if 0%{?DIRECTFB_SUPPORT} %if 0%{?DIRECTFB_SUPPORT}
--enable-directfb\ --enable-directfb \
%endif %endif
--enable-ps\ --enable-ps \
%if %suse_version > 1020 %if %suse_version > 1020
--enable-xcb\ --enable-xcb \
%endif %endif
--disable-gtk-doc --disable-gtk-doc
make %{?jobs:-j %jobs} make %{?jobs:-j %jobs}
%install %install
@ -188,9 +175,15 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Tue Nov 04 2008 maw@suse.de
- Disable the glitz backend (bnc#429280).
* Sun Nov 02 2008 vuntz@novell.com
- Remove cairo-1.0.2-depth-fix-1.patch: it's fixed upstream and I
trust upstream more than us about the right fix :-)
- Remove cairo-pixman-version.patch: not needed anymore.
* Thu Oct 30 2008 olh@suse.de * Thu Oct 30 2008 olh@suse.de
- obsolete old -XXbit packages (bnc#437293) - obsolete old -XXbit packages (bnc#437293)
* Tue Sep 30 2008 mboman@suse.de * Mon Sep 29 2008 mboman@suse.de
- Update to version 1.8.0: - Update to version 1.8.0:
+ Many API changes. See NEWS for full details + Many API changes. See NEWS for full details
+ cairo-xlib: Improved performance with X server without Render + cairo-xlib: Improved performance with X server without Render
@ -215,7 +208,7 @@ rm -rf ${RPM_BUILD_ROOT}
1.6.x). 1.6.x).
+ Bugs fixed: bmo453199#c5, bfo#16819 + Bugs fixed: bmo453199#c5, bfo#16819
+ Misc other fixes. + Misc other fixes.
* Thu Aug 28 2008 mboman@novell.com * Wed Aug 27 2008 mboman@novell.com
- Update to version 1.7.4: - Update to version 1.7.4:
+ Including the missing header file cairo-user-font-private.h + Including the missing header file cairo-user-font-private.h
+ Improvements around cairo text API. + Improvements around cairo text API.
@ -231,7 +224,7 @@ rm -rf ${RPM_BUILD_ROOT}
+ Xlib: Improved performance with Xrender-less X servers + Xlib: Improved performance with Xrender-less X servers
+ Directfb: backend improvements + Directfb: backend improvements
+ Countless bugs have been fixed and optimizations made + Countless bugs have been fixed and optimizations made
* Tue Jun 10 2008 maw@suse.de * Mon Jun 09 2008 maw@suse.de
- Update to version 1.6.4: - Update to version 1.6.4:
+ Improved PDF and PostScript output + Improved PDF and PostScript output
+ Support for arbitrary X server visuals + Support for arbitrary X server visuals
@ -265,7 +258,7 @@ rm -rf ${RPM_BUILD_ROOT}
making the PostScript output more compatible with recent making the PostScript output more compatible with recent
versions of ghostscript that are more strict about Type 3 versions of ghostscript that are more strict about Type 3
fonts, for example. fonts, for example.
* Fri Dec 21 2007 maw@suse.de * Thu Dec 20 2007 maw@suse.de
- Update to version 1.4.12: - Update to version 1.4.12:
+ Avoid overflow when allocating large buffers + Avoid overflow when allocating large buffers
+ Fix crash with cairo_pattern_set_user_data + Fix crash with cairo_pattern_set_user_data
@ -318,7 +311,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Fixed devel dependencies. - Fixed devel dependencies.
* Fri Jan 26 2007 jhargadon@suse.de * Fri Jan 26 2007 jhargadon@suse.de
- removed patch cairo-remove-requires-private.patch (#237155) - removed patch cairo-remove-requires-private.patch (#237155)
* Tue Jan 23 2007 ro@suse.de * Mon Jan 22 2007 ro@suse.de
- drop requires for gnome-filesystem - drop requires for gnome-filesystem
* Tue Oct 24 2006 jhargadon@suse.de * Tue Oct 24 2006 jhargadon@suse.de
- update to version 1.2.4 - update to version 1.2.4
@ -326,7 +319,7 @@ rm -rf ${RPM_BUILD_ROOT}
- add cairo-1.2.4-lcd-filter-1.patch to resolve bug #213989 - add cairo-1.2.4-lcd-filter-1.patch to resolve bug #213989
* Thu Sep 14 2006 sbrabec@suse.cz * Thu Sep 14 2006 sbrabec@suse.cz
- Create correct dependencies in older products. - Create correct dependencies in older products.
* Fri Aug 18 2006 jhargadon@suse.de * Thu Aug 17 2006 jhargadon@suse.de
- update to version 1.2.2 - update to version 1.2.2
- Fix crashes with BGR X servers - Fix crashes with BGR X servers
- Fix the "disappearing text" bug - Fix the "disappearing text" bug
@ -354,9 +347,9 @@ rm -rf ${RPM_BUILD_ROOT}
* Thu Mar 23 2006 gekker@suse.de * Thu Mar 23 2006 gekker@suse.de
- Fixes cairo crash in evolution with specific mails (#159675) - Fixes cairo crash in evolution with specific mails (#159675)
- CVE-2006-0528 - CVE-2006-0528
* Fri Jan 27 2006 ro@suse.de * Thu Jan 26 2006 ro@suse.de
- use -fstack-protector (merged from meissner) - use -fstack-protector (merged from meissner)
* Fri Jan 27 2006 mls@suse.de * Thu Jan 26 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Wed Jan 25 2006 sbrabec@suse.cz * Wed Jan 25 2006 sbrabec@suse.cz
- Removed Xlib version fb repeating picture bug check (#100469). - Removed Xlib version fb repeating picture bug check (#100469).
@ -373,7 +366,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Enabled ps and pdf backends (#120049). - Enabled ps and pdf backends (#120049).
* Fri Sep 09 2005 sbrabec@suse.cz * Fri Sep 09 2005 sbrabec@suse.cz
- Re-enabled glitz backend (#116075). - Re-enabled glitz backend (#116075).
* Sat Sep 03 2005 matz@suse.de * Fri Sep 02 2005 matz@suse.de
- Fix last change. - Fix last change.
* Fri Sep 02 2005 gekker@suse.de * Fri Sep 02 2005 gekker@suse.de
- Remove Requires.private from the cairo.pc file as it causes - Remove Requires.private from the cairo.pc file as it causes
@ -396,7 +389,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Update to version 0.9.2 - Update to version 0.9.2
* Wed Aug 03 2005 sbrabec@suse.cz * Wed Aug 03 2005 sbrabec@suse.cz
- Xlib version fb repeating picture bug check update (#100469). - Xlib version fb repeating picture bug check update (#100469).
* Tue Aug 02 2005 gekker@suse.de * Mon Aug 01 2005 gekker@suse.de
- Fix requirements - Fix requirements
* Mon Aug 01 2005 gekker@suse.de * Mon Aug 01 2005 gekker@suse.de
- Updated to version 0.6.0. - Updated to version 0.6.0.