[arch-commits] Commit in wmii/repos (4 files)

[Andrea Scarpino]

    Date: Tuesday, February 2, 2010 @ 19:23:56
  Author: andrea
Revision: 67080

Merged revisions 67079 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/wmii/trunk

........
  r67079 | andrea | 2010-02-03 01:23:13 +0100 (Wed, 03 Feb 2010) | 2 lines
  
  upgpkg: wmii 3.6-4
      fixed typo in .desktop (FS#18124); added missing libixp-api.patch
........

Added:
  wmii/repos/extra-i686/libixp-api.patch
    (from rev 67079, wmii/trunk/libixp-api.patch)
Modified:
  wmii/repos/extra-i686/	(properties)
  wmii/repos/extra-i686/PKGBUILD
  wmii/repos/extra-i686/wmii.desktop

------------------+
 PKGBUILD         |   20 ++++++++------------
 libixp-api.patch |   27 +++++++++++++++++++++++++++
 wmii.desktop     |    3 +--
 3 files changed, 36 insertions(+), 14 deletions(-)


Property changes on: wmii/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /wmii/trunk:1-57581
   + /wmii/trunk:1-67079

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-03 00:23:13 UTC (rev 67079)
+++ extra-i686/PKGBUILD	2010-02-03 00:23:56 UTC (rev 67080)
@@ -4,25 +4,21 @@
 
 pkgname=wmii
 pkgver=3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Next generation WMI (Window Manager Improved 2)"
 arch=('i686' 'x86_64') 
 license=('MIT')
 url="http://wmii.suckless.org/"
-depends=('glibc' 'libx11' 'libixp>=0.4' 'dmenu' 'libxt')
+depends=('glibc' 'libx11' 'libixp' 'dmenu' 'libxt')
 options=('!makeflags')
-source=(http://dl.suckless.org/wmii/$pkgname-$pkgver.tar.gz
-        libixp-api.patch
-        wmii.desktop)
+source=(http://dl.suckless.org/${pkgname}/$pkgname-$pkgver.tar.gz
+        'libixp-api.patch'
+        'wmii.desktop')
 md5sums=('9d17a09871fada998b4d989d9318bbf5'
-         '3ec94cc2dd2cf38f3e33bc70d2c0193e'
-         '997d01cd35931b548fa7e6d1011ff6d4')
-sha1sums=('48e24f84f60b9c6ce37f715a46bc32e35d2086f3'
-          'ebf3d771b9211a5f3cd3fc9ea90c52892478602e'
-          'd6e1bc22cd326be62084b7380a2fdee9fe6c422a')
+         'ee1cf96b3e0b6068f44100b4bd80a215'
+         'dff79a4ae5303b8f332c4eea8fb1420f')
 
-build()
-{
+build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i $srcdir/libixp-api.patch
 

Copied: wmii/repos/extra-i686/libixp-api.patch (from rev 67079, wmii/trunk/libixp-api.patch)
===================================================================
--- extra-i686/libixp-api.patch	                        (rev 0)
+++ extra-i686/libixp-api.patch	2010-02-03 00:23:56 UTC (rev 67080)
@@ -0,0 +1,27 @@
+Author: James Westby <james.westby at canonical.com>
+Description:
+ Adding patch define IXP_NEEDAPI to 88 so that we get the ixp API that is
+ required. File re-written in hg upstream to use the new API (Closes: #511954).
+
+diff -Naurp wmii.orig/cmd/wmii/dat.h wmii/cmd/wmii/dat.h
+--- wmii.orig/cmd/wmii/dat.h	2009-08-04 10:37:35.000000000 +0000
++++ wmii/cmd/wmii/dat.h	2009-08-04 13:58:48.000000000 +0000
+@@ -5,6 +5,7 @@
+ #define _XOPEN_SOURCE 600
+ #define IXP_P9_STRUCTS
+ #define IXP_NO_P9_
++#define IXP_NEEDAPI 88
+ #include <regexp9.h>
+ #include <stdint.h>
+ #include <ixp.h>
+diff -Naurp wmii.orig/cmd/wmiir.c wmii/cmd/wmiir.c
+--- wmii.orig/cmd/wmiir.c	2009-08-04 10:37:35.000000000 +0000
++++ wmii/cmd/wmiir.c	2009-08-04 13:58:48.000000000 +0000
+@@ -3,6 +3,7 @@
+  */
+ #define IXP_NO_P9_
+ #define IXP_P9_STRUCTS
++#define IXP_NEEDAPI 88
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

Modified: extra-i686/wmii.desktop
===================================================================
--- extra-i686/wmii.desktop	2010-02-03 00:23:13 UTC (rev 67079)
+++ extra-i686/wmii.desktop	2010-02-03 00:23:56 UTC (rev 67080)
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Type=XSession
 Exec=wmii
-TryExec=wmiiwm
+TryExec=wmii
 Name=wmii
 Comment=window manager improved 2
-