diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 22:15:50 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-17 19:00:12 +0100 |
| commit | 9715338b40fec4a84c9f8f58f49584787fd4e661 (patch) | |
| tree | b0f15a43cdea6d5b005e00520586920cc85c2afc /patches/libx11-locale-1.6.7 | |
| parent | 647b477db9678ea6f079b92aeb4c458a91ef1040 (diff) | |
| download | ptxdist-9715338b40fec4a84c9f8f58f49584787fd4e661.tar.gz ptxdist-9715338b40fec4a84c9f8f58f49584787fd4e661.tar.xz | |
xorg-lib-x11: version bump 1.6.2 -> 1.6.7
Also, split the locale data into a separate package. This way, libxkbcommon
can use it independently for key composing.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/libx11-locale-1.6.7')
| -rw-r--r-- | patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch | 54 | ||||
| l--------- | patches/libx11-locale-1.6.7/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/libx11-locale-1.6.7/series | 4 |
3 files changed, 59 insertions, 0 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.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch new file mode 100644 index 000000000..b2f1fa663 --- /dev/null +++ b/patches/libx11-locale-1.6.7/0001-HACK-disable-stuff-not-needed-for-locale-data.patch @@ -0,0 +1,54 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 15 Nov 2018 11:02:09 +0100 +Subject: [PATCH] HACK: disable stuff not needed for locale data + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.ac | 27 --------------------------- + 1 file changed, 27 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 30908453622b..ee52c09cbf84 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -226,30 +226,6 @@ AC_SUBST(XTHREAD_CFLAGS) + + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + +-# +-# Find keysymdef.h +-# +-AC_MSG_CHECKING([keysym definitions]) +-AC_ARG_WITH([keysymdefdir], +- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], +- [KEYSYMDEFDIR=$withval], +- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) +- +-if test ! -d "$KEYSYMDEFDIR"; then +- AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) +-fi +- +-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" +-for i in $FILES; do +- if test -f "$KEYSYMDEFDIR/$i"; then +- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" +- elif test "x$i" = "xkeysymdef.h"; then +- AC_MSG_ERROR([Cannot find keysymdef.h]) +- fi +-done +-AC_MSG_RESULT([$KEYSYMDEFS]) +-AC_SUBST(KEYSYMDEFS) +- + AC_ARG_ENABLE(xcms, + AS_HELP_STRING([--disable-xcms], + [Disable Xlib support for CMS *EXPERIMENTAL*]), +@@ -329,9 +305,6 @@ X11_LIBDIR="${libdir}/X11" + AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) + AC_SUBST(X11_LIBDIR) + +-PKG_CHECK_MODULES(X11, [$X11_REQUIRES]) +-X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" +- + # + # Yes, it would be nice to put the locale data in + # /usr/share, but the locale stuff includes loadable diff --git a/patches/libx11-locale-1.6.7/autogen.sh b/patches/libx11-locale-1.6.7/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libx11-locale-1.6.7/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libx11-locale-1.6.7/series b/patches/libx11-locale-1.6.7/series new file mode 100644 index 000000000..ef9cc2873 --- /dev/null +++ b/patches/libx11-locale-1.6.7/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-HACK-disable-stuff-not-needed-for-locale-data.patch +# fab3a866fc45f8776ffad6672bb88def - git-ptx-patches magic |