Skip to contentSkip to conversation

rxvt-unicode: Fix installing of terminfo

PATCH In review [email protected] 2 participants 2 messages Mar 7, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v7 1/1 rxvt-unicode: Fix installing of terminfo

From: Changqing Li <[email protected]>

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

---
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +5 -2
index e7d520ebef..016614b19c 100644
@@ -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"
Signature · 1 line
2.25.1
#1 lore raw

Thanks, this is fine.

Alex

Quoted 50 lines · Changqing Li

From: Changqing Li <[email protected]>

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

---
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +5 -3
index e7d520ebef..016614b19c 100644
@@ -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"
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196772): https://lists.openembedded.org/g/openembedded-core/message/196772
Mute This Topic: https://lists.openembedded.org/mt/104782953/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-