2006-11-24 Damien Carbery <[email protected]> 217update
authordcarbery
Fri, 24 Nov 2006 16:16:16 +0000
branch217update
changeset 19095 e8e7aa8c74b9
parent 19094 7bc151988416
child 19096 d542fc2c823e
2006-11-24 Damien Carbery <[email protected]> * cairo.spec: Bump to 1.3.2. Add patch 04-float-word to fix configure issue. Fixes #9124. Temp disable patch 2 (8bit-fix) while waiting for Erwann to rework it. * patches/cairo-04-float-word.diff: Added. Fixes 9124.
ChangeLog
cairo.spec
patches/cairo-04-float-word.diff
--- a/ChangeLog	Fri Nov 24 12:50:20 2006 +0000
+++ b/ChangeLog	Fri Nov 24 16:16:16 2006 +0000
@@ -1,3 +1,9 @@
+2006-11-24  Damien Carbery <[email protected]>
+
+	* cairo.spec: Bump to 1.3.2. Add patch 04-float-word to fix configure 
+	  issue. Fixes #9124.
+	* patches/cairo-04-float-word.diff: Added. Fixes 9124.
+
 2006-11-24  Damien Carbery <[email protected]>
 
 	* file-roller.spec: Add --libexecdir to configure call.
--- a/cairo.spec	Fri Nov 24 12:50:20 2006 +0000
+++ b/cairo.spec	Fri Nov 24 16:16:16 2006 +0000
@@ -4,11 +4,12 @@
 # package are under the same license as the package itself.
 #
 # Owner: erwannc
+# bugdb: bugzilla.freedesktop.org
 #
 Name:         cairo
 License:      LGPL
 Group:        System/Libraries
-Version:      1.2.4
+Version:      1.3.2
 Release:      5
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -18,6 +19,8 @@
 Patch2:       cairo-02-8bit-fix.diff
 #owner:erwannc date:2006-11-02 type:feature 
 Patch3:       cairo-03-full-hinting.diff
+# owner:dcarbery date:2006-11-24 type:bug bugzilla:9124
+Patch4:       cairo-04-float-word.diff
 URL:          http://www.cairographics.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -64,8 +67,9 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
+##%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %ifos solaris
 %ifarch amd64 sparcv9
@@ -174,6 +178,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Nov 24 2006 - [email protected]
+- Bump to 1.3.2. Add patch 04-float-word to fix configure issue. Fixes #9124.
 * Fri Nov  3 2006 - [email protected]
 - use %gtk_doc_option in configure so that it can be disabled using
   --without-gtk-doc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cairo-04-float-word.diff	Fri Nov 24 16:16:16 2006 +0000
@@ -0,0 +1,15 @@
+--- cairo-1.3.2/acinclude.m4.orig	2006-11-24 15:52:17.786544300 +0000
++++ cairo-1.3.2/acinclude.m4	2006-11-24 15:53:46.272494900 +0000
+@@ -84,10 +84,10 @@
+ 
+ ]])], [
+ 
+-if grep noonsees conftest.$ac_objext >/dev/null ; then
++if strings -a conftest.$ac_objext | grep noonsees >/dev/null ; then
+   ax_cv_c_float_words_bigendian=yes
+ fi
+-if grep seesnoon conftest.$ac_objext >/dev/null ; then
++if strings -a conftest.$ac_objext | grep seesnoon >/dev/null ; then
+   if test "$ax_cv_c_float_words_bigendian" = unknown; then
+     ax_cv_c_float_words_bigendian=no
+   else