rxvt-unicode-cvs with sgr patch

6 files changed, 67 insertions, 121 deletions

diff --git a/rxvt-unicode-cvs/PKGBUILD b/rxvt-unicode-cvs/PKGBUILD
new file mode 100644
index 0000000..db3b99d
--- /dev/null
+++ b/rxvt-unicode-cvs/PKGBUILD
@@ -0,0 +1,64 @@
+# Maintainer: 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
+pkgver=20170518
+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')
+
+prepare() {
+  cd ${srcdir}
+  cvs -z3 -d :pserver:anonymous@cvs.schmorp.de/schmorpforge co ${_pkgname}
+}
+
+build() {
+  cd ${srcdir}/${_pkgname}
+  patch -p0 < ../../urxvt-sgr.patch
+  # we disable smart-resize (FS#34807)
+  # do not specify --with-terminfo (FS#46424)
+  ./configure \
+    --prefix=/opt/urxvt \
+    --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 \
+    --disable-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-sgr/urxvt-sgr.patch b/rxvt-unicode-cvs/urxvt-sgr.patch
index 186e8fd..cb1b409 100644
--- a/rxvt-unicode-sgr/urxvt-sgr.patch
+++ b/rxvt-unicode-cvs/urxvt-sgr.patch
@@ -64,9 +64,9 @@
                  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
+                   { 1004, PrivMode_FocusEvent },
                    { 1005, PrivMode_ExtModeMouse },
 +                  { 1006, PrivMode_ExtMouseSgr },
  #endif
@@ -81,10 +81,10 @@
 --- 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_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-sgr/PKGBUILD b/rxvt-unicode-sgr/PKGBUILD
deleted file mode 100644
index a09e10a..0000000
--- a/rxvt-unicode-sgr/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgbase=rxvt-unicode
-pkgname=('rxvt-unicode-sgr' 'rxvt-unicode-terminfo')
-pkgver=9.22
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://software.schmorp.de/pkg/rxvt-unicode.html'
-license=('GPL')
-makedepends=('libxft' 'perl' 'startup-notification')
-source=(
-  "http://dist.schmorp.de/rxvt-unicode/$pkgbase-$pkgver.tar.bz2"
-  'urxvt.desktop'
-  'urxvtc.desktop'
-  'urxvt-tabbed.desktop'
-  'urxvt-sgr.patch'
-)
-md5sums=('93782dec27494eb079467dacf6e48185'
-         'fec94dc986fa37ec380079d81de3e0b2'
-         'fac55f0a8404c86dad3e702146762332'
-         '8a5599197568c63720e282b9722a7990'
-         'f8325b0a33999db4d5d1eeac4f320156')
-
-build() {
-  cd $pkgbase-$pkgver
-  patch -p0 < ../urxvt-sgr.patch
-  # we disable smart-resize (FS#34807)
-  # do not specify --with-terminfo (FS#46424)
-  ./configure \
-    --prefix=/usr \
-    --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 \
-    --disable-smart-resize \
-    --enable-startup-notification \
-    --enable-transparency \
-    --enable-unicode3 \
-    --enable-utmp \
-    --enable-wtmp \
-    --enable-xft \
-    --enable-xim \
-    --enable-xterm-scroll \
-    --disable-pixbuf \
-    --disable-frills
-  make
-}
-
-package_rxvt-unicode-sgr() {
-  pkgdesc='A unicode enabled rxvt-clone terminal emulator (urxvt)'
-  provides=('rxvt-unicode')
-  conflicts=('rxvt-unicode')
-  depends=('rxvt-unicode-terminfo' 'libxft' 'perl' 'startup-notification')
-  optdepends=('gtk2-perl: to use the urxvt-tabbed')
-
-  # install freedesktop menu
-  for _f in urxvt urxvtc urxvt-tabbed; do
-    install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop"
-  done
-  cd $pkgbase-$pkgver
-  # workaround terminfo installation
-  export TERMINFO="$srcdir/terminfo"
-  install -d "$TERMINFO"
-  make DESTDIR="$pkgdir" install
-  # install the tabbing wrapper ( requires gtk2-perl! )
-  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
-  install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed"
-}
-
-package_rxvt-unicode-terminfo() {
-  pkgdesc='Terminfo files for urxvt'
-  conflict=('rxvt-unicode<=9.18-6')
-  install -dm 755 "$pkgdir/usr/share/"
-  mv terminfo "$pkgdir/usr/share/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/rxvt-unicode-sgr/urxvt-tabbed.desktop b/rxvt-unicode-sgr/urxvt-tabbed.desktop
deleted file mode 100644
index 172006b..0000000
--- a/rxvt-unicode-sgr/urxvt-tabbed.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt (tabbed)
-Comment=An unicode capable and tabbed rxvt clone
-Exec=urxvt-tabbed
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/rxvt-unicode-sgr/urxvt.desktop b/rxvt-unicode-sgr/urxvt.desktop
deleted file mode 100644
index 7622918..0000000
--- a/rxvt-unicode-sgr/urxvt.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt
-Comment=An unicode capable rxvt clone
-Exec=urxvt
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/rxvt-unicode-sgr/urxvtc.desktop b/rxvt-unicode-sgr/urxvtc.desktop
deleted file mode 100644
index 3a2df41..0000000
--- a/rxvt-unicode-sgr/urxvtc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt (client)
-Comment=An unicode capable rxvt clone client for urxvtd
-Exec=urxvtc
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;