diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2011-07-07 15:51:06 +0000 |
|---|---|---|
| committer | Fabian Affolter <fabian@affolter-engineering.ch> | 2011-07-07 15:51:06 +0000 |
| commit | 03c0cafd0ff6fb73231b27e498533cf4375343f2 (patch) | |
| tree | e4f0539879651f97926ed510ef7e1d1b7c0523bd /main/wine | |
| parent | 021c1656e1448233378ed5d4035d0a392bb6aa5e (diff) | |
| parent | 8c48da01414415a08c2d06ae76d50089078c26c0 (diff) | |
| download | aports-03c0cafd0ff6fb73231b27e498533cf4375343f2.tar.bz2 aports-03c0cafd0ff6fb73231b27e498533cf4375343f2.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/wine')
| -rw-r--r-- | main/wine/APKBUILD | 12 | ||||
| -rw-r--r-- | main/wine/wine-isinf-isnan.patch | 19 |
2 files changed, 27 insertions, 4 deletions
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 2e7e3304e..6bdde9e65 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.22 +pkgver=1.3.23 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -12,10 +12,12 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libpng-dev jpeg-dev freetype-dev ncurses-dev openssl-dev libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev fontconfig-dev cups-dev alsa-lib-dev lcms-dev libxml2-dev - gstreamer-dev gst-plugins-base-dev paxctl" + gstreamer-dev gst-plugins-base-dev paxctl + autoconf automake" 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 @@ -29,6 +31,7 @@ prepare() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in \ || return 1 sed -i '/^MimeType/d' tools/wine.desktop || return 1 + aclocal && autoreconf || return 1 } build() { @@ -47,6 +50,7 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="46f313013644d31ad37b8fc5c2c16467 wine-1.3.22.tar.bz2 +md5sums="71f05bf37c25648f8dbc793dda3da45c wine-1.3.23.tar.bz2 6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch -1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch" +1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch +fcf3d2ce29b5f28a055d17d2a2d14d0d wine-isinf-isnan.patch" diff --git a/main/wine/wine-isinf-isnan.patch b/main/wine/wine-isinf-isnan.patch new file mode 100644 index 000000000..e97586c8f --- /dev/null +++ b/main/wine/wine-isinf-isnan.patch @@ -0,0 +1,19 @@ +--- ./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 + |