aboutsummaryrefslogtreecommitdiffstats
path: root/main/wine
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-07-24 10:37:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-07-24 10:37:14 +0000
commit1df1028d69f2ae81b63581f76dc6d73d9ad8e785 (patch)
treeb7ae1879fea4525ef0e26b9e279b3ac16de3bc06 /main/wine
parent1fd4e7910502c9cf9f314c6be55fe25492b1b5d5 (diff)
downloadaports-1df1028d69f2ae81b63581f76dc6d73d9ad8e785.tar.bz2
aports-1df1028d69f2ae81b63581f76dc6d73d9ad8e785.tar.xz
main/wine: upgrade to 1.3.25
Diffstat (limited to 'main/wine')
-rw-r--r--main/wine/APKBUILD10
-rw-r--r--main/wine/wine-isinf-isnan.patch19
2 files changed, 4 insertions, 25 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index a35c11cdc0..aa06f3a311 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wine
-pkgver=1.3.24
+pkgver=1.3.25
pkgrel=0
pkgdesc="A compatibility layer for running Windows programs"
url="http://www.winehq.com"
@@ -17,7 +17,6 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2
dn_skipname.patch
uclibc-fmaxf-fminf.patch
- wine-isinf-isnan.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -25,7 +24,7 @@ prepare() {
cd "$_builddir"
for i in $source; do
case $i in
- *.patch) patch -p1 -i "$srcdir"/$i || return 1;;
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in \
@@ -50,7 +49,6 @@ package() {
"$pkgdir"/usr/bin/wine
}
-md5sums="c9850862748bde7994bd757574e8974e wine-1.3.24.tar.bz2
+md5sums="15471f78fee9d211c63381da815cbfb6 wine-1.3.25.tar.bz2
6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch
-1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch
-fcf3d2ce29b5f28a055d17d2a2d14d0d wine-isinf-isnan.patch"
+1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch"
diff --git a/main/wine/wine-isinf-isnan.patch b/main/wine/wine-isinf-isnan.patch
deleted file mode 100644
index e97586c8f0..0000000000
--- a/main/wine/wine-isinf-isnan.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./configure.ac.orig
-+++ ./configure.ac
-@@ -2327,6 +2327,8 @@
- fi
-
- dnl Check for isinf
-+ac_save_LIBS="$LIBS"
-+LIBS="$LIBS -lm"
- AC_CACHE_CHECK([for isinf], ac_cv_have_isinf,
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"]))
- if test "$ac_cv_have_isinf" = "yes"
-@@ -2341,6 +2343,7 @@
- then
- AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.])
- fi
-+LIBS="$ac_save_LIBS"
-
- dnl *** check for the need to define platform-specific symbols
-