Переглянути джерело

add missing xorg dependency, fix ncurses package

Waldemar Brodkorb 15 роки тому
батько
коміт
c88280cd52
2 змінених файлів з 4 додано та 2 видалено
  1. 3 1
      package/ncurses/Makefile
  2. 1 1
      package/xorg-server/Makefile

+ 3 - 1
package/ncurses/Makefile

@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--with-build-cc=${HOSTCC} \
 			--without-progs \
 			--with-fallbacks \
+			--disable-termcap \
 			--without-ada \
 			--with-shared \
 			--with-normal \
@@ -69,8 +70,9 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
 	for f in ansi dumb linux rxvt screen vt100 vt102 \
 	    vt220 wsvt25 xterm xterm-color xterm-xfree86; do \
+		${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
 		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
-		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \
+		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
 	done
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include

+ 1 - 1
package/xorg-server/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile libfontenc
+PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp
 PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		${MASTER_SITE_XORG}