summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorBjörn Esser <b.esser@pengutronix.de>2019-09-25 11:13:28 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-10-01 20:58:49 +0200
commit42f8f427521526233b256a569064d02d6ee43147 (patch)
tree302d51268242daf6db411af08cc37563d72d5228 /patches
parente0c027623d7f31427497cd094d130080ab0ba381 (diff)
downloadptxdist-42f8f427521526233b256a569064d02d6ee43147.tar.gz
ptxdist-42f8f427521526233b256a569064d02d6ee43147.tar.xz
libx11-locale: adaptions for updated xorg-lib-x11
Add needed build dependencies and regenerate patches Signed-off-by: Björn Esser <b.esser@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/libx11-locale-1.6.8/0001-HACK-disable-stuff-not-needed-for-locale-data.patch (renamed from patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch)6
l---------patches/libx11-locale-1.6.8/autogen.sh (renamed from patches/libx11-locale-1.6.7/autogen.sh)0
-rw-r--r--patches/libx11-locale-1.6.8/series (renamed from patches/libx11-locale-1.6.7/series)0
3 files changed, 3 insertions, 3 deletions
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
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.olbrich@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
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/libx11-locale-1.6.7/autogen.sh
+++ b/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
index ef9cc2873..ef9cc2873 100644
--- a/patches/libx11-locale-1.6.7/series
+++ b/patches/libx11-locale-1.6.8/series