diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-06-27 17:40:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-28 13:28:37 +0100 |
commit | bc231b1f22664efe7bdac80541b1deb0dad9f519 (patch) | |
tree | c31da7f7b8145eaadbbc2fe6065d1bd49d4d0a69 /meta/recipes-graphics/xorg-lib/libxt | |
parent | 56fd11118cb46341479a91e7773e98b00355c10b (diff) | |
download | poky-bc231b1f22664efe7bdac80541b1deb0dad9f519.tar.gz |
libxt: update to 1.2.0
License checksum changed due to modified copyright year.
Removed patch was upstreamed.
(From OE-Core rev: 4a77ac273cb16167fff8fcb9831434d9a25f8fcf)
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libxt')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch | 33 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch | 16 |
2 files changed, 13 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch deleted file mode 100644 index 1a691a3d5e..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
3 | Date: Mon, 10 Jul 2017 16:51:13 +0300 | ||
4 | Subject: [PATCH] libXt: util: don't link makestrs with target cflags | ||
5 | |||
6 | The line: AM_CFLAGS = $(XT_CFLAGS) | ||
7 | in util/Makefile.am is wrong because it adds target cflags to the | ||
8 | compilation of makestrs, which is built for the build machine, which | ||
9 | leads to build failures when cross-compiling. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
14 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
15 | --- | ||
16 | util/Makefile.am | 1 - | ||
17 | 1 file changed, 1 deletion(-) | ||
18 | |||
19 | diff --git a/util/Makefile.am b/util/Makefile.am | ||
20 | index 800b35b..f2dd1f9 100644 | ||
21 | --- a/util/Makefile.am | ||
22 | +++ b/util/Makefile.am | ||
23 | @@ -11,7 +11,6 @@ EXTRA_DIST = \ | ||
24 | StrDefs.ht \ | ||
25 | string.list | ||
26 | |||
27 | -AM_CFLAGS = $(XT_CFLAGS) | ||
28 | makestrs_SOURCES = makestrs.c | ||
29 | |||
30 | |||
31 | -- | ||
32 | 2.4.0 | ||
33 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch index ffc2c15d71..ff8c675dbd 100644 --- a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From f069b0a430fe96f3ece2106d34375008833599d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
3 | Date: Fri, 2 Dec 2011 12:20:05 -0800 | ||
4 | Subject: [PATCH] libxt: fix compilatoin with x32 toolchain | ||
5 | |||
1 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
2 | 7 | ||
3 | This fixes compilation with x32 toolchain. | 8 | This fixes compilation with x32 toolchain. |
@@ -5,10 +10,15 @@ This fixes compilation with x32 toolchain. | |||
5 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | 10 | Received this patch from H.J. Lu <hjl.tools@gmail.com> |
6 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 | 11 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 |
7 | 12 | ||
13 | --- | ||
14 | include/X11/Xtos.h | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | 16 | ||
9 | --- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 | 17 | diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h |
10 | +++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 | 18 | index 64b2da8..44f52c2 100644 |
11 | @@ -62,7 +62,7 @@ SOFTWARE. | 19 | --- a/include/X11/Xtos.h |
20 | +++ b/include/X11/Xtos.h | ||
21 | @@ -59,7 +59,7 @@ SOFTWARE. | ||
12 | defined(__sparc64__) || \ | 22 | defined(__sparc64__) || \ |
13 | defined(__s390x__) || \ | 23 | defined(__s390x__) || \ |
14 | (defined(__hppa__) && defined(__LP64__)) || \ | 24 | (defined(__hppa__) && defined(__LP64__)) || \ |