pixman: bump to version 0.36.0

Patch 0005 is now included in upstream commit 7c6066b ("pixman-private:
include <float.h> only in C code")
This commit is contained in:
Yousong Zhou
2018-11-26 01:46:06 +00:00
parent eae9f8cb9e
commit a21282bd04
3 changed files with 3 additions and 20 deletions
@@ -1,6 +1,6 @@
--- a/configure.ac.orig 2016-11-22 20:44:21.205150763 +0800
+++ b/configure.ac 2016-11-22 20:44:55.505161500 +0800
@@ -720,7 +720,6 @@ dnl Check if assembler is gas compatible
@@ -735,7 +735,6 @@ dnl Check if assembler is gas compatible
have_mips_dspr2=no
AC_MSG_CHECKING(whether to use MIPS DSPr2 assembler)
xserver_save_CFLAGS=$CFLAGS
@@ -1,17 +0,0 @@
--- a/pixman/pixman-private.h.orig 2016-11-22 22:10:33.574769654 +0800
+++ b/pixman/pixman-private.h 2016-11-22 22:10:47.638774056 +0800
@@ -1,5 +1,3 @@
-#include <float.h>
-
#ifndef PIXMAN_PRIVATE_H
#define PIXMAN_PRIVATE_H
@@ -17,6 +15,8 @@
#ifndef __ASSEMBLER__
+#include <float.h>
+
#ifndef PACKAGE
# error config.h must be included before pixman-private.h
#endif