Browse Source

rxvt-unicode-cvs-opt: get rid of it

master
Von Random 1 month ago
parent
commit
41a81e4898

+ 0
- 78
rxvt-unicode-cvs-opt/PKGBUILD View File

@@ -1,78 +0,0 @@
1
-# Maintainer: Von Random <von@vdrandom.org>
2
-# Contributor: Adriaan Zonnenberg <amz@adriaan.xyz>
3
-# Contributor: Florian Bruhin (The-Compiler) <archlinux.org@the-compiler.org>
4
-# Contributor: Daniel Micay <danielmicay@gmail.com>
5
-# Contributor: Sébastien Luttringer
6
-# Contributor: Angel Velasquez <angvp@archlinux.org>
7
-# Contributor: tobias <tobias@archlinux.org>
8
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
9
-
10
-_pkgname=rxvt-unicode
11
-pkgname=rxvt-unicode-cvs-opt
12
-pkgver=$(date +%Y%m%d)
13
-pkgrel=1
14
-pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt) - latest cvs revision'
15
-arch=('i686' 'x86_64')
16
-url='http://software.schmorp.de/pkg/rxvt-unicode.html'
17
-license=('GPL')
18
-depends=('libxft' 'perl' 'startup-notification' 'rxvt-unicode-terminfo')
19
-makedepends=('cvs')
20
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
21
-source=(
22
-    'font-width-fix.patch'
23
-    'line-spacing-fix.patch'
24
-    'urxvt-sgr.patch'
25
-)
26
-sha256sums=(
27
-    '686770fe4e8d6bb0ba497ad2e1f217d17515f2544d80abe76496c63ead2bfaa4'
28
-    '546a388d0595404a59c71c3eaeba331031032a75f96c57e9a860f27bbd7ebfcc'
29
-    'f36110dce2dce4d6e275410de820f314b72a02dbad08f637c64b0da769c0c8f4'
30
-)
31
-prefix='/opt/rxvt-unicode'
32
-
33
-prepare() {
34
-  cvs -z3 -d :pserver:anonymous@cvs.schmorp.de/schmorpforge co ${_pkgname}
35
-  cd ${_pkgname}
36
-
37
-  patch -p0 -i ../font-width-fix.patch
38
-  patch -p0 -i ../line-spacing-fix.patch
39
-  patch -p0 -i ../urxvt-sgr.patch
40
-}
41
-
42
-build() {
43
-  cd ${_pkgname}
44
-  # do not specify --with-terminfo (FS#46424)
45
-  ./configure \
46
-    --prefix=${prefix} \
47
-    --enable-256-color \
48
-    --enable-combining \
49
-    --enable-fading \
50
-    --enable-font-styles \
51
-    --enable-iso14755 \
52
-    --enable-keepscrolling \
53
-    --enable-lastlog \
54
-    --enable-mousewheel \
55
-    --enable-next-scroll \
56
-    --enable-perl \
57
-    --enable-pointer-blank \
58
-    --enable-rxvt-scroll \
59
-    --enable-selectionscrolling \
60
-    --enable-slipwheeling \
61
-    --enable-smart-resize \
62
-    --enable-startup-notification \
63
-    --enable-transparency \
64
-    --enable-unicode3 \
65
-    --enable-utmp \
66
-    --enable-wtmp \
67
-    --enable-xft \
68
-    --enable-xim \
69
-    --enable-xterm-scroll \
70
-    --disable-frills
71
-  make
72
-}
73
-
74
-package() {
75
-  cd $_pkgname
76
-
77
-  make DESTDIR="$pkgdir" install
78
-}

+ 0
- 26
rxvt-unicode-cvs-opt/font-width-fix.patch View File

@@ -1,26 +0,0 @@
1
---- src/rxvtfont.C.bukind	2007-11-30 14:36:33.000000000 +0600
2
-+++ src/rxvtfont.C	2007-11-30 14:39:29.000000000 +0600
3
-@@ -1171,12 +1171,21 @@
4
-           XGlyphInfo g;
5
-           XftTextExtents16 (disp, f, &ch, 1, &g);
6
- 
7
-+/*  
8
-+ * bukind: don't use g.width as a width of a character!
9
-+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
10
-+
11
-           g.width -= g.x;
12
- 
13
-           int wcw = WCWIDTH (ch);
14
-           if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
15
- 
16
-           if (width    < g.width       ) width    = g.width;
17
-+ */
18
-+          int wcw = WCWIDTH (ch);
19
-+          if (wcw > 1) g.xOff = g.xOff / wcw;
20
-+          if (width < g.xOff) width = g.xOff;
21
-+
22
-           if (height   < g.height      ) height   = g.height;
23
-           if (glheight < g.height - g.y) glheight = g.height - g.y;
24
-         }
25
-
26
-

+ 0
- 25
rxvt-unicode-cvs-opt/line-spacing-fix.patch View File

@@ -1,25 +0,0 @@
1
---- src/rxvtfont.C.orig	2011-07-20 22:19:29.878012201 -0300
2
-+++ src/rxvtfont.C	2011-07-20 22:19:33.634671723 -0300
3
-@@ -1237,11 +1237,22 @@
4
- 
5
-       FT_Face face = XftLockFace (f);
6
- 
7
-+/*
8
-+ * use ascent, descent and height from XftFont *f instead of FT_Face face.
9
-+ * this somehow reproduces the behaviour of the line height as seen on xterm.
10
-+
11
-       ascent  = (face->size->metrics.ascender + 63) >> 6;
12
-       descent = (-face->size->metrics.descender + 63) >> 6;
13
-       height  = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
14
-       width   = 0;
15
- 
16
-+ */
17
-+
18
-+      ascent  = f->ascent;
19
-+      descent = f->descent;
20
-+      height  = max (ascent + descent, f->height);
21
-+      width   = 0;
22
-+
23
-       bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
24
- 
25
-       XftUnlockFace (f);

