From 2bdc6c2e4f0436535f1c6aad72acae4146374149 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 7 May 2012 23:54:30 +0200 Subject: libxaw: upgrade to 1.0.10 to fix -Werror=pointer-to-int-cast when building for x86-64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1.0.9 fails with: | XawIm.c:1410:23: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] | XawIm.c:1415:23: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] * fixed upstream: http://cgit.freedesktop.org/xorg/lib/libXaw/commit/?id=49c0a2441946f0d70fbd2612f193c95b84dde102 * COPYING changed only formally, stripping trailing spaces in http://cgit.freedesktop.org/xorg/lib/libXaw/commit/COPYING?id=37ffe69b10ae29e8f91de6ef647d06804b9d159b Signed-off-by: Martin Jansa Signed-off-by: Eric Bénard --- meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 27 +++++++++++++++++++++ meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb | 28 ---------------------- 2 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb new file mode 100644 index 0000000..89338d9 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb @@ -0,0 +1,27 @@ +require recipes-graphics/xorg-lib/xorg-lib-common.inc +DESCRIPTION = "X Athena Widget Set" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau xmlto-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" + +PE = "1" + +SRC_URI[md5sum] = "f1ea52debce7a18cc26b21647a00ad8b" +SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd" + +# disable docs as groff detection doesn't work on some hosts while cross compilling +EXTRA_OECONF += " --disable-docs " + +do_install_append () { + ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so +} + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +FILES_libxaw6 = "${libdir}/libXaw*.so.6*" +FILES_libxaw7 = "${libdir}/libXaw*.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" + +XORG_PN = "libXaw" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb deleted file mode 100644 index ea4f38b..0000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb +++ /dev/null @@ -1,28 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -DESCRIPTION = "X Athena Widget Set" -DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau xmlto-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=f1beacbc336a5a256bb28dbfcf01c2be" - -PE = "1" -PR = "r12" - -SRC_URI[md5sum] = "ccc57478c41b7a75b9702241b889b1d4" -SRC_URI[sha256sum] = "a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037" - -# disable docs as groff detection doesn't work on some hosts while cross compilling -EXTRA_OECONF += " --disable-docs " - -do_install_append () { - ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so -} - -PACKAGES =+ "libxaw6 libxaw7 libxaw8" - -FILES_libxaw6 = "${libdir}/libXaw*.so.6*" -FILES_libxaw7 = "${libdir}/libXaw*.so.7*" -FILES_libxaw8 = "${libdir}/libXaw8.so.8*" - -XORG_PN = "libXaw" -- cgit v1.2.3-18-g5258