* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2017-03-29 3:17 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2017-03-29 3:17 UTC (permalink / raw
To: gentoo-commits
commit: c9aee86fef439a3ead40700ff2fb120d19b44bc6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 03:05:16 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 03:17:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9aee86f
x11-terms/rxvt-unicode: Drop USE=vanilla (bug #613724 by Alex Efros).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../rxvt-unicode-9.06-case-insensitive-fs.patch | 4 +-
x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild | 83 ++++++++++++++++++++++
2 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch
index 49fa01adc34..916e24aab38 100644
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-case-insensitive-fs.patch
@@ -1,7 +1,7 @@
Avoid "make: `install' is up to date." on case insensitive filesystems
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -86,3 +86,5 @@
dist: tar.bz2
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
new file mode 100644
index 00000000000..e7b929cafa0
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+ 256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
+ pixbuf startup-notification unicode3 xft
+"
+RESTRICT="test"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.7-r6:=
+ kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+ media-libs/fontconfig
+ perl? ( dev-lang/perl:= )
+ pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+ startup-notification? ( x11-libs/startup-notification )
+ x11-libs/libX11
+ x11-libs/libXrender
+ xft? ( x11-libs/libXft )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+ "${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+
+src_prepare() {
+ default
+
+ # kill the rxvt-unicode terminfo file - #192083
+ sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ # --enable-everything goes first: the order of the arguments matters
+ econf \
+ --enable-everything \
+ $(use_enable 256-color) \
+ $(use_enable blink text-blink) \
+ $(use_enable fading-colors fading) \
+ $(use_enable font-styles) \
+ $(use_enable iso14755) \
+ $(use_enable mousewheel) \
+ $(use_enable perl) \
+ $(use_enable pixbuf) \
+ $(use_enable startup-notification) \
+ $(use_enable unicode3) \
+ $(use_enable xft)
+}
+
+src_compile() {
+ default
+
+ sed -i \
+ -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+ "${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+ default
+
+ dodoc \
+ README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
+
+ make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+ "System;TerminalEmulator"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2019-05-15 10:25 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2019-05-15 10:25 UTC (permalink / raw
To: gentoo-commits
commit: d73547f2e413e6f8483ea57052c5ee22100935e6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 10:24:08 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May 15 10:25:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73547f2
x11-terms/rxvt-unicode: Old
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-terms/rxvt-unicode/Manifest | 1 -
.../files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch | 33 -----
.../files/rxvt-unicode-9.06-font-width.patch | 21 ----
.../rxvt-unicode-9.06-no-urgency-if-focused.diff | 15 ---
| 13 --
.../files/rxvt-unicode-9.14-clear.patch | 25 ----
.../files/rxvt-unicode-9.19-secondary-wheel.patch | 123 -------------------
x11-terms/rxvt-unicode/metadata.xml | 7 +-
x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild | 133 ---------------------
9 files changed, 1 insertion(+), 370 deletions(-)
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 9fba0aac164..2ef5babc160 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,2 +1 @@
-DIST rxvt-unicode-9.21.tar.bz2 925293 BLAKE2B 3da715f5f7726e6dfd5199b7fbc30efa506b7249afcf54afdab6617b78a2e133b19f203a9b26f8f25b952c8813051be8c51d235605425790c3f56c4a645e9c45 SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776
DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
deleted file mode 100644
index 0e8d256f921..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-While setting MWM_HINTS_DECORATIONS to disable window decorations
-seems to work with most window managers, using _MOTIF_WM_INFO seems
-not to, and in some cases can lead to severe problems with focus
-management. Therefore this patch here disables the _MOTIF_WM_INFO
-check and always attempts to have the window manager honour the
-decorations hint.
-
-If your window manager does not honour MWM_HINTS_DECORATIONS, and you
-are determined that you want to have borderless windows nevertheless,
-you are still free to enable override-redirect manually, using the
-corresponding command line option or X resource.
-
-See also: http://bugs.gentoo.org/show_bug.cgi?id=237271
-2008-09-10 Martin von Gagern
-
---- a/src/init.C 15 Jul 2008 16:41:22 -0000 1.253
-+++ b/src/init.C 10 Sep 2008 08:07:09 -0000
-@@ -1078,15 +1078,7 @@
- #if ENABLE_FRILLS
- if (option (Opt_borderLess))
- {
-- if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
-- {
-- // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
-- attributes.override_redirect = true;
-- }
-- else
-- {
- mwmhints.flags = MWM_HINTS_DECORATIONS;
-- }
- }
- #endif
-
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
deleted file mode 100644
index 2c803335d64..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/rxvtfont.C 2008-07-09 12:21:45.000000000 +0400
-+++ b/src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300
-@@ -1195,12 +1195,14 @@
- XGlyphInfo g;
- XftTextExtents16 (disp, f, &ch, 1, &g);
-
-- g.width -= g.x;
--
-+/*
-+ * bukind: don't use g.width as a width of a character!
-+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
-+ */
- int wcw = WCWIDTH (ch);
-- if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
-+ if (wcw > 1) g.xOff = g.xOff / wcw;
-+ if (width < g.xOff) width = g.xOff;
-
-- if (width < g.width ) width = g.width;
- if (height < g.height ) height = g.height;
- if (glheight < g.height - g.y) glheight = g.height - g.y;
- }
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
deleted file mode 100644
index 3408d73731c..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/screen.C
-+++ b/src/screen.C
-@@ -1927,11 +1927,11 @@
- # endif
- XMapWindow (dpy, parent[0]);
- # endif
-
- # if ENABLE_FRILLS
-- if (option (Opt_urgentOnBell))
-+ if (option (Opt_urgentOnBell) && !focus)
- set_urgency (1);
- # endif
-
- if (option (Opt_visualBell))
- {
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
deleted file mode 100644
index cad5a793d37..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/rxvtperl.xs 30 May 2009 08:51:23 -0000 1.127
-+++ b/src/rxvtperl.xs 30 Jul 2009 22:19:33 -0000
-@@ -929,7 +929,9 @@
- rxvt_term::grab (Time eventtime, int sync = 0)
- CODE:
- {
-- int mode = sync ? GrabModeSync : GrabModeAsync;
-+ // TA: 20090730: Always assume Async mode here -- recent Xorg
-+ // Servers don't appreciate being put in Sync mode.
-+ int mode = GrabModeAsync;
-
- THIS->perl.grabtime = 0;
-
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch
deleted file mode 100644
index 050907cea43..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-store visible lines to buffer before clearing the screen when pressing ctrl-l
-
-patch by rlblaster
-https://bbs.archlinux.org/viewtopic.php?id=129302
-
---- a/src/command.C
-+++ b/src/command.C
-@@ -2932,6 +2932,17 @@
-
- case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
- case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
-+ if (nargs == 1 && current_screen == 0)
-+ {
-+ // This is usually followed with clear screen so add some extra
-+ // lines to avoid deleting the lines already on screen. If we are
-+ // already at the top, add an extra screen height of lines.
-+ int extra_lines = nrow-1;
-+ if (screen.cur.row == 0)
-+ extra_lines += nrow;
-+ for (int i = 0; i < extra_lines; ++i)
-+ scr_add_lines (L"\r\n", 2);
-+ }
- scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
- break;
-
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
deleted file mode 100644
index 3a4d4a40981..00000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-secondary wheel support:
-when using the mouse wheel, if you’re on secondary screen then no scrolling
-will occur, and instead some (3, to be exact) “fake” keystrokes will be sent to
-the running application.
-
-patch by jacky
-i.am.jack.mail@gmail.com
-http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
-
-diff -r d5f9ea7306c4 -r cca1997c1a85 doc/rxvt.1.pod
---- a/doc/rxvt.1.pod Wed Dec 21 22:59:04 2011 +0100
-+++ b/doc/rxvt.1.pod Wed Dec 21 23:01:28 2011 +0100
-@@ -455,6 +455,11 @@
- Turn on/off secondary screen scroll (default enabled); resource
- B<secondaryScroll>.
-
-+=item B<-ssw>|B<+ssw>
-+
-+Turn on/off secondary screen wheel support (default disabled); resource
-+B<secondaryWheel>.
-+
- =item B<-hold>|B<+hold>
-
- Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
-@@ -1167,6 +1172,13 @@
- scrollback buffer and, when secondaryScreen is off, switching
- to/from the secondary screen will instead scroll the screen up.
-
-+=item B<secondaryWheel:> I<boolean>
-+
-+Turn on/off secondary wheel (default disabled). If enabled, when on
-+secondary screen, using the mouse wheel will not scroll in the buffer
-+but instead send 3 "fake" keystrokes (Up/Down arrow) to the running
-+application (allows e.g. natural scrolling in B<man>, B<less>, etc).
-+
- =item B<hold>: I<boolean>
-
- Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
-diff -r d5f9ea7306c4 -r cca1997c1a85 src/command.C
---- a/src/command.C Wed Dec 21 22:59:04 2011 +0100
-+++ b/src/command.C Wed Dec 21 23:01:28 2011 +0100
-@@ -2197,10 +2197,46 @@
- }
- else
- # endif
-+#ifndef NO_SECONDARY_SCREEN
- {
-- scr_page (dirn, lines);
-- scrollBar.show (1);
-+ /* on SECONDARY screen, we send "fake" UP/DOWN keys instead
-+ * (this allows to scroll within man, less, etc) */
-+ if (option (Opt_secondaryWheel) && current_screen != PRIMARY)
-+ {
-+ XKeyEvent event;
-+ event.display = ev.display;
-+ event.window = ev.window;
-+ event.root = ev.root;
-+ event.subwindow = ev.subwindow;
-+ event.time = ev.time;
-+ event.x = ev.x;
-+ event.y = ev.y;
-+ event.x_root = ev.x_root;
-+ event.y_root = ev.y_root;
-+ event.same_screen = ev.same_screen;
-+ event.state = 0;
-+ event.keycode = XKeysymToKeycode(ev.display,
-+ (dirn == UP) ? XK_Up : XK_Down);
-+ for (lines = 0; lines < 3; ++lines)
-+ {
-+ event.type = KeyPress;
-+ XSendEvent (event.display, event.window, True,
-+ KeyPressMask, (XEvent *) &event);
-+ event.type = KeyRelease;
-+ XSendEvent (event.display, event.window, True,
-+ KeyPressMask, (XEvent *) &event);
-+ }
-+ }
-+ /* on PRIMARY screen, we scroll in the buffer */
-+ else
-+#endif
-+ {
-+ scr_page (dirn, lines);
-+ scrollBar.show (1);
-+ }
-+#ifndef NO_SECONDARY_SCREEN
- }
-+#endif
- }
- break;
- #endif
-diff -r d5f9ea7306c4 -r cca1997c1a85 src/optinc.h
---- a/src/optinc.h Wed Dec 21 22:59:04 2011 +0100
-+++ b/src/optinc.h Wed Dec 21 23:01:28 2011 +0100
-@@ -26,6 +26,7 @@
- def(cursorBlink)
- def(secondaryScreen)
- def(secondaryScroll)
-+ def(secondaryWheel)
- def(pastableTabs)
- def(cursorUnderline)
- #if ENABLE_FRILLS
-diff -r d5f9ea7306c4 -r cca1997c1a85 src/rsinc.h
---- a/src/rsinc.h Wed Dec 21 22:59:04 2011 +0100
-+++ b/src/rsinc.h Wed Dec 21 23:01:28 2011 +0100
-@@ -102,6 +102,7 @@
- #ifndef NO_SECONDARY_SCREEN
- def (secondaryScreen)
- def (secondaryScroll)
-+ def (secondaryWheel)
- #endif
- #ifdef OFF_FOCUS_FADING
- def (fade)
-diff -r d5f9ea7306c4 -r cca1997c1a85 src/xdefaults.C
---- a/src/xdefaults.C Wed Dec 21 22:59:04 2011 +0100
-+++ b/src/xdefaults.C Wed Dec 21 23:01:28 2011 +0100
-@@ -261,6 +261,7 @@
- #ifndef NO_SECONDARY_SCREEN
- BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
- BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
-+ BOOL (Rs_secondaryWheel, "secondaryWheel", "ssw", Opt_secondaryWheel, 0, "enable secondary screen wheel"),
- #endif
- #if ENABLE_PERL
- RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index a7dc1d11bbc..d350fb5c5bd 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -7,20 +7,15 @@
</maintainer>
<use>
<flag name="256-color">Enable 256 color support</flag>
-<flag name="alt-font-width">Calculate the font width using a different method</flag>
<flag name="blink">Enable blinking text</flag>
-<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l. Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
<flag name="fading-colors">Enable colors fading when off focus</flag>
-<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
<flag name="font-styles">Enable support for bold and italic fonts</flag>
+<flag name="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag>
<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="gdk-pixbuf">Enable transparency support using <pkg>x11-libs/gdk-pixbuf</pkg></flag>
-<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt). Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
<flag name="utmp">Enable utmp support</flag>
-<flag name="wcwidth">Enable wide char width support</flag>
<flag name="wtmp">Enable wtmp support</flag>
</use>
<upstream>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
deleted file mode 100644
index 88d63b06268..00000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="
- 256-color alt-font-width blink buffer-on-clear +focused-urgency
- fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl
- secondary-wheel startup-notification xft unicode3 +vanilla wcwidth
-"
-
-RDEPEND="
- >=sys-libs/ncurses-5.7-r6
- kernel_Darwin? ( dev-perl/Mac-Pasteboard )
- media-libs/fontconfig
- perl? ( dev-lang/perl:= )
- gdk-pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
- startup-notification? ( x11-libs/startup-notification )
- x11-libs/libX11
- x11-libs/libXrender
- xft? ( x11-libs/libXft )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-RESTRICT="test"
-REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
-
-src_prepare() {
- # fix for prefix not installing properly
- epatch \
- "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
- "${FILESDIR}"/${PN}-9.21-xsubpp.patch
-
- if ! use vanilla; then
- ewarn "You are going to include unsupported third-party bug fixes/features."
- ewarn "If you want even more control over patches, then set USE=vanilla"
- ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
-
- use wcwidth && epatch doc/wcwidth.patch
-
- # bug #240165
- use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
-
- # bug #263638
- epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
-
- # bug #237271
- epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
-
- # support for wheel scrolling on secondary screens
- use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
-
- # ctrl-l buffer fix
- use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
-
- use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
- fi
-
- # kill the rxvt-unicode terminfo file - #192083
- sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=''
-
- use iso14755 || myconf='--disable-iso14755'
-
- econf --enable-everything \
- $(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 mousewheel) \
- $(use_enable perl) \
- $(use_enable startup-notification) \
- $(use_enable unicode3) \
- $(use_enable xft) \
- ${myconf}
-}
-
-src_compile() {
- emake || die "emake failed"
-
- sed -i \
- -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
- "${S}"/doc/rxvt-tabbed || die "tabs sed failed"
-}
-
-src_install() {
- default
-
- dodoc \
- README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
-
- make_desktop_entry urxvt rxvt-unicode utilities-terminal \
- "System;TerminalEmulator"
-}
-
-pkg_postinst() {
- if use buffer-on-clear; then
- ewarn "You have enabled the buffer-on-clear USE flag."
- ewarn "Please note that, although this works well for most prompts,"
- ewarn "there have been cases with fancy prompts, like bug #397829,"
- ewarn "where it caused issues. Proceed with caution."
- ewarn " (keep this terminal open until you make sure it works)"
- fi
- if use secondary-wheel; then
- elog "You have enabled the secondary-wheel USE flag."
- elog "This allows you to scroll in secondary screens"
- elog "(like mutt's message list/view or nano) using the mouse wheel."
- elog
- elog "To actually enable the feature you have to add"
- elog " URxvt*secondaryWheel: true"
- elog "in your ~/.Xdefaults file"
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2020-12-31 14:52 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2020-12-31 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 01fa0495e04575b2295bfb0afe2164caba7511e4
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 14:45:19 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 14:52:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fa0495
x11-terms/rxvt-unicode: Optionally support xterm SGR 1006 mouse extension
Needed in order for mouse tracking to work properly in large terminals,
for all applications which do not the urxvt 1015 extension (and not many
do). Relies on a third-party patch (ported from AUR, and extended to make
this feature dependent on a build-time flag, by the bug reporter), as
upstream allegedly refused to implement this.
Suggested-by: Oscar L <oscar_bugs <AT> nym.hush.com>
Closes: https://bugs.gentoo.org/761787
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../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-r7.ebuild | 112 ++++++++++++++
3 files changed, 280 insertions(+)
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
new file mode 100644
index 00000000000..3f6f5d90618
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.22-sgr-mouse-mode-flag.patch
@@ -0,0 +1,165 @@
+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 e088706493d..b2f262896f2 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -21,6 +21,9 @@
<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-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
new file mode 100644
index 00000000000..3f1cb44b6c4
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop systemd
+
+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 ~x86-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-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() {
+ default
+
+ # kill the rxvt-unicode terminfo file - #192083
+ sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2021-05-16 18:03 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-05-16 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 67cea2804f7ceffb76b6280e33c1bcececfe0e6a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 17:58:15 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:03:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cea280
x11-terms/rxvt-unicode: add 9.26
No 24-bit colour support for now, the 9.22 patch does not apply any more
due to changes in how urxvt handles the background. On the plus side,
SGR mouse support is now official.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
x11-terms/rxvt-unicode/Manifest | 1 +
x11-terms/rxvt-unicode/files/urxvtd.socket | 8 +++
x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild | 89 +++++++++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 7a676fb3fd4..369cb666899 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/x11-terms/rxvt-unicode/files/urxvtd.socket b/x11-terms/rxvt-unicode/files/urxvtd.socket
new file mode 100644
index 00000000000..4da0499c7bb
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/urxvtd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=rxvt-unicode terminal daemon socket
+
+[Socket]
+ListenStream=%h/.urxvt/urxvtd-%H
+
+[Install]
+WantedBy=sockets.target
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
new file mode 100644
index 00000000000..9261d793fe7
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
@@ -0,0 +1,89 @@
+# 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
+
+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"
+
+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="256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+ +perl startup-notification unicode3 +utmp +wtmp xft"
+
+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"
+# WARNING: will bdepend on >=sys-devel/autoconf-2.71 (masked as of 2021-05-16) if eautoreconf has to be called
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+ "${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+DOCS=(
+ Changes
+ README.FAQ
+ doc/README.xvt
+ doc/changes.txt
+ doc/etc/${PN}.term{cap,info}
+ doc/rxvt-tabbed
+)
+
+src_prepare() {
+ 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
+}
+
+src_configure() {
+ # --enable-everything goes first: the order of the arguments matters
+ econf --enable-everything \
+ $(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 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
+ systemd_douserunit "${FILESDIR}"/urxvtd.socket
+
+ make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+ "System;TerminalEmulator"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2021-11-26 13:40 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-11-26 13:40 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/
@ 2024-04-24 12:58 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2024-04-24 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 83e9a0ee39f4b29e79fe31dd6cf4effd83f405ad
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 12:56:57 2024 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 12:58:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e9a0ee
x11-terms/rxvt-unicode: work around incorrect handling of OSC commands returning colour sequences
Closes: https://bugs.gentoo.org/926608
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...icode-9.31-osc-colour-command-termination.patch | 19 ++++
x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild | 126 +++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-osc-colour-command-termination.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-osc-colour-command-termination.patch
new file mode 100644
index 000000000000..f293d44eb467
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.31-osc-colour-command-termination.patch
@@ -0,0 +1,19 @@
+OSC commands returning the colour sequence must be terminated by either
+of ST, ESC \, or BEL. rxvt-unicode tries to use the same type of termination
+as was in the query but doesn't correctly handle the multiple-char sequence
+used for 7-bit queries. Force to using ESC \ instead for now.
+
+--- a/src/command.C
++++ b/src/command.C
+@@ -3426,9 +3426,9 @@ rxvt_term::process_color_seq (int report, int color, c
+ snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
+
+ if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
+- tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp);
++ tt_printf ("\033]%d;%d;%s\033\\", report, color - minCOLOR, rgba_str);
+ else
+- tt_printf ("\033]%d;%s%c", report, rgba_str, resp);
++ tt_printf ("\033]%d;%s\033\\", report, rgba_str, resp);
+ }
+ else
+ set_window_color (color, str);
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
new file mode 100644
index 000000000000..ea51326a554a
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop systemd prefix
+
+COLOUR_PATCH_NAME="${PN}-9.31_24-bit-color_aur-9.31-20239117.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/${CATEGORY}/${PN}/${COLOUR_PATCH_NAME}.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+ perl startup-notification unicode3 wide-glyphs xft"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r6:=
+ dev-libs/libptytty
+ media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf )
+ 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.31-enable-wide-glyphs.patch
+ "${FILESDIR}"/${PN}-9.31-perl5.38.patch
+ "${FILESDIR}"/${PN}-9.31-osc-colour-command-termination.patch
+)
+DOCS=(
+ Changes
+ README.FAQ
+ doc/README.xvt
+ doc/changes.txt
+ doc/etc/${PN}.term{cap,info}
+ doc/rxvt-tabbed
+)
+
+src_prepare() {
+ default
+
+ # Current patch is too aggressive to apply unconditionally, see Bug #801571
+ if use 24-bit-color; then
+ eapply "${WORKDIR}"/${COLOUR_PATCH_NAME}
+ eautoreconf
+ fi
+
+ # 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
+}
+
+src_configure() {
+ # --enable-everything goes first: the order of the arguments matters
+ local myconf=(
+ --enable-everything
+ $(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 startup-notification)
+ $(use_enable unicode3)
+ $(use_enable wide-glyphs)
+ $(use_enable xft)
+ )
+ if use 24-bit-color; then
+ myconf+=( --enable-24-bit-color )
+ fi
+ econf "${myconf[@]}"
+}
+
+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
+ systemd_douserunit "${FILESDIR}"/urxvtd.socket
+
+ 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 perl && ! use fading-colors; then
+ ewarn "Note that some of the Perl plug-ins bundled with ${PN} will fail to load without USE=fading-colors"
+ fi
+ if use wide-glyphs; then
+ ewarn
+ ewarn "You have enabled wide-glyph support in ${PN}, which is UNOFFICIAL."
+ ewarn "You may or may not encounter visual glitches or stability issues. When in doubt,"
+ ewarn "rebuild =${CATEGORY}/${PF} with USE=-wide-glyphs (the default setting)."
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-24 12:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-15 10:25 [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/, x11-terms/rxvt-unicode/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2024-04-24 12:58 Marek Szuba
2021-11-26 13:40 Marek Szuba
2021-05-16 18:03 Marek Szuba
2020-12-31 14:52 Marek Szuba
2017-03-29 3:17 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox