[arch-commits] CVS update of extra/x11/emerald (PKGBUILD wnck-2.20.patch)

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 16:09:25
  Author: jgc
    Path: /home/cvs-extra/extra/x11/emerald

   Added: wnck-2.20.patch (1.1)
Modified: PKGBUILD (1.2 -> 1.3)

upgpkg: emerald 0.2.1-2
libwnck bump


-----------------+
 PKGBUILD        |   16 +++++++++-------
 wnck-2.20.patch |   10 ++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)


Index: extra/x11/emerald/PKGBUILD
diff -u extra/x11/emerald/PKGBUILD:1.2 extra/x11/emerald/PKGBUILD:1.3
--- extra/x11/emerald/PKGBUILD:1.2	Sun Apr  1 20:30:08 2007
+++ extra/x11/emerald/PKGBUILD	Sun Sep 23 16:09:25 2007
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD,v 1.2 2007/04/02 00:30:08 thomas Exp $
+# $Id: PKGBUILD,v 1.3 2007/09/23 20:09:25 jgc Exp $
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=emerald
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The beryl window decorator"
 url="http://www.beryl-project.org/"
-depends=('libwnck>=2.16.1' 'beryl-core')
-makedepends=('intltool' 'pkgconfig')
+depends=('libwnck>=2.20.0' 'beryl-core')
+makedepends=('perlxml' 'pkgconfig')
 groups=('beryl')
 conflicts=('emerald-svn')
-options=(NOLIBTOOL)
+options=(!libtool)
 arch=('i686' 'x86_64')                                                         
 license=('GPL')                                                                
-source=(http://releases.beryl-project.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dde0e2b5cbe405961a350e6d47d2445f')
+source=(http://releases.beryl-project.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+	wnck-2.20.patch)
+md5sums=('dde0e2b5cbe405961a350e6d47d2445f' '996e94b94708bbfff12b1edcd88a8a85')
 
 build() {
   cd $startdir/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/wnck-2.20.patch || return 1
   ./configure --prefix=/usr --enable-mime-update=no
   make || return 1
   make DESTDIR=$startdir/pkg install
Index: extra/x11/emerald/wnck-2.20.patch
diff -u /dev/null extra/x11/emerald/wnck-2.20.patch:1.1
--- /dev/null	Sun Sep 23 16:09:25 2007
+++ extra/x11/emerald/wnck-2.20.patch	Sun Sep 23 16:09:25 2007
@@ -0,0 +1,10 @@
+--- src/main.c.orig	2007-09-23 20:07:39.000000000 +0000
++++ src/main.c	2007-09-23 20:07:51.000000000 +0000
+@@ -3781,7 +3781,6 @@
+ 		return;
+ 	case WNCK_WINDOW_NORMAL:
+ 	case WNCK_WINDOW_DIALOG:
+-	case WNCK_WINDOW_MODAL_DIALOG:
+ 	case WNCK_WINDOW_TOOLBAR:
+ 	case WNCK_WINDOW_MENU:
+ 	case WNCK_WINDOW_UTILITY: