diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-26 10:27:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-30 14:01:06 +0000 |
commit | cfaa296a7a5b02ea59f3f510f0b3618f6c0b3fd0 (patch) | |
tree | 525a4aaa3fddc6c430114325e54714f607e61962 | |
parent | b0e1740a87c21922e95999da21fc6d95c9a4ca33 (diff) | |
download | poky-cfaa296a7a5b02ea59f3f510f0b3618f6c0b3fd0.tar.gz |
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>
-rw-r--r-- | meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch | 56 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb (renamed from meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb) | 6 |
3 files changed, 4 insertions, 60 deletions
diff --git a/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch b/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch deleted file mode 100644 index 3f97143082..0000000000 --- a/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Wed, 22 Jan 2020 17:11:23 +0000 | ||
7 | Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files | ||
8 | |||
9 | CPP is used to generate files, but as cpp reads files from the build host the | ||
10 | output has a number of blank lines at the beginning which varies depending on | ||
11 | what GCC and friends is used. | ||
12 | |||
13 | Pathalogical example: | ||
14 | |||
15 | $ cpp -undef -traditional /dev/null | ||
16 | # 1 "/dev/null" | ||
17 | # 1 "<built-in>" | ||
18 | # 1 "<command-line>" | ||
19 | # 31 "<command-line>" | ||
20 | # 1 "/usr/include/stdc-predef.h" 1 3 4 | ||
21 | |||
22 | # 17 "/usr/include/stdc-predef.h" 3 4 | ||
23 | |||
24 | [ 40 blank line ] | ||
25 | |||
26 | # 32 "<command-line>" 2 | ||
27 | # 1 "/dev/null" | ||
28 | |||
29 | So depending on the content of stdc-predef.h and what other headers CPP will | ||
30 | load, the amount of whitespace in the generates files varies. This can result in | ||
31 | differences in reproducible environments, and file conflicts in multilib | ||
32 | environments. | ||
33 | |||
34 | As whitespace is irrelevant to these machine-readable files, extend the sed to | ||
35 | just delete blank lines. | ||
36 | --- | ||
37 | cpprules.in | 3 ++- | ||
38 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
39 | |||
40 | diff --git a/cpprules.in b/cpprules.in | ||
41 | index 03d6701e..ce6b3c98 100644 | ||
42 | --- a/cpprules.in | ||
43 | +++ b/cpprules.in | ||
44 | @@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ | ||
45 | -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ | ||
46 | -e '/^[ ]*XHASH/s/XHASH/\#/' \ | ||
47 | -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ | ||
48 | - -e '/\@\@$$/s/\@\@$$/\\/' | ||
49 | + -e '/\@\@$$/s/\@\@$$/\\/' \ | ||
50 | + -e '/^$$/d' | ||
51 | |||
52 | .pre: | ||
53 | @$(MKDIR_P) $(@D) | ||
54 | -- | ||
55 | 2.20.1 | ||
56 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index 3d97ad78d2..0f4be35770 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | |||
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" | |||
15 | SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" | 15 | SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" |
16 | 16 | ||
17 | SRC_URI += "file://0001-Drop-x11-dependencies.patch \ | 17 | SRC_URI += "file://0001-Drop-x11-dependencies.patch \ |
18 | file://libx11-whitespace.patch" | 18 | " |
19 | 19 | ||
20 | XORG_PN = "libX11" | 20 | XORG_PN = "libX11" |
21 | 21 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb b/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb index de7f1c366e..3faee6e497 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.12.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.7.0.bb | |||
@@ -11,10 +11,10 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" | |||
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ | 13 | SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ |
14 | file://disable_tests.patch \ | 14 | file://disable_tests.patch \ |
15 | file://libx11-whitespace.patch" | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7" | 17 | SRC_URI[sha256sum] = "36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54" |
18 | 18 | ||
19 | PROVIDES = "virtual/libx11" | 19 | PROVIDES = "virtual/libx11" |
20 | 20 | ||