[arch-commits] Commit in wmii/trunk (5 files)

Wed Jun 23 18:55:39 UTC 2010

Date: Wednesday, June 23, 2010 @ 14:55:39
  Author: andrea
Revision: 83919

upgpkg: wmii 3.9.2-1
upstream release

Added:
  wmii/trunk/fix-freetype-include.patch
Modified:
  wmii/trunk/PKGBUILD
Deleted:
  wmii/trunk/config.mk
  wmii/trunk/libixp-api.patch
  wmii/trunk/wmii.desktop

----------------------------+
 PKGBUILD                   |   44 ++++++++++++++++++++-----------------------
 config.mk                  |   24 -----------------------
 fix-freetype-include.patch |   11 ++++++++++
 libixp-api.patch           |   27 --------------------------
 wmii.desktop               |    7 ------
 5 files changed, 32 insertions(+), 81 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2010-06-23 16:46:27 UTC (rev 83918)
+++ PKGBUILD	2010-06-23 18:55:39 UTC (rev 83919)
@@ -3,38 +3,36 @@
 # Contributor: Jeffrey 'jf' Lim <jfs.world at gmail.com>
 
 pkgname=wmii
-pkgver=3.6
-pkgrel=4
-pkgdesc="Next generation WMI (Window Manager Improved 2)"
+pkgver=3.9.2
+pkgrel=1
+pkgdesc="A small, dynamic window manager for X11"
 arch=('i686' 'x86_64') 
 license=('MIT')
 url="http://wmii.suckless.org/"
-depends=('glibc' 'libx11' 'libixp' 'dmenu' 'libxt')
+depends=('libxft' 'libxrandr' 'libxinerama' 'dash')
 options=('!makeflags')
-source=(http://dl.suckless.org/${pkgname}/$pkgname-$pkgver.tar.gz
-        'libixp-api.patch'
-        'wmii.desktop')
-md5sums=('9d17a09871fada998b4d989d9318bbf5'
-         'ee1cf96b3e0b6068f44100b4bd80a215'
-         'dff79a4ae5303b8f332c4eea8fb1420f')
+source=(http://dl.suckless.org/${pkgname}/${pkgname}+ixp-${pkgver}.tbz
+	'fix-freetype-include.patch')
+md5sums=('3d480502b7b1e2a405d941df67f16bcf'
+	'97febd4a1df80aa4afbd126de1f36496')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/libixp-api.patch
+  cd ${srcdir}/${pkgname}+ixp-${pkgver}
 
-  sed -i \
-        -e "/^PREFIX/s|=.*|= ${pkgdir}/usr|" \
-		-e "/^ETC/s|=.*|= ${pkgdir}/etc|" \
-		-e "/^LIBDIR/s|=.*|= /usr/lib|" \
-		config.mk || return 1
+  patch -Np1 -i ${srcdir}/fix-freetype-include.patch
 
-  make -j1 || return 1
-  make -j1 DESTDIR=$pkgdir install
+  sed -i 's|PREFIX = /usr/local|PREFIX = /usr|' config.mk
+  sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
+  
+  export MAKEFLAGS="-j1"
+  make
+}
 
-  install -Dm644 $srcdir/wmii.desktop $pkgdir/usr/share/xsessions/wmii.desktop
+package() {
+  cd ${srcdir}/${pkgname}+ixp-${pkgver}
+  make DESTDIR=${pkgdir} install
 
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/wmii/LICENSE
+  install -Dm644 debian/file/wmii.desktop ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
 
-  # Rid paths of temporary install directory.
-  sed -i -e "s|${pkgdir}||g" "${pkgdir}/usr/bin/wmiistartrc"
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/${pkgname}/LICENSE
 }

Deleted: config.mk
===================================================================
--- config.mk	2010-06-23 16:46:27 UTC (rev 83918)
+++ config.mk	2010-06-23 18:55:39 UTC (rev 83919)
@@ -1,24 +0,0 @@
-# Customized for Arch Linux <http://archlinux.org/>
-
-# paths
-PREFIX = /usr
-CONFPREFIX = /etc
-MANPREFIX = ${PREFIX}/man
-
-X11INC = /usr/include/X11
-X11LIB = /usr/lib
-
-VERSION = 3.5.1
-
-# includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/include -lc -L${X11LIB} -lX11 -lixp -lm
-
-# Linux/BSD
-CFLAGS = -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-	-DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-
-AR = ar cr
-CC = cc
-LD = ${CC}
-RANLIB = ranlib

Added: fix-freetype-include.patch
===================================================================
--- fix-freetype-include.patch	                        (rev 0)
+++ fix-freetype-include.patch	2010-06-23 18:55:39 UTC (rev 83919)
@@ -0,0 +1,11 @@
+--- wmii+ixp-3.9.2/config.mk	2010-06-23 20:31:44.171778303 +0200
++++ wmii+ixp-3.9.2/config.mk~	2010-06-23 20:28:03.285253275 +0200
+@@ -10,7 +10,7 @@
+   INCLUDE = $(PREFIX)/include
+ 
+ # Includes and libs
+-INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
++INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include/ -I/usr/include/freetype2
+ LIBS = -L$(ROOT)/lib -L/usr/lib
+ 
+ TERMINAL = xterm

Deleted: libixp-api.patch
===================================================================
--- libixp-api.patch	2010-06-23 16:46:27 UTC (rev 83918)
+++ libixp-api.patch	2010-06-23 18:55:39 UTC (rev 83919)
@@ -1,27 +0,0 @@
-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>

Deleted: wmii.desktop
===================================================================
--- wmii.desktop	2010-06-23 16:46:27 UTC (rev 83918)
+++ wmii.desktop	2010-06-23 18:55:39 UTC (rev 83919)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=wmii
-TryExec=wmii
-Name=wmii
-Comment=window manager improved 2


