From b9642f83e1ab0a040d8c2e80da8ffe7f7274f8c5 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 24 Oct 2023 07:52:13 +0800 Subject: xterm: upgrade 384 -> 387 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 16387ed732308b269f3a4f25a68214371d04db7d) Signed-off-by: Armin Kuster --- meta-oe/recipes-graphics/xorg-app/xterm_384.bb | 50 -------------------------- meta-oe/recipes-graphics/xorg-app/xterm_387.bb | 50 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xorg-app/xterm_384.bb create mode 100644 meta-oe/recipes-graphics/xorg-app/xterm_387.bb diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_384.bb b/meta-oe/recipes-graphics/xorg-app/xterm_384.bb deleted file mode 100644 index ae046b18c2..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm_384.bb +++ /dev/null @@ -1,50 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" - -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[sha256sum] = "31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -# Let xterm install .desktop files -inherit mime-xdg - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -do_install:append() { - oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" -} - -RPROVIDES:${PN} = "virtual-x-terminal-emulator" - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE:${PN} = "resize x-terminal-emulator" -ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" -# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. -ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_387.bb b/meta-oe/recipes-graphics/xorg-app/xterm_387.bb new file mode 100644 index 0000000000..09bb2976a6 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm_387.bb @@ -0,0 +1,50 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "xterm is the standard terminal emulator for the X Window System" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" + +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[sha256sum] = "81dd59cc2ecef1e849ed21722e37a24756e02b54ec19d157cb545b273813f4b8" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install:append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES:${PN} = "virtual-x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE:${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" -- cgit v1.2.3-54-g00ecf