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

5 files changed, 2 insertions, 220 deletions

diff --git a/rxvt-unicode-cvs-opt/PKGBUILD b/rxvt-unicode-cvs-opt/PKGBUILD
deleted file mode 100644
index 933031b..0000000
--- a/rxvt-unicode-cvs-opt/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Von Random <von@vdrandom.org>
-# Contributor: Adriaan Zonnenberg <amz@adriaan.xyz>
-# Contributor: Florian Bruhin (The-Compiler) <archlinux.org@the-compiler.org>
-# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Sébastien Luttringer
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-_pkgname=rxvt-unicode
-pkgname=rxvt-unicode-cvs-opt
-pkgver=$(date +%Y%m%d)
-pkgrel=1
-pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt) - latest cvs revision'
-arch=('i686' 'x86_64')
-url='http://software.schmorp.de/pkg/rxvt-unicode.html'
-license=('GPL')
-depends=('libxft' 'perl' 'startup-notification' 'rxvt-unicode-terminfo')
-makedepends=('cvs')
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
-source=(
-    'font-width-fix.patch'
-    'line-spacing-fix.patch'
-    'urxvt-sgr.patch'
-)
-sha256sums=(
-    '686770fe4e8d6bb0ba497ad2e1f217d17515f2544d80abe76496c63ead2bfaa4'
-    '546a388d0595404a59c71c3eaeba331031032a75f96c57e9a860f27bbd7ebfcc'
-    'f36110dce2dce4d6e275410de820f314b72a02dbad08f637c64b0da769c0c8f4'
-)
-prefix='/opt/rxvt-unicode'
-
-prepare() {
-  cvs -z3 -d :pserver:anonymous@cvs.schmorp.de/schmorpforge co ${_pkgname}
-  cd ${_pkgname}
-
-  patch -p0 -i ../font-width-fix.patch
-  patch -p0 -i ../line-spacing-fix.patch
-  patch -p0 -i ../urxvt-sgr.patch
-}
-
-build() {
-  cd ${_pkgname}
-  # do not specify --with-terminfo (FS#46424)
-  ./configure \
-    --prefix=${prefix} \
-    --enable-256-color \
-    --enable-combining \
-    --enable-fading \
-    --enable-font-styles \
-    --enable-iso14755 \
-    --enable-keepscrolling \
-    --enable-lastlog \
-    --enable-mousewheel \
-    --enable-next-scroll \
-    --enable-perl \
-    --enable-pointer-blank \
-    --enable-rxvt-scroll \
-    --enable-selectionscrolling \
-    --enable-slipwheeling \
-    --enable-smart-resize \
-    --enable-startup-notification \
-    --enable-transparency \
-    --enable-unicode3 \
-    --enable-utmp \
-    --enable-wtmp \
-    --enable-xft \
-    --enable-xim \
-    --enable-xterm-scroll \
-    --disable-frills
-  make
-}
-
-package() {
-  cd $_pkgname
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/rxvt-unicode-cvs-opt/font-width-fix.patch b/rxvt-unicode-cvs-opt/font-width-fix.patch
deleted file mode 100644
index 811d9e6..0000000
--- a/rxvt-unicode-cvs-opt/font-width-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/rxvtfont.C.bukind	2007-11-30 14:36:33.000000000 +0600
-+++ src/rxvtfont.C	2007-11-30 14:39:29.000000000 +0600
-@@ -1171,12 +1171,21 @@
-           XGlyphInfo g;
-           XftTextExtents16 (disp, f, &ch, 1, &g);
- 
-+/*  
-+ * 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
-+
-           g.width -= g.x;
- 
-           int wcw = WCWIDTH (ch);
-           if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
- 
-           if (width    < g.width       ) width    = g.width;
-+ */
-+          int wcw = WCWIDTH (ch);
-+          if (wcw > 1) g.xOff = g.xOff / wcw;
-+          if (width < g.xOff) width = g.xOff;
-+
-           if (height   < g.height      ) height   = g.height;
-           if (glheight < g.height - g.y) glheight = g.height - g.y;
-         }
-
-
diff --git a/rxvt-unicode-cvs-opt/line-spacing-fix.patch b/rxvt-unicode-cvs-opt/line-spacing-fix.patch
deleted file mode 100644
index 8431c4f..0000000
--- a/rxvt-unicode-cvs-opt/line-spacing-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/rxvtfont.C.orig	2011-07-20 22:19:29.878012201 -0300
-+++ src/rxvtfont.C	2011-07-20 22:19:33.634671723 -0300
-@@ -1237,11 +1237,22 @@
- 
-       FT_Face face = XftLockFace (f);
- 
-+/*
-+ * use ascent, descent and height from XftFont *f instead of FT_Face face.
-+ * this somehow reproduces the behaviour of the line height as seen on xterm.
-+
-       ascent  = (face->size->metrics.ascender + 63) >> 6;
-       descent = (-face->size->metrics.descender + 63) >> 6;
-       height  = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
-       width   = 0;
- 
-+ */
-+
-+      ascent  = f->ascent;
-+      descent = f->descent;
-+      height  = max (ascent + descent, f->height);
-+      width   = 0;
-+
-       bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
- 
-       XftUnlockFace (f);
diff --git a/rxvt-unicode-cvs-opt/urxvt-sgr.patch b/rxvt-unicode-cvs-opt/urxvt-sgr.patch
deleted file mode 100644
index cb1b409..0000000
--- a/rxvt-unicode-cvs-opt/urxvt-sgr.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 @@
-                   { 1003, PrivMode_MouseAnyEvent },
- #if ENABLE_FRILLS
-                   { 1004, PrivMode_FocusEvent },
-                   { 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_ExtMouseRight  (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
- #define PrivMode_BlinkingCursor (1UL<<25)
- #define PrivMode_FocusEvent     (1UL<<26)
-+#define PrivMode_ExtMouseSgr    (1UL<<27) // sgr mouse extension
- 
- #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
- 
diff --git a/rxvt-unicode-cvs/PKGBUILD b/rxvt-unicode-cvs/PKGBUILD
index 4d5c755..92acd72 100644
--- a/rxvt-unicode-cvs/PKGBUILD
+++ b/rxvt-unicode-cvs/PKGBUILD
@@ -33,6 +33,7 @@ sha256sums=(
   f60d92d855530fd3f80138eb888a5b4205f6f444e5c41f2c30d9637b6b39c2a7
   f36110dce2dce4d6e275410de820f314b72a02dbad08f637c64b0da769c0c8f4
 )
+prefix='/usr'
 patches=(
   font-width-fix.patch
   line-spacing-fix.patch
@@ -54,7 +55,7 @@ build() {
   # we disable smart-resize (FS#34807)
   # do not specify --with-terminfo (FS#46424)
   ./configure \
-    --prefix=/usr \
+    --prefix=$prefix \
     --enable-256-color \
     --enable-combining \
     --enable-fading \