Skip to contentSkip to conversation

matchbox-keyboard: Fix dependencies

PATCH New Bernd Kuhls 4 participants 6 messages May 20, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

Always depend on xlib_libXft, pango is not used by the package

Fixes
http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
and 17 other build errors, dating back to 2013-07-03

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/matchbox/Config.in                              |    3 ++-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk |   12 +-----------
 2 files changed, 3 insertions(+), 12 deletions(-)
package/matchbox/Config.in +2 -1
index 67c9716..e1f6db9 100644
@@ -35,7 +35,8 @@ config BR2_PACKAGE_MATCHBOX_COMMON_PDA
 
 config BR2_PACKAGE_MATCHBOX_KEYBOARD
 	bool "Matchbox Virtual Keyboard"
-	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXTST # matchbox-fakekey
+	select BR2_PACKAGE_XLIB_LIBXFT
 	help
 	  Virtual Keyboard
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +1 -11
index ff85370..d8109ad 100644
@@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz
 MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
 MATCHBOX_KEYBOARD_LICENSE = GPLv2+
 MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
-MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
+MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey xlib_libXft
 
 # Workaround bug in configure script
 MATCHBOX_KEYBOARD_CONF_ENV = expat=yes

@@ -20,14 +20,4 @@ endef
 
 MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
 
-################################################################################
-
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif
-
-################################################################################
-
 $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Always depend on xlib_libXft, pango is not used by the package Fixes
http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
and 17 other build errors, dating back to 2013-07-03

Signed-off-by Bernd Kuhls <[email protected]>

+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +1 -1
@@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz
 MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
 MATCHBOX_KEYBOARD_LICENSE = GPLv2+
 MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
-MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
+MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey xlib_libXft
 
 # Workaround bug in configure script
 MATCHBOX_KEYBOARD_CONF_ENV = expat=yes

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk endef · line 29

Quoted 10 lines
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +0 -7
@@ -20,14 +20,4 @@ endef
 
 MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
 
-################################################################################
-
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif

No?

./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no

grep -A3 'enable_cairo =' configure.ac
if test x$enable_cairo = xyes; then
PKG_CHECK_MODULES(CAIRO, cairo,, [enable_cairo="no"])
fi

if test x$enable_cairo = xno; then
PKG_CHECK_MODULES(XFT, xft,,
AC_MSG_ERROR([*** Required xft Librarys not found ***]))
fi

From that the previous logic seems correct?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

Peter Korsgaard <[email protected]> wrote in
news:87sio4gpso.fsf at dell.be.48ers.dk:

Quoted 10 lines

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk endef · line 29

Quoted 5 lines
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +0 -5
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif

No?

./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no

Hi,

I fail to see the connection between pango and cairo regarding the matchbox- keyboard package.

The defconfig used by autobuilder enables BR2_PACKAGE_PANGO, but the phrase "pango" is used nowhere in the matchbox-keyboard-0.1 sourcecode.

Support for cairo is disabled by default in matchbox-keyboard- 0.1/configure.ac, and not present in package/matchbox/* either, so the matchbox-keyboard package will always check for xlib_libXft and fail if it?s absent. This is fixed by my patch.

Regards, Bernd

#3 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Peter Korsgaard <[email protected]> wrote in
news:87sio4gpso.fsf at dell.be.48ers.dk:

Quoted 8 lines

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk endef · line 29

Quoted 5 lines
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +0 -5
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif

No?

Quoted 7 lines
Quoted 2 lines

./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no

Hi,

I fail to see the connection between pango and cairo regarding the matchbox- keyboard package.

Yes, sorry about that - I got confused about cairo vs pango, and the original package author apparently did as well (as the above should have been cairo, not pango).

I also see that there's a typo in the _CONF_OPT variable.

I'll fix it up here. I'm just doing a test build with/without cairo to ensure everything is correct.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

In reply to Peter Korsgaard

Dear Peter Korsgaard,

Quoted 10 lines · Peter Korsgaard

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk endef · line 29

Quoted 7 lines
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +0 -7
-################################################################################
-
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif

No?

Quoted 2 lines

./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no

Hum cairo != pango ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 1/1 matchbox-keyboard: Fix dependencies

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Dear Peter Korsgaard,

Quoted 10 lines · Peter Korsgaard

package/matchbox/matchbox-keyboard/matchbox-keyboard.mk endef · line 29

Quoted 7 lines
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +0 -7
-################################################################################
-
-ifeq ($(BR2_PACKAGE_PANGO),y)
-  MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
-  MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif

No?

Quoted 4 lines
Quoted 2 lines

./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no

Hum cairo != pango ?

Ehh, true. I guess I need to go to bed.

With that said, I think the fix is simply to s/pango/cairo/.

Signature · 1 line
Bye, Peter Korsgaard