[PATCH 0/2]libx11: fix LSB Library Check libX11.so.6 fail

[PATCH 0/2]libx11: fix LSB Library Check libX11.so.6 fail

[Hongxu Jia]

The following changes since commit edcbb79583e1577cb64d368e3902915dea50a96e:

  ref-manual: Added note about issues on supported distros (2013-06-21 14:26:31 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/fix-lsb
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-adt

Hongxu Jia (2):
  libx11: move xcms enabling to PACKAGECONFIG for LSB Library Check
  lsbtest: sync test suite packages version

 meta/recipes-extended/lsb/lsbtest/packages_list | 38 ++++++++++++-------------
 meta/recipes-graphics/xorg-lib/libx11.inc       |  5 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)

-- 
1.8.1.2

[PATCH 1/2] libx11: move xcms enabling to PACKAGECONFIG for LSB Library Check

[Hongxu Jia]

When --disable-xcms is used, the LSB 4.1 Library Check will fail:
...
Checking library symbols (libX11.so.6)
Did not find XcmsAddColorSpace (unversioned) in libX11.so.6
Did not find XcmsAddFunctionSet (unversioned) in libX11.so.6
Did not find XcmsAllocColor (unversioned) in libX11.so.6
...

[YOCTO #4016]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-graphics/xorg-lib/libx11.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index e0fce3e..c9506b0 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -25,10 +25,9 @@ DEPENDS += "xproto-native"
 EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
 EXTRA_OEMAKE += 'CWARNFLAGS=""'
 
-# Let people with incredibly archaic requirements enable Xcms, but disable it by
-# default.
+# LSB 4.1 Library Check requires enable Xcms, set enable as default.
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
+PACKAGECONFIG[xcms] = "--enable-xcms"
 
 # src/util/makekeys is built natively but needs -D_GNU_SOURCE defined.
 CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
-- 
1.8.1.2

Re: [PATCH 1/2] libx11: move xcms enabling to PACKAGECONFIG for LSB Library Check

[Burton, Ross]

On 26 June 2013 03:30, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> +# LSB 4.1 Library Check requires enable Xcms, set enable as default.
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
> +PACKAGECONFIG[xcms] = "--enable-xcms"

Whether to enable Xcms by default is something we're debating right
now, and this is an interesting data point.

However, this is entirely the wrong way of doing what you want to
achieve.  I suggest you read the documentation on PACKAGECONFIG, but
the patch should have been:

- PACKAGECONFIG ??= ""
+ PACKAGECONFIG ??= "xcms"

NACKing for now as I plan to do a little more investigation on this
today - it's conceivable we'll enable xcms in LSB builds specifically.

Ross

[PATCH 2/2] lsbtest: sync test suite packages version

[Hongxu Jia]

Update file packages_list after sync test suite packages version with
upstream.
Check date: Jun 25, 2013

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-extended/lsb/lsbtest/packages_list | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbtest/packages_list b/meta/recipes-extended/lsb/lsbtest/packages_list
index dc3c002..99f83c1 100644
--- a/meta/recipes-extended/lsb/lsbtest/packages_list
+++ b/meta/recipes-extended/lsb/lsbtest/packages_list
@@ -3,42 +3,42 @@ LSB_ARCH="lsbarch"
 
 BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm"
 
-RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-4.1.0.11-1.targetarch.rpm \
+RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-4.1.0.12-1.targetarch.rpm \
 	lsb-tet3-lite-3.7-23.lsb4.targetarch.rpm \
 	lsb-tet3-lite-devel-3.7-23.lsb4.targetarch.rpm \
 	lsb-xvfb-1.2.0-21.targetarch.rpm \
 	"
 
-RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.4-3.targetarch.rpm \
-	lsb-libchk-4.1.4-3.targetarch.rpm \
+RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.4-5.targetarch.rpm \
+	lsb-libchk-4.1.4-5.targetarch.rpm \
 	lsb-qm-2.2-8.lsb4.targetarch.rpm \
-	lsb-task-dist-testkit-4.1.3-1.noarch.rpm \
-	lsb-test-core-4.1.12-2.targetarch.rpm \
+	lsb-task-dist-testkit-4.1.9-1.noarch.rpm \
+	lsb-test-core-4.1.15-1.targetarch.rpm \
 	lsb-test-cpp-t2c-4.1.0-1.targetarch.rpm \
-	lsb-test-desktop-4.1.7-1.targetarch.rpm \
-	lsb-test-desktop-t2c-4.1.2-2.targetarch.rpm \
+	lsb-test-desktop-4.1.9-1.targetarch.rpm \
+	lsb-test-desktop-t2c-4.1.3-3.targetarch.rpm \
 	lsb-test-libstdcpp-4.1.0-18.lsb4.targetarch.rpm \
 	lsb-test-olver-core-4.1.4-1.targetarch.rpm \
-	lsb-test-perl-4.1.6-2.noarch.rpm \
+	lsb-test-perl-4.1.8-1.noarch.rpm \
 	lsb-test-printing-4.1.2-1.targetarch.rpm \
 	lsb-test-python-4.1.5-1.targetarch.rpm \
 	lsb-test-qt3-azov-4.1.1-3.targetarch.rpm \
-	lsb-test-qt4-azov-4.1.2-1.targetarch.rpm \
-	lsb-test-xts5-5.1.5-42.lsb4.targetarch.rpm \
+	lsb-test-qt4-azov-4.1.3-1.targetarch.rpm \
+	lsb-test-xts5-5.1.5-45.lsb4.targetarch.rpm \
 	lsb-test-alsa-t2c-4.1.0-1.targetarch.rpm \
 	lsb-test-core-t2c-4.1.2-3.targetarch.rpm \
 	lsb-test-xml2-azov-4.1.0-1.targetarch.rpm \
 	"
 
-APP_PACKAGES_LIST="lsb-python-2.4.6-5.lsb4.targetarch.rpm \
-	lsb-apache-2.2.14-5.lsb4.targetarch.rpm \
-	lsb-tcl-8.5.7-6.lsb4.targetarch.rpm \
-	lsb-expect-5.43.0-11.lsb4.targetarch.rpm \
-	lsb-groff-1.20.1-5.lsb4.targetarch.rpm \
-	lsb-raptor-1.4.19-3.lsb4.targetarch.rpm \
-	lsb-xpdf-1.01-12.lsb4.targetarch.rpm \
-	lsb-samba-3.4.3-7.lsb4.targetarch.rpm \
-	lsb-rsync-3.0.6-4.lsb4.targetarch.rpm \
+APP_PACKAGES_LIST="lsb-python-2.4.6-7.lsb4.targetarch.rpm \
+	lsb-apache-2.2.14-8.lsb4.targetarch.rpm \
+	lsb-tcl-8.5.7-8.lsb4.targetarch.rpm \
+	lsb-expect-5.43.0-13.lsb4.targetarch.rpm \
+	lsb-groff-1.20.1-7.lsb4.targetarch.rpm \
+	lsb-raptor-1.4.19-5.lsb4.targetarch.rpm \
+	lsb-xpdf-1.01-14.lsb4.targetarch.rpm \
+	lsb-samba-3.4.3-9.lsb4.targetarch.rpm \
+	lsb-rsync-3.0.6-6.lsb4.targetarch.rpm \
 	"
 
 APP_TESTFILES_LIST="expect-tests.tar \
-- 
1.8.1.2