diff options
author | Emil Gedda | 2021-06-15 18:40:22 +0200 |
---|---|---|
committer | Emil Gedda | 2021-06-15 18:42:17 +0200 |
commit | d7b0fbdd9c8b94a865aea4a32ebea3650a1acd09 (patch) | |
tree | 970cd573e79c34594933ecd476c4977d5ab329fe | |
parent | dd27d6b147a86df55a62fb6e4932782ba54cb030 (diff) | |
download | aur-d7b0fbdd9c8b94a865aea4a32ebea3650a1acd09.tar.gz |
update to version 9.26
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | fix-perl-segfault.patch | 32 | ||||
-rw-r--r-- | fix-smart-resize-with-x11-frame-borders.patch | 54 | ||||
-rw-r--r-- | sgr-mouse-mode.patch | 90 |
5 files changed, 12 insertions, 205 deletions
@@ -1,45 +1,38 @@ pkgbase = rxvt-unicode-patched-with-scrolling pkgdesc = Unicode enabled rxvt-clone terminal emulator (urxvt) with fixed font spacing and scrolling in pages - pkgver = 9.22 - pkgrel = 12 + pkgver = 9.26 + pkgrel = 1 url = http://software.schmorp.de/pkg/rxvt-unicode.html arch = i686 arch = x86_64 license = GPL depends = libxft + depends = libxt depends = perl depends = startup-notification depends = rxvt-unicode-terminfo optdepends = gtk2-perl: to use the urxvt-tabbed provides = rxvt-unicode conflicts = rxvt-unicode - source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2 + source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.26.tar.bz2 source = urxvt.desktop source = urxvtc.desktop source = urxvt-tabbed.desktop source = font-width-fix.patch source = line-spacing-fix.patch - source = sgr-mouse-mode.patch - source = fix-smart-resize-with-x11-frame-borders.patch source = clear.patch source = secondaryWheel.patch source = enable-wide-glyphs.patch source = 24-bit-color.patch - source = fix-perl-segfault.patch - sha1sums = e575b869782fbfed955f84f48b204ec888d91ba1 + sha1sums = d325d8cdea6bcb8e0b8b219b8451bf5c690b6c62 sha1sums = b5a4507f85ebb7bac589db2e07d9bc40106720d9 sha1sums = 62c4ffecfce6967def394dd4d418b68652372ea2 sha1sums = cd204d608d114d39c80331efe0af0231ad6b7e18 sha1sums = 01ee8f212add79a158dcd4ed78d0ea1324bdc59b sha1sums = b7fde1c46af45e831828738874f14b092b1e795f - sha1sums = dfbc8729c545105eff21e20ef3a4a3841a68a192 - sha1sums = 6dfa49a211c48193c8d87fb9993ed459b2b4387b sha1sums = fc77f75bd2d51baa4abef81983dab044d7f498ce sha1sums = e50503f786deb6d6c2b6b8bcf486bf509c14af71 sha1sums = d9f3b52b273d13fbd4089a7869ab2e70bf190bc9 sha1sums = 9f5db305863b17175e72f9e2d4a78d0d7f25fd34 - sha1sums = 949900e5acff1fa0682900c282ff9d1cdfd292b8 - pkgname = rxvt-unicode-patched-with-scrolling - @@ -9,13 +9,13 @@ _pkgname=rxvt-unicode pkgname=rxvt-unicode-patched-with-scrolling -pkgver=9.22 -pkgrel=12 +pkgver=9.26 +pkgrel=1 pkgdesc='Unicode enabled rxvt-clone terminal emulator (urxvt) with fixed font spacing and scrolling in pages' arch=('i686' 'x86_64') url='http://software.schmorp.de/pkg/rxvt-unicode.html' license=('GPL') -depends=('libxft' 'perl' 'startup-notification' 'rxvt-unicode-terminfo') +depends=('libxft' 'libxt' 'perl' 'startup-notification' 'rxvt-unicode-terminfo') optdepends=('gtk2-perl: to use the urxvt-tabbed') provides=(rxvt-unicode) conflicts=(rxvt-unicode) @@ -25,39 +25,30 @@ source=(http://dist.schmorp.de/rxvt-unicode/$_pkgname-$pkgver.tar.bz2 'urxvt-tabbed.desktop' 'font-width-fix.patch' 'line-spacing-fix.patch' - 'sgr-mouse-mode.patch' - 'fix-smart-resize-with-x11-frame-borders.patch' # will be in 9.22+ 'clear.patch' 'secondaryWheel.patch' 'enable-wide-glyphs.patch' - '24-bit-color.patch' - 'fix-perl-segfault.patch') -sha1sums=('e575b869782fbfed955f84f48b204ec888d91ba1' + '24-bit-color.patch') +sha1sums=('d325d8cdea6bcb8e0b8b219b8451bf5c690b6c62' 'b5a4507f85ebb7bac589db2e07d9bc40106720d9' '62c4ffecfce6967def394dd4d418b68652372ea2' 'cd204d608d114d39c80331efe0af0231ad6b7e18' '01ee8f212add79a158dcd4ed78d0ea1324bdc59b' 'b7fde1c46af45e831828738874f14b092b1e795f' - 'dfbc8729c545105eff21e20ef3a4a3841a68a192' - '6dfa49a211c48193c8d87fb9993ed459b2b4387b' 'fc77f75bd2d51baa4abef81983dab044d7f498ce' 'e50503f786deb6d6c2b6b8bcf486bf509c14af71' 'd9f3b52b273d13fbd4089a7869ab2e70bf190bc9' - '9f5db305863b17175e72f9e2d4a78d0d7f25fd34' - '949900e5acff1fa0682900c282ff9d1cdfd292b8') + '9f5db305863b17175e72f9e2d4a78d0d7f25fd34') prepare() { cd $_pkgname-$pkgver patch -p0 -i ../font-width-fix.patch patch -p0 -i ../line-spacing-fix.patch - patch -p0 -i ../sgr-mouse-mode.patch - patch -p0 < ../24-bit-color.patch - patch -p1 -i ../fix-smart-resize-with-x11-frame-borders.patch + #patch -p0 -i ../24-bit-color.patch patch -p1 -i ../clear.patch patch -p1 -i ../secondaryWheel.patch patch -p1 -i ../enable-wide-glyphs.patch - patch -p1 -i ../fix-perl-segfault.patch } build() { @@ -91,7 +82,6 @@ build() { --enable-xim \ --enable-24-bit-color \ --enable-xterm-scroll - #--enable-wide-glyphs \ make } diff --git a/fix-perl-segfault.patch b/fix-perl-segfault.patch deleted file mode 100644 index 776d1677a26e..000000000000 --- a/fix-perl-segfault.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/rxvtperl.h -+++ b/src/rxvtperl.h -@@ -51,7 +51,9 @@ - { - char **perl_environ; - -+ #if 0 // see rxvtperl.xs - ~rxvt_perl_interp (); -+ #endif - - void init (); - void init (rxvt_term *term); ---- a/src/rxvtperl.xs -+++ b/src/rxvtperl.xs -@@ -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/fix-smart-resize-with-x11-frame-borders.patch b/fix-smart-resize-with-x11-frame-borders.patch deleted file mode 100644 index 9311f9d70d8d..000000000000 --- a/fix-smart-resize-with-x11-frame-borders.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit bec3f19 -Author: Emanuele Giaquinta <e.giaquinta@glauco.it> -Date: Tue Jun 28 21:56:17 2016 +0000 - - Fix invalid moves when smart resize is enabled and the wm uses X11 borders for the frame windows. - - Patch by Uli Schlachter. ---- - src/main.C | 25 +++++++++++++++++++++++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - -diff --git a/src/main.C b/src/main.C -index 39aa5ec..5fa605e 100644 ---- a/src/main.C -+++ b/src/main.C -@@ -1054,6 +1054,25 @@ rxvt_term::alias_color (int dst, int src) - pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); - } - -+#ifdef SMART_RESIZE -+static unsigned int -+get_parent_bw (Display *dpy, Window w) -+{ -+ int idummy; -+ unsigned int udummy; -+ Window wdummy, parent; -+ Window *children; -+ unsigned int nchildren, border_width; -+ -+ XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren); -+ XFree (children); -+ XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy, -+ &udummy, &udummy, &border_width, &udummy); -+ -+ return border_width; -+} -+#endif -+ - /* -------------------------------------------------------------------- * - * - WINDOW RESIZING - * - * -------------------------------------------------------------------- */ -@@ -1098,8 +1117,10 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, in - */ - if (x1 != x || y1 != y) - { -- x -= x1; -- y -= y1; -+ unsigned int border_width = get_parent_bw (dpy, parent); -+ -+ x -= x1 + border_width; -+ y -= y1 + border_width; - } - - x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; diff --git a/sgr-mouse-mode.patch b/sgr-mouse-mode.patch deleted file mode 100644 index 186e8fdb74f8..000000000000 --- a/sgr-mouse-mode.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- src/command.C 2014-12-13 13:22:09.000000000 +0100 -+++ src/command.C 2016-01-13 04:50:39.161862513 +0100 -@@ -1280,6 +1280,8 @@ - int x, y; - int code = 32; - -+ if (priv_modes & PrivMode_ExtMouseSgr) code = 0; -+ - x = Pixel2Col (ev.x) + 1; - y = Pixel2Row (ev.y) + 1; - -@@ -1293,11 +1295,18 @@ - code += 32; - } - -- if (MEvent.button == AnyButton) -+ if (!(priv_modes & PrivMode_ExtMouseSgr) && 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; -@@ -1347,16 +1356,22 @@ - #endif - - #if ENABLE_FRILLS -+ if (priv_modes & PrivMode_ExtMouseSgr) -+ tt_printf ("\033[<%d;%d;%d%c", -+ code + button_number + key_state, -+ x, -+ y, -+ (ev.type == ButtonRelease ? 'm' : 'M')); -- if (priv_modes & PrivMode_ExtMouseRight) -+ else if (priv_modes & PrivMode_ExtMouseRight) - tt_printf ("\033[%d;%d;%dM", - code + button_number + key_state, - x, - y); - else if (priv_modes & PrivMode_ExtModeMouse) - tt_printf ("\033[M%c%lc%lc", - code + button_number + key_state, - wint_t (32 + x), - wint_t (32 + y)); - else - #endif - tt_printf ("\033[M%c%c%c", -@@ -2908,7 +2913,7 @@ - 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); -@@ -3713,13 +3718,14 @@ - { 1002, PrivMode_MouseBtnEvent }, - { 1003, PrivMode_MouseAnyEvent }, - #if ENABLE_FRILLS - { 1005, PrivMode_ExtModeMouse }, -+ { 1006, PrivMode_ExtMouseSgr }, - #endif - { 1010, PrivMode_TtyOutputInh }, // rxvt extension - { 1011, PrivMode_Keypress }, // rxvt extension - #if ENABLE_FRILLS - { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 - #endif - // 1035 enable modifiers for alt, numlock NYI - // 1036 send ESC for meta keys NYI - // 1037 send DEL for keypad delete NYI ---- src/rxvt.h 2014-12-17 16:33:08.000000000 +0100 -+++ src/rxvt.h 2016-01-13 03:42:31.508911380 +0100 -@@ -644,6 +644,7 @@ - #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<<26) // sgr mouse extension - - #define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) - |