summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-08-07 15:52:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 19:38:34 +0100
commit72e6919bab390494103472401a563199ab339e85 (patch)
treefe5b0d0f70e39e3a273c835895458703d22f86d0
parent3afee08c2cdb8cda75714d7460d1c67e75f0862c (diff)
downloadopenembedded-core-72e6919bab390494103472401a563199ab339e85.tar.gz
libx11-compose-data: upgrade 1.6.7 -> 1.6.8
Refresh the patch to fix the do_patch QA warning. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch12
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb)4
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
index fbd968483d..46a53a17f2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
@@ -1,4 +1,4 @@
-From a60f5058136aeadceebfccadf606d8210f8d3ca6 Mon Sep 17 00:00:00 2001
+From e1f9b0b531c6ddb11a85c0664051e2e4efc589fb Mon Sep 17 00:00:00 2001
From: Ming Liu <ming.liu@toradex.com>
Date: Sun, 5 May 2019 11:55:14 +0200
Subject: [PATCH] Drop x11 dependencies
@@ -11,11 +11,11 @@ Signed-off-by: Ming Liu <ming.liu@toradex.com>
1 file changed, 44 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 3090845..d14063f 100644
+index a5fd706..b42488c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -66,27 +66,8 @@ fi
- AC_SUBST(LDFLAGS_FOR_BUILD)
+@@ -76,27 +76,8 @@ fi
+ AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages
-
@@ -42,7 +42,7 @@ index 3090845..d14063f 100644
# Check for dlopen
AC_MSG_CHECKING([if run-time linking is supported])
AC_SEARCH_LIBS(dlopen,[dl svld])
-@@ -226,30 +207,6 @@ AC_SUBST(XTHREAD_CFLAGS)
+@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
@@ -73,7 +73,7 @@ index 3090845..d14063f 100644
AC_ARG_ENABLE(xcms,
AS_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
-@@ -329,7 +286,6 @@ X11_LIBDIR="${libdir}/X11"
+@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11"
AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
index 9dace701a5..cabb84e686 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
@@ -11,8 +11,8 @@ require xorg-lib-common.inc
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
+SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
+SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
SRC_URI += "file://0001-Drop-x11-dependencies.patch"