[arch-commits] Commit in wine/repos (testing-i686 testing-i686/PKGBUILD)

[Eduardo Romero]

    Date: Saturday, July 5, 2008 @ 21:20:42
  Author: eduardo
Revision: 4253

Merged revisions 4113-4252 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/wine/trunk

........
  r4175 | eduardo | 2008-07-04 22:08:29 -0400 (Fri, 04 Jul 2008) | 1 line
........
  r4219 | eduardo | 2008-07-05 12:16:55 -0400 (Sat, 05 Jul 2008) | 1 line
........
  r4250 | eduardo | 2008-07-05 20:23:29 -0400 (Sat, 05 Jul 2008) | 1 line
........

Modified:
  wine/repos/testing-i686/	(properties)
  wine/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)


Property changes on: wine/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /wine/trunk:1-4112
   + /wine/trunk:1-4252

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-07-06 01:15:55 UTC (rev 4252)
+++ testing-i686/PKGBUILD	2008-07-06 01:20:42 UTC (rev 4253)
@@ -1,28 +1,26 @@
 # $Id$
 # Maintainer: Eduardo Romero <eduardo at archlinux.org>
-# Contributor: Matt Smith (Majik) <darkknight at helpdesk.zaz.net>
 pkgname=wine
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Emulator of the Windows 3.x and Win32 APIs"
 url="http://www.winehq.com"
 arch=('i686')
 license=('LGPL')
-depends=('freetype2' 'fontconfig' 'libjpeg' 'libungif' 'alsa-lib' 'glut' 'libldap' 'libxslt' 'lcms' 'libxxf86dga' 'freeglut' \
-         'libxinerama' 'libxcursor' 'libxrandr' 'libxrender' 'libxdamage')
-makedepends=('alsa-lib' 'sane' 'fontforge' 'flex' 'bison' 'libgphoto2' 'mesa' 'esd')
+depends=('fontconfig' 'libldap' 'libxslt' 'lcms' 'libxxf86dga' \
+         'libxcursor' 'libxrandr' 'libxdamage' 'freeglut')
+makedepends=('cups' 'sane' 'fontforge' 'flex' 'bison' 'libgphoto2' \
+             'libxinerama' 'esd' 'libungif' 'alsa-lib' 'ncurses' \
+             'libxcomposite')
+install=wine.install
 source=(http://downloads.sourceforge.net/wine/wine-$pkgver.tar.bz2)
 md5sums=('b2374c4802bbef2f03633e153643b870')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-opengl --with-x
+  ./configure --prefix=/usr --sysconfdir=/etc --with-x --without-capi
   make depend || return 1
   make || return 1
   make prefix=$startdir/pkg/usr install || return 1
-  # expand conflicts with textutils ( doesn't exist anymore ? )
-  # mv $startdir/pkg/usr/bin/expand $startdir/pkg/usr/bin/wine-expand || return 1
   mkdir -p $startdir/pkg/etc/wine
-  # mkdir -p $startdir/pkg/etc/profile.d
-  # cp -r $startdir/src/$pkgname-$pkgver/documentation/samples $startdir/pkg/etc/wine
 }