wine: update to 1.7.38

This commit is contained in:
Chaoting Liu 2015-03-07 12:34:54 +00:00
parent 4c5ab1e0c9
commit 2318495745

View File

@ -1,34 +1,17 @@
<<<<<<< HEAD
# maintainer: Giuseppe Cala' <jiveaxe@gmail.com>
pkgname=wine
pkgver=1.7.37
pkgver=1.7.38
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
30-win32-aliases.conf
https://github.com/wine-compholio/wine-staging/archive/v${pkgver}.tar.gz)
https://github.com/wine-compholio/wine-staging/archive/v1.7.37.tar.gz)
md5sums=('99741c9efece0bf062b39992b63cf5ca'
md5sums=('0e2c4eae7b5093cb4b7018974994915f'
'1ff4e467f59409272088d92173a0f801'
'40feaf4d51cae9c575f638fbf6634f2b')
=======
# Lib32 Packages for Chakra, part of chakra-project.org
#
# maintainer: Giuseppe Calà <gcala[at]chakra-project[dot]org>
pkgname=wine
pkgver=1.7.0
pkgrel=2
_pkgbasever=${pkgver/rc/-rc}
source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2
30-win32-aliases.conf)
#http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
md5sums=('24789490809ddb5db5286819b3fdfed5'
'1ff4e467f59409272088d92173a0f801')
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
pkgdesc="A compatibility layer for running Windows programs"
url="http://www.winehq.com"
categories=('system')
@ -39,7 +22,6 @@ install=wine.install
depends=(
fontconfig lib32-fontconfig
<<<<<<< HEAD
libxcursor lib32-libxcursor
libxrandr lib32-libxrandr
libxdamage lib32-libxdamage
@ -49,43 +31,19 @@ depends=(
glu lib32-glu
libsm lib32-libsm
gcc-libs lib32-gcc-libs
=======
mesa lib32-mesa
libglapi lib32-libglapi
libxcursor lib32-libxcursor
libxrandr lib32-libxrandr
libxdamage lib32-libxdamage
libxxf86dga lib32-libxxf86dga
alsa-lib lib32-alsa-lib
lcms lib32-lcms
mpg123 lib32-mpg123
openal lib32-openal
libxml2 lib32-libxml2
libxi lib32-libxi
gettext lib32-gettext
gstreamer0.10-base lib32-gstreamer0.10-base
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
desktop-file-utils
)
makedepends=(autoconf ncurses bison perl fontforge flex prelink
'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
giflib lib32-giflib
<<<<<<< HEAD
libpng lib32-libpng
gnutls lib32-gnutls
=======
libxpm lib32-libxpm
libpng lib32-libpng
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
libxinerama lib32-libxinerama
libxcomposite lib32-libxcomposite
libxmu lib32-libxmu
libxxf86vm lib32-libxxf86vm
libxml2 lib32-libxml2
<<<<<<< HEAD
libldap lib32-libldap
lcms2 lib32-lcms2
mpg123 lib32-mpg123
@ -98,25 +56,11 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
libcl lib32-libcl
libxslt lib32-libxslt
jack lib32-jack
=======
libxslt lib32-libxslt
libldap lib32-libldap
lcms lib32-lcms
mpg123 lib32-mpg123
openal lib32-openal
jack lib32-jack
libcups lib32-libcups
gnutls lib32-gnutls
v4l-utils lib32-v4l-utils
alsa-lib lib32-alsa-lib
oss
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
samba
opencl-headers
)
optdepends=(
<<<<<<< HEAD
giflib lib32-giflib
libpng lib32-libpng
libldap lib32-libldap
@ -147,23 +91,6 @@ prepare() {
# Get rid of old build dirs
rm -rf $pkgname-{32,64}-build
=======
giflib lib32-giflib
libpng lib32-libpng
libldap lib32-libldap
jack lib32-jack
libcups lib32-libcups
gnutls lib32-gnutls
v4l-utils lib32-v4l-utils
oss cups
samba
)
build() {
cd "$srcdir"
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
# Allow ccache to work
mv $pkgname-$_pkgbasever $pkgname
@ -172,32 +99,25 @@ build() {
sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
<<<<<<< HEAD
cd $pkgname
for _patch in $(ls $srcdir/wine-staging-$pkgver/patches/winepulse-PulseAudio_Support/*.patch) ; do
for _patch in $(ls $srcdir/wine-staging-1.7.37/patches/winepulse-PulseAudio_Support/*.patch) ; do
patch -p1 < $_patch
done
autoreconf
autoreconf -vfi
# These additional CPPFLAGS solve FS#27662 and FS#34195
export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
}
=======
# Get rid of old build dirs
rm -rf $pkgname-{32,64}-build
mkdir $pkgname-32-build
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
build() {
cd $srcdir
msg2 "Building Wine-64..."
<<<<<<< HEAD
mkdir -p $pkgname-64-build
=======
mkdir $pkgname-64-build
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
cd "$srcdir/$pkgname-64-build"
../$pkgname/configure \
--prefix=/usr \
@ -244,15 +164,6 @@ package() {
make prefix="$pkgdir/usr" \
libdir="$pkgdir/usr/lib" \
dlldir="$pkgdir/usr/lib/wine" install
<<<<<<< HEAD
=======
# Font aliasing settings for Win32 applications
install -d "$pkgdir"/etc/fonts/conf.{avail,d}
install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
}
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
# Font aliasing settings for Win32 applications
install -d "$pkgdir"/etc/fonts/conf.{avail,d}