Add needed build dependencies and regenerate patches
Signed-off-by: Björn Esser <b.es...@pengutronix.de>
---
...0001-HACK-disable-stuff-not-needed-for-locale-data.patch | 6 +++---
.../{libx11-locale-1.6.7 => libx11-locale-1.6.8}/autogen.sh | 0
patches/{libx11-locale-1.6.7 => libx11-locale-1.6.8}/series | 0
rules/libx11-locale.in | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
rename patches/{libx11-locale-1.6.7 =>
libx11-locale-1.6.8}/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
(92%)
rename patches/{libx11-locale-1.6.7 => libx11-locale-1.6.8}/autogen.sh (100%)
rename patches/{libx11-locale-1.6.7 => libx11-locale-1.6.8}/series (100%)
diff --git
a/patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
b/patches/libx11-locale-1.6.8/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
similarity index 92%
rename from
patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
rename to
patches/libx11-locale-1.6.8/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
index b2f1fa663..dac45134e 100644
---
a/patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
+++
b/patches/libx11-locale-1.6.8/0001-HACK-disable-stuff-not-needed-for-locale-data.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
1 file changed, 27 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 30908453622b..ee52c09cbf84 100644
+index a5fd706f4a3c..65433c677f6d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -226,30 +226,6 @@ AC_SUBST(XTHREAD_CFLAGS)
+@@ -237,30 +237,6 @@ AC_SUBST(XTHREAD_CFLAGS)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])],
)
@@ -42,7 +42,7 @@ index 30908453622b..ee52c09cbf84 100644
AC_ARG_ENABLE(xcms,
AS_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
-@@ -329,9 +305,6 @@ X11_LIBDIR="${libdir}/X11"
+@@ -340,9 +316,6 @@ X11_LIBDIR="${libdir}/X11"
AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
diff --git a/patches/libx11-locale-1.6.7/autogen.sh
b/patches/libx11-locale-1.6.8/autogen.sh
similarity index 100%
rename from patches/libx11-locale-1.6.7/autogen.sh
rename to patches/libx11-locale-1.6.8/autogen.sh
diff --git a/patches/libx11-locale-1.6.7/series
b/patches/libx11-locale-1.6.8/series
similarity index 100%
rename from patches/libx11-locale-1.6.7/series
rename to patches/libx11-locale-1.6.8/series
diff --git a/rules/libx11-locale.in b/rules/libx11-locale.in
index 530b6d97f..9c55d414f 100644
--- a/rules/libx11-locale.in
+++ b/rules/libx11-locale.in
@@ -5,6 +5,8 @@ config LIBX11_LOCALE
# for autogen.sh
select HOST_XORG_UTIL_MACROS
select HOST_XORG_LIB_XTRANS
+ select LIBXCB
+ select XORG_LIB_XTRANS
prompt "libx11 locale data"
help
X11 locale data files.
--
2.23.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
