From: Changqing Li Date: Thu, 7 Mar 2024 06:50:34 +0000 (-0800) Subject: rxvt-unicode: Fix installing of terminfo X-Git-Tag: 2024-04-scarthgap~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daff3b4bf9d7b77a8170d9bc6f0b9c81b0a077d7;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git rxvt-unicode: Fix installing of terminfo For cross compile, TIC will be native tic in recipe-sysroot-native, and the terminfo path will be native path, the rxvt-unicode terminfo will be wrongly installed to native path. install terminfo to correct path in do_install Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index e7d520ebef6..016614b19c7 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -6,7 +6,7 @@ terminal emulator rxvt, modified to store text in Unicode \ output. It also supports mixing multiple fonts at the \ same time, including Xft fonts." HOMEPAGE = "https://rxvt.org/" -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty" +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty ncurses-native" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch \ @@ -53,6 +53,9 @@ do_install:append () { install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications + + ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ + ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo } -FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo"