summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjjacky2013-05-26 13:03:51 +0200
committerOlivier Brunel2015-06-08 19:16:29 +0200
commit9e03d730cdea95a170a68d24b99a1266e42ff513 (patch)
treeafb141f3975265b82da09f81d6655bc6a2aa2d7b
parent3815fbdd4b0186c7bb0b4671a1e20f2555f3239c (diff)
downloadaur-9e03d730cdea95a170a68d24b99a1266e42ff513.tar.gz
rxvt-unicode-better-wheel-scrolling: Fix couple issues
- Fix wrong parameter used in secondaryWheel.patch - Fix issues in the doc causing build issue Signed-off-by: Olivier Brunel <jjk@jjacky.com>
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD16
-rw-r--r--fix-doc.patch15
-rw-r--r--secondaryWheel.patch6
4 files changed, 36 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7aab70543c51..5660826ef423 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rxvt-unicode-better-wheel-scrolling
pkgdesc = An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)
pkgver = 9.18
- pkgrel = 1
+ pkgrel = 2
url = http://software.schmorp.de/pkg/rxvt-unicode.html
arch = i686
arch = x86_64
@@ -13,16 +13,19 @@ pkgbase = rxvt-unicode-better-wheel-scrolling
conflicts = rxvt-unicode
source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.18.tar.bz2
source = rxvt-unicode.desktop
+ source = fix-doc.patch
source = clear.patch
source = secondaryWheel.patch
md5sums = 963ccc748fe5bca925e7b92c0404d68b
md5sums = af8e6ad4cd2d33c26f8df6a838685332
+ md5sums = 77d1079a047589b47cd536ea71dc2a9a
md5sums = 5714991c5b1bf5f7d7769961e391a0db
- md5sums = a6011928fe8734591544f70083b995c7
+ md5sums = 3ac56e66095db241c0a5f223f3e9b677
sha1sums = 5d12639c4b17019357ee62c08916b826e5d03259
sha1sums = 9a31b46324c0be44fb97be0828e1ead2311b3f9f
+ sha1sums = 2eb8b4c9099c48a47b3c9f30a62244ce514c9df2
sha1sums = 089e0263722412dd82008ae3e2b3eb335fc8116e
- sha1sums = 7b2de8c206babc4a8baea1f8c3a4219dcfa03750
+ sha1sums = 7d980df213f9183e26626ebaca7f914d124e9c4b
pkgname = rxvt-unicode-better-wheel-scrolling
diff --git a/PKGBUILD b/PKGBUILD
index 61b4937d1147..5349faaa9c17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
_pkgname=rxvt-unicode
pkgname=${_pkgname}-better-wheel-scrolling
pkgver=9.18
-pkgrel=1
+pkgrel=2
pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)"
arch=('i686' 'x86_64')
url="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -19,20 +19,28 @@ provides=('rxvt-unicode')
conflicts=('rxvt-unicode')
source=(http://dist.schmorp.de/rxvt-unicode/${_pkgname}-${pkgver}.tar.bz2 \
${_pkgname}.desktop
+ fix-doc.patch
clear.patch secondaryWheel.patch)
md5sums=('963ccc748fe5bca925e7b92c0404d68b'
'af8e6ad4cd2d33c26f8df6a838685332'
+ '77d1079a047589b47cd536ea71dc2a9a'
'5714991c5b1bf5f7d7769961e391a0db'
- 'a6011928fe8734591544f70083b995c7')
+ '3ac56e66095db241c0a5f223f3e9b677')
sha1sums=('5d12639c4b17019357ee62c08916b826e5d03259'
'9a31b46324c0be44fb97be0828e1ead2311b3f9f'
+ '2eb8b4c9099c48a47b3c9f30a62244ce514c9df2'
'089e0263722412dd82008ae3e2b3eb335fc8116e'
- '7b2de8c206babc4a8baea1f8c3a4219dcfa03750')
+ '7d980df213f9183e26626ebaca7f914d124e9c4b')
-build() {
+prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -p0 -i ../fix-doc.patch
patch -p1 -i ../clear.patch
patch -p1 -i ../secondaryWheel.patch
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
./configure --prefix=/usr \
--with-terminfo=/usr/share/terminfo \
--enable-256-color \
diff --git a/fix-doc.patch b/fix-doc.patch
new file mode 100644
index 000000000000..f4ccc435e771
--- /dev/null
+++ b/fix-doc.patch
@@ -0,0 +1,15 @@
+--- doc/rxvt.1.pod.orig 2013-05-26 12:41:15.483013688 +0200
++++ doc/rxvt.1.pod 2013-05-26 12:43:36.189671709 +0200
+@@ -1219,8 +1219,12 @@
+
+ Turn on/off ISO 14755 5.2 mode (default enabled).
+
++=back
++
+ =head1 BACKGROUND IMAGE OPTIONS AND RESOURCES
+
++=over 4
++
+ =item B<-pixmap> I<file[;oplist]>
+
+ =item B<backgroundPixmap:> I<file[;oplist]>
diff --git a/secondaryWheel.patch b/secondaryWheel.patch
index 26cf6a2cce3f..070d4c74819b 100644
--- a/secondaryWheel.patch
+++ b/secondaryWheel.patch
@@ -29,7 +29,7 @@ index 4c93c4b..8b429a0 100644
Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
diff --git a/src/command.C b/src/command.C
-index 82ad10a..92f22da 100644
+index 82ad10a..9bc5e79 100644
--- a/src/command.C
+++ b/src/command.C
@@ -2221,10 +2221,46 @@ rxvt_term::button_release (XButtonEvent &ev)
@@ -61,10 +61,10 @@ index 82ad10a..92f22da 100644
+ for (i = 0; i < 3; ++i)
+ {
+ event.type = KeyPress;
-+ XSendEvent (event.display, event.window, TRUE,
++ XSendEvent (event.display, event.window, True,
+ KeyPressMask, (XEvent *) &event);
+ event.type = KeyRelease;
-+ XSendEvent (event.display, event.window, TRUE,
++ XSendEvent (event.display, event.window, True,
+ KeyPressMask, (XEvent *) &event);
+ }
+ }