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=6

Browse Source
This commit is contained in:
OBS User unknown 2007-03-26 23:26:10 +00:00 committed by Git OBS Bridge
parent 81b375921d
commit d98fa3aeed
5 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bugzilla-104365.patch
View File

@ -1,6 +1,14 @@
--- cairo-1.2.0/src/cairo-ft-font.c
+++ cairo-1.2.0/src/cairo-ft-font.c
@@ -2154,16 +2154,12 @@
Fri Apr 28 18:46:08 CEST 2006 - mfabian@suse.de
- Bugzilla #104365: delete fontconfig pattern elements before
trying to add them if the intention is to override default
settings.
https://bugs.freedesktop.org/show_bug.cgi?id=10413
================================================================================
--- cairo-1.4.0/src/cairo-ft-font.c
+++ cairo-1.4.0/src/cairo-ft-font.c
@@ -2232,20 +2232,16 @@
if (options->antialias != CAIRO_ANTIALIAS_DEFAULT)
{
@ -8,6 +16,10 @@
- {
+ FcPatternDel (pattern, FC_ANTIALIAS);
FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE);
if (options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) {
FcPatternDel (pattern, FC_RGBA);
FcPatternAddInteger (pattern, FC_RGBA, FC_RGBA_NONE);
}
- }
}
@ -18,7 +30,7 @@
int rgba;
if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) {
@@ -2187,19 +2183,17 @@
@@ -2269,19 +2265,17 @@
rgba = FC_RGBA_NONE;
}
@ -41,7 +53,7 @@
{
int hint_style;
@@ -2216,6 +2210,7 @@
@@ -2302,6 +2296,7 @@
break;
}

19
cairo-defines.patch
View File

@ -1,19 +0,0 @@
Index: cairo-1.0.2/pixman/src/slim_internal.h
===================================================================
--- cairo-1.0.2.orig/pixman/src/slim_internal.h
+++ cairo-1.0.2/pixman/src/slim_internal.h
@@ -78,9 +78,11 @@
level. */
#if __GNUC__ >= 3 && defined(__ELF__)
-# define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name)
-# define slim_hidden_def(name) slim_hidden_def1(name, INT_##name)
-# define slim_hidden_proto1(name, internal) \
+# define slim_hidden_proto(name) slim_hidden_protoX(name)
+# define slim_hidden_def(name) slim_hidden_defX(name)
+# define slim_hidden_protoX(name) slim_hidden_proto1(name, INT_##name)
+# define slim_hidden_defX(name) slim_hidden_def1(name, INT_##name)
+# define slim_hidden_proto1(name, internal) \
extern __typeof (name) name \
__asm__ (slim_hidden_asmname (internal)) \
pixman_private;

13
cairo-remove-requires-private.patch
View File

@ -1,13 +0,0 @@
--- configure.in
+++ configure.in
@@ -471,6 +471,10 @@
*) PKGCONFIG_REQUIRES="Requires.private"; ;;
esac
+# Hack. Don't use Requires.private, as otherwise f.i. the freetype
+# include patchs will be missing from the --cflags output for gtk+-2.0
+PKGCONFIG_REQUIRES="Requires"
+
AC_SUBST(PKGCONFIG_REQUIRES)
dnl ===========================================================================

6
cairo.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 26 18:19:24 CEST 2007 - sbrabec@suse.cz
- Disabled DirectFB by default (#256775).
- Ported bugzilla-104365.patch.
-------------------------------------------------------------------
Tue Mar 13 12:03:10 CET 2007 - sbrabec@suse.cz

36
cairo.spec
View File

@ -11,10 +11,14 @@
# norootforbuild
Name: cairo
BuildRequires: DirectFB-devel freetype2-devel glitz-devel libpng-devel pkg-config xorg-x11-devel
%define DIRECTFB_SUPPORT 0
BuildRequires: freetype2-devel glitz-devel libpng-devel pkg-config xorg-x11-devel
%if %suse_version > 1020
BuildRequires: xorg-x11-libxcb-devel
%endif
%if %DIRECTFB_SUPPORT
BuildRequires: DirectFB-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
@ -25,10 +29,14 @@ Group: Development/Libraries/X11
Summary: Vector Graphics Library with Cross-Device Output Support
URL: http://cairographics.org/
Version: 1.4.0
Release: 1
Release: 3
Source: %{name}-%{version}.tar.bz2
Patch2: cairo-remove-requires-private.patch
Patch3: cairo-defines.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.
Patch4: cairo-1.0.2-depth-fix-1.patch
Patch6: bugzilla-104365.patch
Patch7: cairo-1.2.4-lcd-filter-1.patch
@ -54,7 +62,10 @@ Authors:
Summary: Development environment for cairo
Group: Development/Libraries/X11
Requires: %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel
Requires: DirectFB-devel libpng-devel glitz-devel
Requires: libpng-devel glitz-devel
%if %DIRECTFB_SUPPORT
Requires: DirectFB-devel
%endif
%if %(rpm -q --queryformat=%%{version} xorg-x11-devel | sed 's/\..*$//') >= 7
Requires: xorg-x11-libXrender-devel xorg-x11-libX11-devel
%if %suse_version > 1020
@ -75,13 +86,12 @@ Authors:
Carl D. Worth <cworth@isi.edu>
%package doc
Summary: Development environment for cairo
Summary: Documentation for cairo
Group: Development/Libraries/X11
Requires: %{name} = %{version}
%description doc
This package contains all files necessary to build binaries using
cairo.
This package contains the documentation for cairo.
@ -91,11 +101,8 @@ Authors:
%prep
%setup -q
#%patch2
# FIXME: It is not obvious, whether this patch is still valid:
#%patch3 -p1
%patch4
#%patch6 -p1
%patch6 -p1
%patch7 -p1
%patch8
@ -108,7 +115,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
# Only for tests: --enable-pdf --enable-svg
%configure\
--enable-glitz\
%if %DIRECTFB_SUPPORT
--enable-directfb\
%endif
--enable-ps\
%if %suse_version > 1020
--enable-xcb\
@ -140,6 +149,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_datadir}/gtk-doc/html/*
%changelog
* Mon Mar 26 2007 - sbrabec@suse.cz
- Disabled DirectFB by default (#256775).
- Ported bugzilla-104365.patch.
* Tue Mar 13 2007 - sbrabec@suse.cz
- Updated to version 1.4.0:
* Performance improvements.