+ 0
- 90
rxvt-unicode-cvs-opt/urxvt-sgr.patch View File

@@ -1,90 +0,0 @@
1
---- src/command.C	2014-12-13 13:22:09.000000000 +0100
2
-+++ src/command.C	2016-01-13 04:50:39.161862513 +0100
3
-@@ -1280,6 +1280,8 @@
4
-   int x, y;
5
-   int code = 32;
6
-
7
-+  if (priv_modes & PrivMode_ExtMouseSgr) code = 0;
8
-+
9
-   x = Pixel2Col (ev.x) + 1;
10
-   y = Pixel2Row (ev.y) + 1;
11
- 
12
-@@ -1293,11 +1295,18 @@
13
-       code += 32;
14
-     }
15
- 
16
--  if (MEvent.button == AnyButton)
17
-+  if (!(priv_modes & PrivMode_ExtMouseSgr) && MEvent.button == AnyButton)
18
-     button_number = 3;
19
-   else
20
-     {
21
--      button_number = MEvent.button - Button1;
22
-+      if (ev.type == MotionNotify) {
23
-+        if (ev.state & Button1Mask) button_number = 0;
24
-+        else if (ev.state & Button2Mask) button_number = 1;
25
-+        else if (ev.state & Button3Mask) button_number = 2;
26
-+        else return;
27
-+      } else {
28
-+        button_number = ev.button - Button1;
29
-+      }
30
-       /* add 0x3D for wheel events, like xterm does */
31
-       if (button_number >= 3)
32
-         button_number += 64 - 3;
33
-@@ -1347,16 +1356,22 @@
34
- #endif
35
- 
36
- #if ENABLE_FRILLS
37
-+  if (priv_modes & PrivMode_ExtMouseSgr)
38
-+    tt_printf ("\033[<%d;%d;%d%c",
39
-+              code + button_number + key_state,
40
-+              x,
41
-+              y,
42
-+              (ev.type == ButtonRelease ? 'm' : 'M'));
43
--  if (priv_modes & PrivMode_ExtMouseRight)
44
-+  else if (priv_modes & PrivMode_ExtMouseRight)
45
-     tt_printf ("\033[%d;%d;%dM",
46
-               code + button_number + key_state,
47
-               x,
48
-               y);
49
-   else if (priv_modes & PrivMode_ExtModeMouse)
50
-     tt_printf ("\033[M%c%lc%lc",
51
-               code + button_number + key_state,
52
-               wint_t (32 + x),
53
-               wint_t (32 + y));
54
-   else
55
- #endif
56
-     tt_printf ("\033[M%c%c%c",
57
-@@ -2908,7 +2913,7 @@
58
-                 scr_soft_reset ();
59
- 
60
-                 static const int pm_h[] = { 7, 25 };
61
--                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
62
-+                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1002, 1003, 1005, 1006, 1015, 1049 };
63
- 
64
-                 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
65
-                 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
66
-@@ -3713,13 +3718,14 @@
67
-                   { 1003, PrivMode_MouseAnyEvent },
68
- #if ENABLE_FRILLS
69
-                   { 1004, PrivMode_FocusEvent },
70
-                   { 1005, PrivMode_ExtModeMouse },
71
-+                  { 1006, PrivMode_ExtMouseSgr },
72
- #endif
73
-                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
74
-                   { 1011, PrivMode_Keypress }, // rxvt extension
75
- #if ENABLE_FRILLS
76
-                   { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
77
- #endif
78
-                  // 1035 enable modifiers for alt, numlock NYI
79
-                  // 1036 send ESC for meta keys NYI
80
-                  // 1037 send DEL for keypad delete NYI
81
---- src/rxvt.h	2014-12-17 16:33:08.000000000 +0100
82
-+++ src/rxvt.h	2016-01-13 03:42:31.508911380 +0100
83
-@@ -644,6 +644,7 @@
84
- #define PrivMode_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
85
- #define PrivMode_BlinkingCursor (1UL<<25)
86
- #define PrivMode_FocusEvent     (1UL<<26)
87
-+#define PrivMode_ExtMouseSgr    (1UL<<27) // sgr mouse extension
88
- 
89
- #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
90
- 

+ 2
- 1
rxvt-unicode-cvs/PKGBUILD View File

@@ -33,6 +33,7 @@ sha256sums=(
33 33
   f60d92d855530fd3f80138eb888a5b4205f6f444e5c41f2c30d9637b6b39c2a7
34 34
   f36110dce2dce4d6e275410de820f314b72a02dbad08f637c64b0da769c0c8f4
35 35
 )
36
+prefix='/usr'
36 37
 patches=(
37 38
   font-width-fix.patch
38 39
   line-spacing-fix.patch
@@ -54,7 +55,7 @@ build() {
54 55
   # we disable smart-resize (FS#34807)
55 56
   # do not specify --with-terminfo (FS#46424)
56 57
   ./configure \
57
-    --prefix=/usr \
58
+    --prefix=$prefix \
58 59
     --enable-256-color \
59 60
     --enable-combining \
60 61
     --enable-fading \

Loading…
Cancel
Save