Skip to contentSkip to conversation

xkeyboard-config: needs libX11 and xproto_xproto

PATCH New Gustavo Zacarias 2 participants 3 messages Mar 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xkeyboard-config: needs libX11 and xproto_xproto

Fixes a build failure i've found while debugging another one :)

---
 package/x11r7/xkeyboard-config/Config.in           | 2 ++
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
package/x11r7/xkeyboard-config/Config.in +2 -0
index 8e27dac..640bb1d 100644
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_XKEYBOARD_CONFIG
 	bool "xkeyboard-config"
 	select BR2_PACKAGE_XAPP_XKBCOMP
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  keyboard configuration database for X
 
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1 -1
index bd3314c..0e63a45 100644
@@ -6,7 +6,7 @@
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
+XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
 XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
 
 $(eval $(autotools-package))
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/2 xkeyboard-config: add missing dependency on host-gettext and sanitize

xkeyboard-config needs msgfmt so we need to pull host-gettext into the dependencies.
And remove GMSGFMT path hardcoding otherwise host-gettext msgfmt won't work. Fixes:
http://autobuild.buildroot.net/results/ec956056aba54ab7993cf58a74a93a3b900dee95/

---
 package/x11r7/xkeyboard-config/xkeyboard-config.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1 -2
index 0e63a45..78ed1ee 100644
@@ -6,8 +6,7 @@
 XKEYBOARD_CONFIG_VERSION = 2.6
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
-XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
-XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
+XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp xlib_libX11 xproto_xproto
 
 $(eval $(autotools-package))
 
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 1/2 xkeyboard-config: needs libX11 and xproto_xproto

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Fixes a build failure i've found while debugging another one :) Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed both, thanks.

Signature · 1 line
Bye, Peter Korsgaard