summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-15 06:41:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-17 22:38:32 +0000
commit8c031f5a254edb34cc33f7899e77a9f644f92f69 (patch)
tree4779473e2066acb5de02d2524d64d527332ae66f
parentd520b89046c91f4e5ad78fb52371b19205d67696 (diff)
downloadpoky-8c031f5a254edb34cc33f7899e77a9f644f92f69.tar.gz
xinit: upgrade 1.4.3 -> 1.4.4
(From OE-Core rev: c956ec946b4b6979a1bb27f683967b48a54702ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch7
-rw-r--r--meta/recipes-graphics/xorg-app/xinit_1.4.4.bb (renamed from meta/recipes-graphics/xorg-app/xinit_1.4.3.bb)2
2 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch
index 649905574c..05cca7804d 100644
--- a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch
+++ b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch
@@ -1,4 +1,4 @@
1From d642e60d8963f1b90569cd0ab5c29ac2c9bfe939 Mon Sep 17 00:00:00 2001 1From e193ebf82819a24f067a559b42a81bf380d12ab8 Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com> 2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Fri, 6 Mar 2020 22:28:14 +0000 3Date: Fri, 6 Mar 2020 22:28:14 +0000
4Subject: [PATCH] Make manpage multilib identical 4Subject: [PATCH] Make manpage multilib identical
@@ -11,7 +11,7 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/man/Makefile.am b/man/Makefile.am 13diff --git a/man/Makefile.am b/man/Makefile.am
14index 9c6569f..608e933 100644 14index 9c6569f..e88c4ae 100644
15--- a/man/Makefile.am 15--- a/man/Makefile.am
16+++ b/man/Makefile.am 16+++ b/man/Makefile.am
17@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ 17@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
@@ -23,6 +23,3 @@ index 9c6569f..608e933 100644
23 -e 's|__configdir__|$(XINITDIR)|g' 23 -e 's|__configdir__|$(XINITDIR)|g'
24 24
25 25
26--
272.23.0
28
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.3.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.4.bb
index 519a9fc4ef..b646ac667c 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.4.3.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.4.4.bb
@@ -16,7 +16,7 @@ SRC_URI += "file://0001-Make-manpage-multilib-identical.patch"
16 16
17SRC_URI_EXT = "xz" 17SRC_URI_EXT = "xz"
18 18
19SRC_URI[sha256sum] = "86409f21a6a31148d2c1c17bf5f2d904eb5ef455f9dc67c49fbd0c10ab18fd5a" 19SRC_URI[sha256sum] = "40a47c7a164c7f981ce3787b4b37f7e411fb43231dcde543d70094075dacfef9"
20 20
21EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie \ 21EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie \
22 --with-xterm=x-terminal-emulator" 22 --with-xterm=x-terminal-emulator"