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

Accepting request 43282 from home:dimstar:branches:GNOME:Factory

Browse Source 
Copy from home:dimstar:branches:GNOME:Factory/cairo via accept of submit request 43282 revision 7.
Request was accepted with message:
thanks, see tweaks

OBS-URL: https://build.opensuse.org/request/show/43282
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=33
This commit is contained in:
Vincent Untz 2010-07-21 14:36:15 +00:00 committed by Git OBS Bridge
parent 3a8545302b
commit 131edd2d20
8 changed files with 73 additions and 1110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.12.tar.bz2 Normal file
View File

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

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

17
cairo.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jul 19 12:13:18 UTC 2010 - dimstar@opensuse.org
- Update to version 1.9.12:
+ Linker no longer requires g++
-------------------------------------------------------------------
Thu Jul 8 23:00:26 CEST 2010 - dimstar@opensuse.org
- Update to version 1.9.10:
+ Jump to devel branch again for early Factory development.
- BuildRequire gcc-c++: 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

52
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.12)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -15,35 +15,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: cairo
Version: 1.9.12
Release: 1
# These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel
License: LGPL v2.1 or later ; MPL ..
Summary: Vector Graphics Library with Cross-Device Output Support
Url: http://cairographics.org/
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
BuildRequires: freetype2-devel
BuildRequires: gtk-doc
BuildRequires: libpng-devel
BuildRequires: pkg-config
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-libxcb-devel
# These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel
License: LGPLv2.1+ ; MPL ..
Group: Development/Libraries/X11
Summary: Vector Graphics Library with Cross-Device Output Support
Url: http://cairographics.org/
Version: 1.8.10
Release: 1
Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM cairo-1.8.6-repeat-modes.patch vuntz@opensuse.org -- Based on patch from Fedora & Ubuntu
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
# Last present in SuSE Linux 10.0 (and NLD9):
Obsoletes: libpixman <= 0.1.1
Provides: libpixman <= 0.1.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
%ifarch ppc64
Obsoletes: cairo-64bit
@ -58,10 +55,17 @@ identical output on all output media while taking advantage of display
hardware acceleration when available.
%package devel
License: LGPLv2.1+ ; MPL ..
License: LGPL v2.1 or later ; MPL ..
Summary: Development environment for cairo
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: %{name} = %{version}
Requires: fontconfig-devel
Requires: freetype2-devel
Requires: libpng-devel
Requires: xorg-x11-devel
Requires: xorg-x11-libX11-devel
Requires: xorg-x11-libXrender-devel
Requires: xorg-x11-libxcb-devel
Provides: cairo-doc = %{version}
Obsoletes: cairo-doc <= %{version}
# Last present in SuSE Linux 10.0 (and NLD9):
@ -80,9 +84,9 @@ cairo.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
NOCONFIGURE=1 ./autogen.sh
%configure \
--with-pic \
--enable-ps \
@ -105,22 +109,24 @@ find %{buildroot} -type f -name "*.la" -delete -print
%postun -p /sbin/ldconfig
%clean
%{__rm} -rf ${RPM_BUILD_ROOT}
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README
%{_bindir}/cairo-trace
%{_libdir}/*.so.*
%{_libdir}/cairo
%files devel
%defattr(-, root, root)
%doc PORTING_GUIDE
%doc %{_datadir}/gtk-doc/html/cairo
%{_includedir}/cairo
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%if 0%{?suse_version} <= 1110
%{_libdir}/*.la
%endif
%{_datadir}/gtk-doc/html/*
%changelog

0
ready
View File