* [PATCH] lib11: fix patch headers
@ 2018-10-08 14:36 Ross Burton
0 siblings, 0 replies; 2+ messages in thread
From: Ross Burton @ 2018-10-08 14:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch | 3 ++-
meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch | 3 ++-
meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
index 4ca2f42d4c7..c1172147a6e 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
@@ -1,10 +1,11 @@
From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:08:27 +0800
-Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
+Subject: [PATCH] Stub out x18n
Update patch to version 1.6.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Inappropriate [configuration]
---
src/Makefile.am | 5 +-
src/X18NCMSstubs.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
index 3677fb1c5ca..09cf74fff4c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
@@ -1,12 +1,13 @@
From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:13:38 +0800
-Subject: [PATCH] Upstream-Status: Pending
+Subject: [PATCH] Fix build when xlocale disabled
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Update patch to version 1.6.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Pending
---
src/Font.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index 1a3069a9ad6..0b57e0b068c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -1,13 +1,14 @@
From 046703373055c7029c19d171e415ff3caaa87372 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:16:33 +0800
-Subject: [PATCH] Upstream-Status: Pending
+Subject: [PATCH] Disable unicode
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Update patch to version 1.6.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Pending
---
include/X11/Xlib.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] lib11: fix patch headers
@ 2018-10-08 15:13 Ross Burton
0 siblings, 0 replies; 2+ messages in thread
From: Ross Burton @ 2018-10-08 15:13 UTC (permalink / raw)
To: openembedded-core
devtool doesn't like patches without subjects, so add meaningful subjects.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch | 2 +-
meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch | 2 +-
meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
index c4c9396675a..c1172147a6e 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
@@ -1,7 +1,7 @@
From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:08:27 +0800
-Subject: [PATCH]
+Subject: [PATCH] Stub out x18n
Update patch to version 1.6.6
Signed-off-by: Changqing Li <changqing.li@windriver.com>
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
index 559250f9576..09cf74fff4c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
@@ -1,7 +1,7 @@
From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:13:38 +0800
-Subject: [PATCH]
+Subject: [PATCH] Fix build when xlocale disabled
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index c077639f895..0b57e0b068c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -1,7 +1,7 @@
From 046703373055c7029c19d171e415ff3caaa87372 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 10 Sep 2018 09:16:33 +0800
-Subject: [PATCH]
+Subject: [PATCH] Disable unicode
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-08 15:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-08 14:36 [PATCH] lib11: fix patch headers Ross Burton
-- strict thread matches above, loose matches on Subject: below --
2018-10-08 15:13 Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox