jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

libX11: update to libX11-1.6.0

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-06-05 05:12:24 +02:00
parent ccbd1d87a6
commit 003e502a85
5 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/x11/lib/libX11/build
View File

@ -42,6 +42,7 @@ cd $PKG_BUILD
--enable-xlocale \
--disable-xlocaledir \
--enable-xkb \
--with-keysymdefdir="$SYSROOT_PREFIX/usr/include/X11" \
--disable-xf86bigfont \
--enable-malloc0returnsnull \
--disable-specs \

2
packages/x11/lib/libX11/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libX11"
PKG_VERSION="1.5.0"
PKG_VERSION="1.6.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

18
packages/x11/lib/libX11/patches/libX11-1.5.0-disable_nls_tests.patch
View File

@ -1,18 +0,0 @@
diff -Naur libX11-1.5.0-old/nls/Makefile.am libX11-1.5.0-new/nls/Makefile.am
--- libX11-1.5.0-old/nls/Makefile.am 2012-06-01 23:37:18.000000000 -0700
+++ libX11-1.5.0-new/nls/Makefile.am 2012-12-29 04:47:12.000000000 -0800
@@ -36,10 +36,10 @@
< locale.dir.l1 > locale.dir.l2
cat locale.dir.l2 locale.dir.l1 > locale.dir
-if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL)
-TESTS = $(srcdir)/compose-check.pl
-endif HAVE_PERL
+# if HAVE_PERL
+# TESTS_ENVIRONMENT = $(PERL)
+# TESTS = $(srcdir)/compose-check.pl
+# endif HAVE_PERL
# Per-locale data files

20
packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch
View File

@ -1,20 +0,0 @@
diff -Naur libX11-1.5.0-old/configure.ac libX11-1.5.0-new/configure.ac
--- libX11-1.5.0-old/configure.ac 2012-06-01 23:37:17.000000000 -0700
+++ libX11-1.5.0-new/configure.ac 2012-06-02 09:13:08.000000000 -0700
@@ -35,6 +35,7 @@
# Required when PKG_CHECK_MODULES called within an if statement
PKG_PROG_PKG_CONFIG
+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
@@ -306,7 +307,7 @@
# Find keysymdef.h
#
AC_MSG_CHECKING([keysym definitions])
-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+KEYSYMDEFDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`/X11
FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
for i in $FILES; do
if test -f "$KEYSYMDEFDIR/$i"; then

18
packages/x11/lib/libX11/patches/libX11-disable_nls_tests.patch Normal file
View File

@ -0,0 +1,18 @@
diff -Naur libX11-1.6.0/nls/Makefile.am libX11-1.6.0.patch/nls/Makefile.am
--- libX11-1.6.0/nls/Makefile.am 2013-06-04 04:21:16.000000000 +0200
+++ libX11-1.6.0.patch/nls/Makefile.am 2013-06-04 17:07:11.962522739 +0200
@@ -36,10 +36,10 @@
< locale.dir.l1 > locale.dir.l2
cat locale.dir.l2 locale.dir.l1 > locale.dir
-if HAVE_PERL
-LOG_COMPILER = $(PERL)
-TESTS = compose-check.pl
-endif HAVE_PERL
+# if HAVE_PERL
+# LOG_COMPILER = $(PERL)
+# TESTS = compose-check.pl
+# endif HAVE_PERL
# Per-locale data files