From 370b5a1ed003a44645b06b884f9a627d08a1e002 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 23 Jun 2020 23:54:58 +0200 Subject: [PATCH] mrxvt: dropped from system-tools --- .../system-tools-depends/mrxvt/package.mk | 50 ------------------- .../mrxvt/patches/mrxvt-01_xterm.patch | 11 ---- .../addons/tools/system-tools/changelog.txt | 1 + packages/addons/tools/system-tools/package.mk | 7 +-- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk delete mode 100644 packages/addons/addon-depends/system-tools-depends/mrxvt/patches/mrxvt-01_xterm.patch diff --git a/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk b/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk deleted file mode 100644 index 23f6ea06a2..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="mrxvt" -PKG_VERSION="0.5.4" -PKG_SHA256="f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://materm.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libX11" -PKG_LONGDESC="A lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm." -PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="-sysroot" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \ - --enable-minimal \ - --disable-frills \ - --enable-keepscrolling \ - --disable-selectionscrolling \ - --enable-mousewheel \ - --disable-mouseslipwheel \ - --enable-rxvt-scroll \ - --disable-half-shadow \ - --enable-lastlog \ - --enable-sessionmgr \ - --enable-linespace \ - --enable-24bits \ - --enable-256colors \ - --enable-cursor-blink \ - --enable-pointer-blank \ - --disable-text-shadow \ - --disable-menubar \ - --disable-transparency \ - --disable-tinting \ - --disable-xrender \ - --disable-xpm \ - --disable-jpeg \ - --disable-png \ - --disable-xft \ - --enable-ttygid \ - --enable-backspace-key \ - --enable-delete-key \ - --disable-resources \ - --disable-swapscreen \ - --disable-use-fifo \ - --disable-greek \ - --disable-xim \ - --disable-utempter\ - --with-term=xterm" diff --git a/packages/addons/addon-depends/system-tools-depends/mrxvt/patches/mrxvt-01_xterm.patch b/packages/addons/addon-depends/system-tools-depends/mrxvt/patches/mrxvt-01_xterm.patch deleted file mode 100644 index 3418f7c703..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/mrxvt/patches/mrxvt-01_xterm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mrxvt-0.5.4/src/rxvt.h.org 2008-08-04 09:41:35.000000000 +0200 -+++ mrxvt-0.5.4/src/rxvt.h 2016-05-24 19:23:28.000000000 +0200 -@@ -631,7 +631,7 @@ - #define APL_NAME "mrxvt" /* normal name */ - - /* COLORTERM, TERM environment variables */ --#define COLORTERMENV "rxvt" -+#define COLORTERMENV "xterm" - #ifdef BACKGROUND_IMAGE - # define COLORTERMENVFULL COLORTERMENV "-xpm" - #else diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index 061516d2c3..2fddc7e8c1 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -11,6 +11,7 @@ - updated strace to 5.7 - updated stress-ng to 0.11.14 - updated unrar to 5.9.3 +- dropped mrxvt 113 - update strace to 5.4 diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index d4b4351cb8..ce80feba5a 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -11,7 +11,7 @@ PKG_URL="" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="virtual" PKG_SHORTDESC="A bundle of system tools and programs" -PKG_LONGDESC="This bundle currently includes autossh, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mrxvt, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch, vim and ytop." +PKG_LONGDESC="This bundle currently includes autossh, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch, vim and ytop." PKG_IS_ADDON="yes" PKG_ADDON_NAME="System Tools" @@ -52,7 +52,7 @@ PKG_DEPENDS_TARGET="toolchain \ ytop" if [ "$TARGET_ARCH" = "x86_64" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr mrxvt" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr" fi addon() { @@ -123,9 +123,6 @@ addon() { cp -Pa $(get_install_dir mc)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/ cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID - # mrxvt - cp -P $(get_install_dir mrxvt)/usr/bin/mrxvt $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || : - # mtpfs cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs $ADDON_BUILD/$PKG_ADDON_ID/bin/