summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-05-15 12:24:08 +0200
committerJeroen Roovers <jer@gentoo.org>2019-05-15 12:25:40 +0200
commitd73547f2e413e6f8483ea57052c5ee22100935e6 (patch)
tree9dbb4594f3aa198ae483f481ed213054538dde96
parentx11-terms/rxvt-unicode: Stable for x86 too (diff)
downloadgentoo-d73547f2e413e6f8483ea57052c5ee22100935e6.tar.gz
gentoo-d73547f2e413e6f8483ea57052c5ee22100935e6.tar.bz2
gentoo-d73547f2e413e6f8483ea57052c5ee22100935e6.zip
x11-terms/rxvt-unicode: Old
Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--x11-terms/rxvt-unicode/Manifest1
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch33
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch21
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff15
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch13
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.14-clear.patch25
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch123
-rw-r--r--x11-terms/rxvt-unicode/metadata.xml7
-rw-r--r--x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild133
9 files changed, 1 insertions, 370 deletions
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 9fba0aac164b..2ef5babc160d 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 0e8d256f9219..000000000000
--- 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 2c803335d64f..000000000000
--- 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 3408d73731c9..000000000000
--- 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 cad5a793d378..000000000000
--- 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 050907cea435..000000000000
--- 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 3a4d4a409814..000000000000
--- 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 a7dc1d11bbc0..d350fb5c5bdf 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 88d63b06268e..000000000000
--- 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
-}