rxvt-unicode: set correct outdir for tic
PATCH v3 1/1 rxvt-unicode: set correct outdir for tic
From: Changqing Li <[email protected]>
* tic is from ncurses-native, and set TERMINFO as ${RECIPE_SYSROOT_NATIVE}/${datadir}/terminfo of ncurses-native, so the rxvt-unicode terminfo will be wrongly installed in there. set the outdir explicitly to install them to correct dir.
* Add ncurses-native as DEPENDS to fix reproducible build issue
Signed-off-by Changqing Li <[email protected]>
--- .../rxvt-unicode/rxvt-unicode.inc | 9 ++-- ...ile.in-set-outdir-for-TIC-explicitly.patch | 44 +++++++++++++++++++ .../0001-Makefile.in-set-outdir-for-tic.patch | 35 +++++++++++++++ 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch create mode 100644 meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-tic.patch
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +5 -4
@@ -6,13 +6,14 @@ 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 \ file://rxvt.desktop \ - file://rxvt.png" - + file://rxvt.png \ + file://0001-Makefile.in-set-outdir-for-TIC-explicitly.patch \ +" inherit autotools pkgconfig update-alternatives PROVIDES = "virtual/x-terminal-emulator"
@@ -55,4 +56,4 @@ do_install:append () { install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications } -FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo"
meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-tic.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 1b7d547453fc57806ef86f64c86706530a23e62e Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Wed, 13 Dec 2023 11:53:18 +0800 +Subject: [PATCH] Makefile.in: set outdir for tic + +tic is from ncurses-native, and set TERMINFO as +${RECIPE_SYSROOT_NATIVE}/${datadir}/terminfo of ncurses-native, so the +rxvt-unicode terminfo will be wrongly installed in there. set the +outdir explicitly to install them to correct dir. + +Upstream-Status: Submitted [ https://github.com/exg/rxvt-unicode/pull/4 ] + +Signed-off-by: Changqing Li <[email protected]> +--- + doc/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/Makefile.in b/doc/Makefile.in +index e3d1fe8..1de56d3 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -100,8 +100,8 @@ install: all + $(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext) + $(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext) + $(INSTALL_DATA) rclock.1.man $(DESTDIR)$(man1dir)/urclock.$(man1ext) +- @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo || \ +- @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo ++ @TIC@ -x $(srcdir)/etc/rxvt-unicode.terminfo -o $(DESTDIR)$(datadir)/terminfo || \ ++ @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo -o $(DESTDIR)$(datadir)/terminfo + + distdepend: alldoc + +-- +2.25.1 +
Signature · 1 line
2.25.1