From 8195341e9ef6b709a06df1dcdce8326cbeb6e780 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 7 Aug 2019 15:52:27 +0800 Subject: libx11-compose-data: upgrade 1.6.7 -> 1.6.8 Refresh the patch to fix the do_patch QA warning. (From OE-Core rev: 72e6919bab390494103472401a563199ab339e85) Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-Drop-x11-dependencies.patch | 12 ++++---- .../xorg-lib/libx11-compose-data_1.6.7.bb | 35 ---------------------- .../xorg-lib/libx11-compose-data_1.6.8.bb | 35 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb (limited to 'meta/recipes-graphics') 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 Date: Sun, 5 May 2019 11:55:14 +0200 Subject: [PATCH] Drop x11 dependencies @@ -11,11 +11,11 @@ Signed-off-by: Ming Liu 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.7.bb deleted file mode 100644 index 9dace701a5..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Xlib: Compose data files for libx11" -DESCRIPTION = "This package provides the compose data files for libx11." - -python () { - if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipRecipe("libx11-compose-data is incompatible with x11 distro feature, use libx11 instead.") -} - -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 += "file://0001-Drop-x11-dependencies.patch" - -XORG_PN = "libX11" - -EXTRA_OECONF += "--disable-xkb" - -PACKAGES = "${PN}" - -FILES_${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" - -do_compile() { - oe_runmake -C nls -} - -do_install() { - oe_runmake DESTDIR=${D} -C nls install -} - -REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb new file mode 100644 index 0000000000..cabb84e686 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb @@ -0,0 +1,35 @@ +SUMMARY = "Xlib: Compose data files for libx11" +DESCRIPTION = "This package provides the compose data files for libx11." + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d): + raise bb.parse.SkipRecipe("libx11-compose-data is incompatible with x11 distro feature, use libx11 instead.") +} + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" +SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" + +SRC_URI += "file://0001-Drop-x11-dependencies.patch" + +XORG_PN = "libX11" + +EXTRA_OECONF += "--disable-xkb" + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" + +do_compile() { + oe_runmake -C nls +} + +do_install() { + oe_runmake DESTDIR=${D} -C nls install +} + +REQUIRED_DISTRO_FEATURES = "" -- cgit 1.2.3-korg