mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
libx11: upgrade 1.6.12 -> 1.7.0
(From OE-Core rev: 8b46fa5fdf9d5fb159e552a06fc4622cc99b30c2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b0e1740a87
commit
cfaa296a7a
@@ -1,56 +0,0 @@
|
|||||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33]
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ross Burton <ross.burton@intel.com>
|
|
||||||
Date: Wed, 22 Jan 2020 17:11:23 +0000
|
|
||||||
Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files
|
|
||||||
|
|
||||||
CPP is used to generate files, but as cpp reads files from the build host the
|
|
||||||
output has a number of blank lines at the beginning which varies depending on
|
|
||||||
what GCC and friends is used.
|
|
||||||
|
|
||||||
Pathalogical example:
|
|
||||||
|
|
||||||
$ cpp -undef -traditional /dev/null
|
|
||||||
# 1 "/dev/null"
|
|
||||||
# 1 "<built-in>"
|
|
||||||
# 1 "<command-line>"
|
|
||||||
# 31 "<command-line>"
|
|
||||||
# 1 "/usr/include/stdc-predef.h" 1 3 4
|
|
||||||
|
|
||||||
# 17 "/usr/include/stdc-predef.h" 3 4
|
|
||||||
|
|
||||||
[ 40 blank line ]
|
|
||||||
|
|
||||||
# 32 "<command-line>" 2
|
|
||||||
# 1 "/dev/null"
|
|
||||||
|
|
||||||
So depending on the content of stdc-predef.h and what other headers CPP will
|
|
||||||
load, the amount of whitespace in the generates files varies. This can result in
|
|
||||||
differences in reproducible environments, and file conflicts in multilib
|
|
||||||
environments.
|
|
||||||
|
|
||||||
As whitespace is irrelevant to these machine-readable files, extend the sed to
|
|
||||||
just delete blank lines.
|
|
||||||
---
|
|
||||||
cpprules.in | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/cpprules.in b/cpprules.in
|
|
||||||
index 03d6701e..ce6b3c98 100644
|
|
||||||
--- a/cpprules.in
|
|
||||||
+++ b/cpprules.in
|
|
||||||
@@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
|
|
||||||
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
|
|
||||||
-e '/^[ ]*XHASH/s/XHASH/\#/' \
|
|
||||||
-e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
|
|
||||||
- -e '/\@\@$$/s/\@\@$$/\\/'
|
|
||||||
+ -e '/\@\@$$/s/\@\@$$/\\/' \
|
|
||||||
+ -e '/^$$/d'
|
|
||||||
|
|
||||||
.pre:
|
|
||||||
@$(MKDIR_P) $(@D)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
|
|||||||
SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
|
SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
|
||||||
|
|
||||||
SRC_URI += "file://0001-Drop-x11-dependencies.patch \
|
SRC_URI += "file://0001-Drop-x11-dependencies.patch \
|
||||||
file://libx11-whitespace.patch"
|
"
|
||||||
|
|
||||||
XORG_PN = "libX11"
|
XORG_PN = "libX11"
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -11,10 +11,10 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
|
|||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
|
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
|
||||||
file://disable_tests.patch \
|
file://disable_tests.patch \
|
||||||
file://libx11-whitespace.patch"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7"
|
SRC_URI[sha256sum] = "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54"
|
||||||
|
|
||||||
PROVIDES = "virtual/libx11"
|
PROVIDES = "virtual/libx11"
|
||||||
|
|
||||||
Reference in New Issue
Block a user