瀏覽代碼

xstroke: fix dependencies

xstroke doesn't need docker, but it does need libXft/Xtst/Xpm.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 年之前
父節點
當前提交
40f8f3ff1d
共有 3 個文件被更改,包括 5 次插入10 次删除
  1. 1 1
      CHANGES
  2. 3 5
      package/xstroke/Config.in
  3. 1 4
      package/xstroke/xstroke.mk

+ 1 - 1
CHANGES

@@ -2,7 +2,7 @@
 
 	Fixes all over the tree.
 
-	Updated/fixed packages: atk
+	Updated/fixed packages: atk, xstroke
 
 2010.08-rc2, Released August 30th, 2010:
 

+ 3 - 5
package/xstroke/Config.in

@@ -1,12 +1,10 @@
 config BR2_PACKAGE_XSTROKE
 	bool "xstroke"
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_USE_WCHAR # glib2
-	select BR2_PACKAGE_DOCKER
+	select BR2_PACKAGE_XLIB_LIBXFT
+	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXPM
 	help
 	  Handwriting recognition for X
 
 	  http://avr32linux.org/twiki/pub/Main/XStroke
-
-comment "xstroke requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR

+ 1 - 4
package/xstroke/xstroke.mk

@@ -6,12 +6,9 @@
 XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
 XSTROKE_SITE = http://avr32linux.org/twiki/pub/Main/XStroke
-XSTROKE_AUTORECONF = NO
-XSTROKE_INSTALL_STAGING = NO
-XSTROKE_INSTALL_TARGET = YES
 XSTROKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-XSTROKE_DEPENDENCIES = xserver_xorg-server
+XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
 
 $(eval $(call AUTOTARGETS,package,xstroke))