OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-May-2007 17:08:14
Branch: HEAD Handle: 2007051716081400
Modified files:
openpkg-src/cairo cairo.patch cairo.spec
Log:
upgrading package: cairo 1.2.6 -> 1.4.6
Summary:
Revision Changes Path
1.12 +3 -15 openpkg-src/cairo/cairo.patch
1.29 +18 -11 openpkg-src/cairo/cairo.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 cairo.patch
--- openpkg-src/cairo/cairo.patch 12 Nov 2006 11:12:58 -0000 1.11
+++ openpkg-src/cairo/cairo.patch 17 May 2007 15:08:14 -0000 1.12
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-11-12 12:09:11 +0100
-+++ configure 2006-11-12 12:10:38 +0100
-@@ -26071,7 +26071,7 @@
+--- configure.orig 2007-05-01 22:25:17 +0200
++++ configure 2007-05-02 07:32:14 +0200
+@@ -27159,7 +27159,7 @@
fi
if test "x$freetype_pkgconfig" = "xyes"; then
@@ -10,15 +10,3 @@
else
if test -z "$FREETYPE_CONFIG"; then
-Index: src/cairoint.h
---- src/cairoint.h.orig 2006-11-02 23:53:40 +0100
-+++ src/cairoint.h 2006-11-12 12:09:11 +0100
-@@ -171,8 +171,6 @@
- #endif
-
- #ifndef CAIRO_MUTEX_DECLARE
--# error "No mutex declarations. Cairo will not work with multiple threads."
\
-- "(Remove this #error directive to acknowledge & accept this
limitation)."
- # define CAIRO_MUTEX_DECLARE(name)
- # define CAIRO_MUTEX_DECLARE_GLOBAL(name)
- # define CAIRO_MUTEX_LOCK(name)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cairo/cairo.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 cairo.spec
--- openpkg-src/cairo/cairo.spec 1 Jan 2007 17:36:57 -0000 1.28
+++ openpkg-src/cairo/cairo.spec 17 May 2007 15:08:14 -0000 1.29
@@ -32,14 +32,15 @@
Class: EVAL
Group: Graphics
License: MIT-style
-Version: 1.2.6
-Release: 20061112
+Version: 1.4.6
+Release: 20070517
# package options
-%option with_pdf yes
-%option with_ps yes
-%option with_png yes
-%option with_x11 yes
+%option with_pdf yes
+%option with_ps yes
+%option with_png yes
+%option with_x11 yes
+%option with_threads yes
# list of sources
Source0: http://cairographics.org/releases/cairo-%{version}.tar.gz
@@ -50,8 +51,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: fontconfig, freetype, libpixman
-PreReq: fontconfig, freetype, libpixman
+BuildPreReq: fontconfig, freetype
+PreReq: fontconfig, freetype
%if "%{with_png}" == "yes"
BuildPreReq: png >= 1.2.8-20050204, zlib
PreReq: png >= 1.2.8-20050204, zlib
@@ -83,7 +84,7 @@
prog cairo = {
version = %{version}
url = http://cairographics.org/releases/
- regex = cairo-(__VER__)\.tar\.gz
+ regex = \bcairo-(__VER__)\.tar\.gz
}
%prep
@@ -91,8 +92,6 @@
%patch -p0
%build
- ( echo "ac_cv_header_pthread_h=no"
- ) >config.cache
%{l_shtool} subst \
-e 's;libpng12;libpng;g' \
configure
@@ -108,6 +107,9 @@
export PNG_CFLAGS="%{l_cppflags}"
export PNG_LIBS="%{l_ldflags} -lpng -lz"
%endif
+%if "%{with_threads}" != "yes"
+ CPPFLAGS="$CPPFLAGS -DCAIRO_NO_MUTEX=1"
+%endif
export PKG_CONFIG="%{l_prefix}/bin/pkg-config"
./configure \
--cache-file=./config.cache \
@@ -135,6 +137,11 @@
%else
--disable-xlib \
%endif
+%if "%{with_threads}" == "yes"
+ --enable-pthread \
+%else
+ --disable-pthread \
+%endif
--enable-freetype \
--disable-xcb \
--disable-gl \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
