Hello community,

here is the log from the commit of package pixman for openSUSE:Factory checked 
in at 2016-05-08 10:40:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pixman (Old)
 and      /work/SRC/openSUSE:Factory/.pixman.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pixman"

Changes:
--------
--- /work/SRC/openSUSE:Factory/pixman/pixman.changes    2016-02-12 
11:20:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pixman.new/pixman.changes       2016-05-08 
10:40:03.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr  4 16:11:45 UTC 2016 - zai...@opensuse.org
+
+- Add pixman-private-correct-include.patch: pixman-private: include
+  <float.h> only in C code, patch from upstream git.
+
+-------------------------------------------------------------------

New:
----
  pixman-private-correct-include.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pixman.spec ++++++
--- /var/tmp/diff_new_pack.PHRFHC/_old  2016-05-08 10:40:04.000000000 +0200
+++ /var/tmp/diff_new_pack.PHRFHC/_new  2016-05-08 10:40:04.000000000 +0200
@@ -25,6 +25,8 @@
 Url:            http://xorg.freedesktop.org/
 Source:         http://cairographics.org/releases/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM pixman-private-correct-include.patch zai...@opensuse.org 
-- pixman-private: include <float.h> only in C code
+Patch0:         pixman-private-correct-include.patch
 BuildRequires:  pkgconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -48,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 #autoreconf -fi

++++++ pixman-private-correct-include.patch ++++++
>From 7c6066b700c7cdd4aeb8be426b14b3a5f0de4b6c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Date: Sun, 17 Jan 2016 15:22:50 +0100
Subject: pixman-private: include <float.h> only in C code

<float.h> is included unconditionally by pixman-private.h, which in
turn gets included by assembler files. Unfortunately, with certain C
libraries (like the musl C library), <float.h> cannot be included in
assembler files:

  CCLD     libpixman-arm-simd.la
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:
 Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8:
 Error: bad instruction `int __flt_rounds(void)'
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:
 Assembler messages:
/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8:
 Error: bad instruction `int __flt_rounds(void)'

It turns out however that <float.h> is not needed by assembly files,
so we move its inclusion within the #ifndef __ASSEMBLER__ condition,
which solves the problem.

Signed-off-by: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Reviewed-by: Siarhei Siamashka <siarhei.siamas...@gmail.com>

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 73108a0..73a5414 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -1,5 +1,3 @@
-#include <float.h>
-
 #ifndef PIXMAN_PRIVATE_H
 #define PIXMAN_PRIVATE_H
 
@@ -30,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <float.h>
 
 #include "pixman-compiler.h"
 
-- 
cgit v0.10.2


Reply via email to