OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=53

pixman-0.12.0.diff

@@ -0,0 +1,30 @@
+---
+ pixman/pixman-pict.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: pixman/pixman-pict.c
+===================================================================
+--- pixman/pixman-pict.c.orig	2008-11-18 10:01:38.000000000 +0100
++++ pixman/pixman-pict.c	2008-11-21 17:14:57.000000000 +0100
+@@ -1922,10 +1922,10 @@ pixman_bool_t pixman_have_vmx (void) {
+ #include <signal.h>
+ #include <setjmp.h>
+ 
+-static jmp_buf jump_env;
++static sigjmp_buf jump_env;
+ 
+ static void vmx_test(int sig, siginfo_t *si, void *unused) {
+-    longjmp (jump_env, 1);
++    siglongjmp (jump_env, 1);
+ }
+ 
+ pixman_bool_t pixman_have_vmx (void) {
+@@ -1936,7 +1936,7 @@ pixman_bool_t pixman_have_vmx (void) {
+         sigemptyset(&sa.sa_mask);
+         sa.sa_sigaction = vmx_test;
+         sigaction(SIGILL, &sa, &osa);
+-	jmp_result = setjmp (jump_env);
++	jmp_result = sigsetjmp (jump_env, 1);
+ 	if (jmp_result == 0) {
+ 	    asm volatile ( "vor 0, 0, 0" );
+ 	}

xorg-x11-libs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 21 17:27:22 CET 2008 - schwab@suse.de
+
+- Revert last change.
+- Use sigsetjmp to save/restore the signal mask.
+
 -------------------------------------------------------------------
 Thu Nov 13 16:24:49 CET 2008 - sndirsch@suse.de
 

xorg-x11-libs.spec

@@ -35,7 +35,7 @@ Obsoletes:      xorg-x11-libs-32bit
 #
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        6
+Release:        7
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -79,6 +79,7 @@ Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch3:         p_xft_cjk.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
+Patch32:        pixman-0.12.0.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -171,6 +172,9 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
+pushd pixman-*
+%patch32
+popd
 
 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -186,9 +190,6 @@ for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
                     --enable-type1 \
                     --prefix=/usr \
                     --libdir=%{_libdir} \
-%ifarch ppc ppc64
-		   --disable-vmx \
-%endif
                     --mandir=%{_mandir} ${option}
         ;;
     esac
@@ -249,6 +250,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 21 2008 schwab@suse.de
+- Revert last change.
+- Use sigsetjmp to save/restore the signal mask.
 * Thu Nov 13 2008 sndirsch@suse.de
 - use --disable-vmx for building pixman on ppc/ppc64 (bnc #444639)
 * Thu Oct 30 2008 olh@suse.de