Skip to contentSkip to conversation

Split out libx11-locale from libx11

PATCH In review [email protected] 2 participants 5 messages May 5, 2019 – Jun 13, 2019

lore
Share & tools
lore
#0 lore raw

v2 cover Split out libx11-locale from libx11

From: Ming Liu <[email protected]>

Changes in V2:
1 As suggested by Ross Burton, split out libx11-locale from libx11 as a standalone recipe.

Ming Liu (2):
libx11: split out libx11-locale
libxkbcommon: RDEPENDS on libx11-locale

 .../recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb |  1 -
 .../libx11-locale/0001-Drop-x11-dependencies.patch | 86 ++++++++++++++++++++++
 .../xorg-lib/libx11-locale_1.6.7.bb                | 32 ++++++++
 meta/recipes-graphics/xorg-lib/libx11.inc          |  8 +-
 .../xorg-lib/libxkbcommon_0.8.4.bb                 |  4 +
 5 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale/0001-Drop-x11-dependencies.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale_1.6.7.bb
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/2 libx11: split out libx11-locale

From: Ming Liu <[email protected]>

So far libx11-locale is also being required by some non-X11 recipes, like weston -> libxkbcommon -> libx11-locale. But the libx11-locale could not build without x11 distro feature enabled. This is not reasonable.

To fix it, we split out libx11-locale from libx11 to be a standalone recipe, and drop the X11 dependencies, this makes it to be able to build without x11 distro feature.

---
 .../recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb |  1 -
 .../libx11-locale/0001-Drop-x11-dependencies.patch | 86 ++++++++++++++++++++++
 .../xorg-lib/libx11-locale_1.6.7.bb                | 32 ++++++++
 meta/recipes-graphics/xorg-lib/libx11.inc          |  8 +-
 4 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale/0001-Drop-x11-dependencies.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale_1.6.7.bb
meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb +0 -1
index 9c773a0..5f99d40 100644
@@ -9,7 +9,6 @@ SRC_URI += "file://X18NCMSstubs.patch \
            "
 
 RPROVIDES_${PN}-dev = "libx11-dev"
-RPROVIDES_${PN}-locale = "libx11-locale"
 
 EXTRA_OECONF += "--disable-xlocale"
 
meta/recipes-graphics/xorg-lib/libx11-locale/0001-Drop-x11-dependencies.patch new file +86 -0

86 lines not on this page · raw message

meta/recipes-graphics/xorg-lib/libx11-locale_1.6.7.bb new file +32 -0
new file mode 100644
index 0000000..5bf1ca6
@@ -0,0 +1,32 @@
+SUMMARY = "Xlib: locale data files for libx11"
+DESCRIPTION = "This package provides the locale data files for libx11."
+
+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 = ""
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libx11.inc +7 -1
index ea2ebfb..8ad0523 100644
@@ -32,7 +32,13 @@ PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
 CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
 
 PACKAGES =+ "${PN}-xcb"
+PACKAGES_remove = "${PN}-locale"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
 FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+# locale data files would be provided by libx11-locale recipe
+do_install_append() {
+	rm -rf ${D}${datadir}/X11/locale
+	rm -rf ${D}${libdir}/X11/locale
+}
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 2/2 libxkbcommon: RDEPENDS on libx11-locale

In reply to [email protected]

From: Ming Liu <[email protected]>

This fixes a following runtime error:
| xkbcommon: ERROR: couldn't find a Compose file for locale "C"

---
 meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb +4 -0
index 8fcae12..4d31638 100644
@@ -7,6 +7,10 @@ LICENSE = "MIT & MIT-style"
 
 DEPENDS = "util-macros flex-native bison-native"
 
+# Fix a following runtime error:
+# xkbcommon: ERROR: couldn't find a Compose file for locale "C"
+RDEPENDS_${PN} = "libx11-locale"
+
 SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
 
 SRC_URI[md5sum] = "3c4409058dfd203f641a563358e0187d"
Signature · 1 line
2.7.4
#3 lore raw
In reply to [email protected]

I didn't make myself clear. To reduce the amount of moving parts and changes I propose:

1) libx11 and libx11-diet are untouched
2) New recipe libx11-compose-data which just ships the compose data, assuming that is all that is needed by xkeyboard-config's Compose handling. Refuses to build if x11 is in DISTRO_FEATURES
3) xkeyboard-config depends on either libx11 or libx11-compose-data, depending whether x11 is in DISTRO_FEATURES

Ross

Quoted 23 lines · On Sun, 5 May 2019 at 21:15, <[email protected]> wrote:

From: Ming Liu <[email protected]>

Changes in V2:
1 As suggested by Ross Burton, split out libx11-locale from libx11 as a standalone recipe.

Ming Liu (2):
libx11: split out libx11-locale
libxkbcommon: RDEPENDS on libx11-locale

 .../recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb |  1 -
 .../libx11-locale/0001-Drop-x11-dependencies.patch | 86 ++++++++++++++++++++++
 .../xorg-lib/libx11-locale_1.6.7.bb                | 32 ++++++++
 meta/recipes-graphics/xorg-lib/libx11.inc          |  8 +-
 .../xorg-lib/libxkbcommon_0.8.4.bb                 |  4 +
 5 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale/0001-Drop-x11-dependencies.patch
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-locale_1.6.7.bb

--
2.7.4

author
#4 lore raw

HI, Burton:

Thanks for the comments, will do a V3.

the best,
thank you

Burton, Ross <[email protected]> 於 2019年6月12日 週三 下午5:47寫道:

Quoted 40 lines

I didn't make myself clear. To reduce the amount of moving parts and changes I propose:

1) libx11 and libx11-diet are untouched
2) New recipe libx11-compose-data which just ships the compose data, assuming that is all that is needed by xkeyboard-config's Compose handling. Refuses to build if x11 is in DISTRO_FEATURES
3) xkeyboard-config depends on either libx11 or libx11-compose-data, depending whether x11 is in DISTRO_FEATURES

Ross

Quoted 7 lines · On Sun, 5 May 2019 at 21:15, <[email protected]> wrote:

From: Ming Liu <[email protected]>

Changes in V2:
1 As suggested by Ross Burton, split out libx11-locale from libx11 as a standalone recipe.

Quoted 6 lines

Ming Liu (2):
libx11: split out libx11-locale
libxkbcommon: RDEPENDS on libx11-locale

 .../recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb |  1 -
 .../libx11-locale/0001-Drop-x11-dependencies.patch | 86

++++++++++++++++++++++

Quoted 5 lines
 .../xorg-lib/libx11-locale_1.6.7.bb                | 32 ++++++++
 meta/recipes-graphics/xorg-lib/libx11.inc          |  8 +-
 .../xorg-lib/libxkbcommon_0.8.4.bb                 |  4 +
 5 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644

meta/recipes-graphics/xorg-lib/libx11-locale/0001-Drop-x11-dependencies.patch

Quoted 1 line
 create mode 100644 meta/recipes-graphics/xorg-lib/

libx11-locale_1.6.7.bb

Quoted 4 lines

--
2.7.4