[OE-core] [PATCH 1/1] libx11-diet: update to 1.4.4

[Saul Wold]

On 11/11/2011 03:09 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan at windriver.com>
>
> I remove patch "nodolt.patch" because it is no use in the new version \
> and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4.
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan at windriver.com>
> ---
>   .../xorg-lib/libx11-diet-1.3/include_fix.patch     |   25 --------------
>   .../xorg-lib/libx11-diet-1.3/nodolt.patch          |   14 --------
>   .../libx11-diet-1.3/x11_disable_makekeys.patch     |   31 ------------------
>   .../X18NCMSstubs.diff                              |    1 +
>   .../fix-disable-xlocale.diff                       |    1 +
>   .../fix-utf8-wrong-define.patch                    |    2 +
>   .../libx11-diet-1.4.4/keysymdef_include.patch      |   23 +++++++++++++
>   .../libx11-diet-1.4.4/x11_disable_makekeys.patch   |   34 ++++++++++++++++++++
>   meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb  |   25 --------------
>   .../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb |   28 ++++++++++++++++
>   10 files changed, 89 insertions(+), 95 deletions(-)
>   delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
>   delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
>   delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
>   rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =>  libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
>   rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =>  libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
>   rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =>  libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
>   create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
>   create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
>   delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
>   create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
>
<SNIP>

> diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
> new file mode 100644
> index 0000000..1762829
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
> @@ -0,0 +1,28 @@
> +require libx11.inc
> +
> +DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
> +this version."
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> +
> +PR = "r0"
> +
> +SRC_URI += "file://x11_disable_makekeys.patch \
> +            file://X18NCMSstubs.diff \
> +            file://keysymdef_include.patch \
> +            file://fix-disable-xlocale.diff \
> +            file://fix-utf8-wrong-define.patch \
> +           "
> +
> +
> +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
> +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
> +
> +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
> +            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
> +
> +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
> +
Why did you need to add FILESDIR here?

Sau!

> +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
> +CFLAGS += "-D_GNU_SOURCE"
> +