diff options
3 files changed, 4 insertions, 84 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index b8ef0d75e5f..e7d520ebef6 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -6,14 +6,13 @@ 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 ncurses-native" +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf libxmu libptytty" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch \ file://rxvt.desktop \ - file://rxvt.png \ - file://0001-Makefile.in-set-outdir-for-TIC-explicitly.patch \ -" + file://rxvt.png" + inherit autotools pkgconfig update-alternatives PROVIDES = "virtual/x-terminal-emulator" @@ -56,4 +55,4 @@ do_install:append () { install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications } -FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png ${datadir}/terminfo" +FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch deleted file mode 100644 index 6c582d288e4..00000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-TIC-explicitly.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c88c94e629b6aad1609d13f355c52e5a3acc8d2a Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 14 Dec 2023 17:33:15 +0800 -Subject: [PATCH] Makefile.in: set outdir for TIC explicitly - -When doing cross-compile, native tic's TERMINFO usually -set as a native dir, which could not the target install dir, -which will cause rxvt-unicode terminfo will be wrongly installed. -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 <changqing.li@windriver.com> ---- - doc/Makefile.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/Makefile.in b/doc/Makefile.in -index e3d1fe8b..3477551a 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -69,7 +69,7 @@ all: - sed $(SEDREPLACE) <$< | podselect -section "RXVT-UNICODE\/URXVT FREQUENTLY ASKED QUESTIONS" | pod2text >$@ - - $(srcdir)/etc/rxvt-unicode.termcap: $(srcdir)/etc/rxvt-unicode.terminfo -- tic -C $< >$@ -+ @TIC@ -C $< >$@ - - tags allbin: - -@@ -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 -o $(DESTDIR)$(datadir)/terminfo - - distdepend: alldoc - --- -2.25.1 - diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-tic.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-tic.patch deleted file mode 100644 index 8fd782b5030..00000000000 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/0001-Makefile.in-set-outdir-for-tic.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1b7d547453fc57806ef86f64c86706530a23e62e Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -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 <changqing.li@windriver.com> ---- - 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 - |