[gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/

[Marek Szuba]

commit:     85a4c8a6fc848d8eb7135c04e3c69dff9ea93def
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 12:50:59 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 13:40:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a4c8a6

x11-terms/rxvt-unicode: drop 9.22-r9

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 x11-terms/rxvt-unicode/Manifest                    |   2 -
 .../rxvt-unicode-9.22-perl-segfault-on-exit.patch  |  36 -----
 ...rxvt-unicode-9.22-query-graphics-insecure.patch |  11 --
 .../rxvt-unicode-9.22-sgr-mouse-mode-flag.patch    | 165 ---------------------
 x11-terms/rxvt-unicode/metadata.xml                |   3 -
 x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild | 120 ---------------
 6 files changed, 337 deletions(-)

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 6f61f0985202..1cae105e7af0 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,4 +1,2 @@
-DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540
 DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0
 DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199

diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch
deleted file mode 100644
index 0a3cb1ec4cd5..000000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-perl-segfault-on-exit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Backported from the upstream CVS repository, see:
-http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.h?r1=1.28&r2=1.29
-http://cvs.schmorp.de/rxvt-unicode/src/rxvtperl.xs?r1=1.246&r2=1.247
-
---- rxvt-unicode/src/rxvtperl.h	2012/06/12 10:45:53	1.28
-+++ rxvt-unicode/src/rxvtperl.h	2020/06/30 07:31:24	1.29
-@@ -51,7 +51,9 @@
- {
-   char **perl_environ;
- 
-+  #if 0 // see rxvtperl.xs
-   ~rxvt_perl_interp ();
-+  #endif
- 
-   void init ();
-   void init (rxvt_term *term);
---- rxvt-unicode/src/rxvtperl.xs	2020/01/20 09:35:12	1.246
-+++ rxvt-unicode/src/rxvtperl.xs	2020/06/30 07:31:24	1.247
-@@ -372,6 +372,9 @@
- 
- static PerlInterpreter *perl;
- 
-+#if 0 /* we are not a library anymore, so doing this is just not worth it */
-+/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
-+/* but therse are not guaranteed anyway... */
- rxvt_perl_interp::~rxvt_perl_interp ()
- {
-   if (perl)
-@@ -381,6 +384,7 @@
-       PERL_SYS_TERM ();
-     }
- }
-+#endif
- 
- void
- rxvt_perl_interp::init ()

diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
deleted file mode 100644
index 52a8c8297050..000000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-query-graphics-insecure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/command.C
-+++ b/src/command.C
-@@ -2695,7 +2695,7 @@
-         /* kidnapped escape sequence: Should be 8.3.48 */
-       case C1_ESA:		/* ESC G */
-         // used by original rxvt for rob nations own graphics mode
--        if (cmd_getc () == 'Q')
-+        if (cmd_getc () == 'Q' && option (Opt_insecure))
-           tt_printf ("\033G0\012");	/* query graphics - no graphics */
-         break;
- 

diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch
deleted file mode 100644
index 3f6f5d90618e..000000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff --git a/config.h.in b/config.h.in
-index 914d606..b869bfb 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -9,6 +9,9 @@
- /* Define if you want handling for rarely used but handy features */
- #undef ENABLE_FRILLS
- 
-+/* Define if you want support for SGR mouse mode 1006 */
-+#undef ENABLE_SGRMOUSE
-+
- /* Define if you can embed a perl interpreter */
- #undef ENABLE_PERL
- 
-diff --git a/configure.ac b/configure.ac
-index 0da3b59..c8b9c80 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,7 @@ AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_SEARCH_LIBS(socket,        socket)
- 
- support_frills=yes
-+support_sgrmouse=yes
- support_inheritpixmap=yes
- support_fading=yes
- support_keepscrolling=yes
-@@ -109,6 +110,7 @@ AC_ARG_ENABLE(everything,
-   [
-     if test x$enableval = xno; then
-        support_frills=no
-+       support_sgrmouse=no
-        support_inheritpixmap=no
-        support_fading=no
-        support_keepscrolling=no
-@@ -137,6 +139,7 @@ AC_ARG_ENABLE(everything,
-     fi
-     if test x$enableval = xyes; then
-        support_frills=yes
-+       support_sgrmouse=yes
-        support_inheritpixmap=yes
-        support_fading=yes
-        support_keepscrolling=yes
-@@ -359,6 +362,12 @@ AC_ARG_ENABLE(frills,
-     support_frills=$enableval
-   fi])
- 
-+AC_ARG_ENABLE(sgrmouse,
-+  [  --enable-sgrmouse       enable support for SGR mouse mode 1006],
-+  [if test x$enableval = xyes -o x$enableval = xno; then
-+    support_sgrmouse=$enableval
-+  fi])
-+
- AC_ARG_ENABLE(keepscrolling,
-   [  --enable-keepscrolling  enable continual scrolling on scrollbar arrow press],
-   [if test x$enableval = xyes -o x$enableval = xno; then
-@@ -666,6 +675,9 @@ fi
- if test x$support_frills = xyes; then
-   AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
- fi
-+if test x$support_sgrmouse = xyes; then
-+  AC_DEFINE(ENABLE_SGRMOUSE, 1, Define if you want support for SGR mouse mode 1006)
-+fi
- if test x$support_mousewheel = xyes; then
-   AC_DEFINE(MOUSE_WHEEL, 1, Define to use wheel events (button4 and button5) to scroll)
- fi
-diff --git a/src/command.C b/src/command.C
-index 7b79f51..a62ef87 100644
---- a/src/command.C
-+++ b/src/command.C
-@@ -1282,6 +1282,13 @@ rxvt_term::mouse_report (XButtonEvent &ev)
-   int button_number, key_state = 0;
-   int x, y;
-   int code = 32;
-+  bool mode_sgr = false;
-+
-+#if ENABLE_SGRMOUSE
-+  if (priv_modes & PrivMode_ExtMouseSgr) mode_sgr = true;
-+#endif
-+
-+  if (mode_sgr) code = 0;
- 
-   x = Pixel2Col (ev.x) + 1;
-   y = Pixel2Row (ev.y) + 1;
-@@ -1296,11 +1303,18 @@ rxvt_term::mouse_report (XButtonEvent &ev)
-       code += 32;
-     }
- 
--  if (MEvent.button == AnyButton)
-+  if (!(mode_sgr) && MEvent.button == AnyButton)
-     button_number = 3;
-   else
-     {
--      button_number = MEvent.button - Button1;
-+      if (ev.type == MotionNotify) {
-+        if (ev.state & Button1Mask) button_number = 0;
-+        else if (ev.state & Button2Mask) button_number = 1;
-+        else if (ev.state & Button3Mask) button_number = 2;
-+        else return;
-+      } else {
-+        button_number = ev.button - Button1;
-+      }
-       /* add 0x3D for wheel events, like xterm does */
-       if (button_number >= 3)
-         button_number += 64 - 3;
-@@ -1361,6 +1375,15 @@ rxvt_term::mouse_report (XButtonEvent &ev)
-               wint_t (32 + x),
-               wint_t (32 + y));
-   else
-+#endif
-+#if ENABLE_SGRMOUSE
-+  if (mode_sgr)
-+    tt_printf ("\033[<%d;%d;%d%c",
-+              code + button_number + key_state,
-+              x,
-+              y,
-+              (ev.type == ButtonRelease ? 'm' : 'M'));
-+  else
- #endif
-     tt_printf ("\033[M%c%c%c",
-               code + button_number + key_state,
-@@ -2904,7 +2927,7 @@ rxvt_term::process_csi_seq ()
-                 scr_soft_reset ();
- 
-                 static const int pm_h[] = { 7, 25 };
--                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
-+                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1002, 1003, 1005, 1006, 1015, 1049 };
- 
-                 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
-                 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
-@@ -3710,6 +3733,9 @@ rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int na
-                   { 1003, PrivMode_MouseAnyEvent },
- #if ENABLE_FRILLS
-                   { 1005, PrivMode_ExtModeMouse },
-+#endif
-+#if ENABLE_SGRMOUSE
-+                  { 1006, PrivMode_ExtMouseSgr },
- #endif
-                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
-                   { 1011, PrivMode_Keypress }, // rxvt extension
-diff --git a/src/rxvt.h b/src/rxvt.h
-index 5c7cf66..2ffd3fb 100644
---- a/src/rxvt.h
-+++ b/src/rxvt.h
-@@ -645,6 +645,7 @@ enum {
- #define PrivMode_ExtModeMouse   (1UL<<23) // xterm pseudo-utf-8 hack
- #define PrivMode_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
- #define PrivMode_BlinkingCursor (1UL<<25)
-+#define PrivMode_ExtMouseSgr    (1UL<<27) // sgr mouse extension
- 
- #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
- 
-diff --git a/src/xdefaults.C b/src/xdefaults.C
-index 894aa8d..e5952b7 100644
---- a/src/xdefaults.C
-+++ b/src/xdefaults.C
-@@ -359,6 +359,9 @@ static const char optionsstring[] = "options: "
- #if defined(ENABLE_FRILLS)
-                                     "frills,"
- #endif
-+#if defined(ENABLE_SGRMOUSE)
-+                                    "sgrmouse,"
-+#endif
- #if defined(SELECTION_SCROLLING)
-                                     "selectionscrolling,"
- #endif

diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 6cd6906d211f..fea19d5c6016 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -21,9 +21,6 @@
 <flag name="iso14755">Enable ISO-14755 support</flag>
 <flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
 <flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
-<flag name="sgrmouse">Enable unofficial support for the xterm SGR 1006 mouse-tracking extension.
-	Needed to properly support mouse events for terminals with more than 223
-	rows or columns, in applications not supporting the urxvt 1015 extension.</flag>
 <flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
 <flag name="utmp">Enable utmp support</flag>
 <flag name="wtmp">Enable wtmp support</flag>

diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
deleted file mode 100644
index 2e9acbe9987a..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic systemd prefix
-
-COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
-	https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl sgrmouse startup-notification unicode3 +utmp +wtmp xft"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r6:=
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf )
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	perl? ( dev-lang/perl:= )
-	startup-notification? ( x11-libs/startup-notification )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-	"${FILESDIR}"/${PN}-9.22-perl-segfault-on-exit.patch
-	"${FILESDIR}"/${PN}-9.22-query-graphics-insecure.patch
-	"${FILESDIR}"/${PN}-9.22-sgr-mouse-mode-flag.patch
-	"${WORKDIR}"/${COLOUR_PATCH_NAME}
-)
-DOCS=(
-	Changes
-	README.FAQ
-	doc/README.xvt
-	doc/changes.txt
-	doc/etc/${PN}.term{cap,info}
-	doc/rxvt-tabbed
-)
-
-src_prepare() {
-	# Bug #787104
-	append-cxxflags -std=c++14
-
-	default
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	# use xsubpp from Prefix - #506500
-	hprefixify -q '"' -w "/xsubpp/" src/Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-everything goes first: the order of the arguments matters
-	econf --enable-everything \
-		$(use_enable 24-bit-color) \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable gdk-pixbuf pixbuf) \
-		$(use_enable iso14755) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable sgrmouse) \
-		$(use_enable startup-notification) \
-		$(use_enable unicode3) \
-		$(use_enable utmp) \
-		$(use_enable wtmp) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	default
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die
-}
-
-src_install() {
-	default
-
-	systemd_douserunit "${FILESDIR}"/urxvtd.service
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use 24-bit-color; then
-		ewarn
-		ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE."
-		ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
-		ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)."
-		ewarn
-	fi
-
-	if use sgrmouse; then
-		ewarn
-		ewarn "Support for the SGR 1006 mouse extension in ${PN} is UNOFFICIAL and provided as-is."
-		ewarn "When in doubt, rebuild =${CATEGORY}/${PF} with USE=-sgrmouse (the default setting)."
-		ewarn
-	fi
-}