[arch-commits] Commit in feh/trunk (PKGBUILD keystate.patch)

[Gaetan Bisson]

Date: Wednesday, January 26, 2011 @ 17:49:58
  Author: bisson
Revision: 107746

fast upstream is fast

Modified:
  feh/trunk/PKGBUILD
Deleted:
  feh/trunk/keystate.patch

+
 PKGBUILD   |   11 ---
 keystate.patch |   12 
 2 files changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-26 22:47:11 UTC (rev 107745)
+++ PKGBUILD2011-01-26 22:49:58 UTC (rev 107746)
@@ -5,22 +5,19 @@
 # Contributor: Tom Newsom 
 
 pkgname=feh
-pkgver=1.11
-pkgrel=3
+pkgver=1.11.1
+pkgrel=1
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
 url='http://derf.homelinux.org/projects/feh/'
 license=('MIT')
 depends=('libxinerama' 'giblib' 'perl')
 makedepends=('libxt')
-source=("${url}${pkgname}-${pkgver}.tar.bz2"
-'keystate.patch')
-sha1sums=('cc4209aa197938389b3d6628e75404eff52475cc'
-  '1a3d7f07cc2a7b508480de0eda9e3014ad599543')
+source=("${url}${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5c78db9415c2d81c092ddcd3e94059e05e04953a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../keystate.patch
   make PREFIX=/usr
 }
 

Deleted: keystate.patch
===
--- keystate.patch  2011-01-26 22:47:11 UTC (rev 107745)
+++ keystate.patch  2011-01-26 22:49:58 UTC (rev 107746)
@@ -1,12 +0,0 @@
-diff -aur old/src/keyevents.c new/src/keyevents.c
 old/src/keyevents.c2011-01-22 11:54:26.0 +0100
-+++ new/src/keyevents.c2011-01-26 11:13:20.36674 +0100
-@@ -303,7 +303,7 @@
-   for (i = 0; i < 3; i++) {
-   if (
-   (key->keysyms[i] == sym) && 
--  ((key->keystates[i] | 0x1) == (state | 0x1)))
-+  ((key->keystates[i] | 0x11) == (state | 0x11)))
-   return 1;
-   else if (key->keysyms[i] == 0)
-   return 0;

[arch-commits] Commit in feh/trunk (PKGBUILD keystate.patch)

[Gaetan Bisson]

Date: Wednesday, January 26, 2011 @ 06:09:45
  Author: bisson
Revision: 107497

fix FS#22587

Added:
  feh/trunk/keystate.patch
Modified:
  feh/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 keystate.patch |   12 
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-26 09:06:57 UTC (rev 107496)
+++ PKGBUILD2011-01-26 11:09:45 UTC (rev 107497)
@@ -6,18 +6,21 @@
 
 pkgname=feh
 pkgver=1.11
-pkgrel=2
+pkgrel=3
 pkgdesc='Fast, lightweight image viewer which uses imlib2'
 arch=('i686' 'x86_64')
 url='http://derf.homelinux.org/projects/feh/'
 license=('MIT')
 depends=('libxinerama' 'giblib' 'perl')
 makedepends=('libxt')
-source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('cc4209aa197938389b3d6628e75404eff52475cc')
+source=("${url}${pkgname}-${pkgver}.tar.bz2"
+'keystate.patch')
+sha1sums=('cc4209aa197938389b3d6628e75404eff52475cc'
+  '1a3d7f07cc2a7b508480de0eda9e3014ad599543')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../keystate.patch
   make PREFIX=/usr
 }
 

Added: keystate.patch
===
--- keystate.patch  (rev 0)
+++ keystate.patch  2011-01-26 11:09:45 UTC (rev 107497)
@@ -0,0 +1,12 @@
+diff -aur old/src/keyevents.c new/src/keyevents.c
+--- old/src/keyevents.c2011-01-22 11:54:26.0 +0100
 new/src/keyevents.c2011-01-26 11:13:20.36674 +0100
+@@ -303,7 +303,7 @@
+   for (i = 0; i < 3; i++) {
+   if (
+   (key->keysyms[i] == sym) && 
+-  ((key->keystates[i] | 0x1) == (state | 0x1)))
++  ((key->keystates[i] | 0x11) == (state | 0x11)))
+   return 1;
+   else if (key->keysyms[i] == 0)
+   return 0;