[Pkgbuild-sfe-commits] Rev 5624: spec-files-extra/trunk: SFEwine.spec: Bumped to 1.7.7 (Patched)

[<ke...@us...>]

Revision: 5624
          https://sourceforge.net/p/pkgbuild/code/5624
Author:   kenmays
Date:     2013-12-03 21:55:30 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
SFEwine.spec: Bumped to 1.7.7 (Patched)

Modified Paths:
--------------
    spec-files-extra/trunk/SFEwine.spec

Added Paths:
-----------
    spec-files-extra/trunk/patches/wine-01-solaris.diff

Removed Paths:
-------------
    spec-files-extra/trunk/patches/wine-01-SIOCGIFHWADDR.diff
    spec-files-extra/trunk/patches/wine-03-iphlpapi.diff

Modified: spec-files-extra/trunk/SFEwine.spec
===================================================================
--- spec-files-extra/trunk/SFEwine.spec	2013-12-02 00:11:40 UTC (rev 5623)
+++ spec-files-extra/trunk/SFEwine.spec	2013-12-03 21:55:30 UTC (rev 5624)
@@ -15,7 +15,8 @@
 # Confirmed build of Wine 1.4 on oi_151a/GCC 3.4.3 03/07/12   - Ken Mays
 # Confirmed build of Wine 1.4.1 on oi_151a/GCC 4.6.2 06/16/12   - Ken Mays
 # Confirmed build of Wine 1.6.1 on oi_151a/GCC 4.6.4 11/15/13   - Ken Mays
-#
+# Confirmed build of Wine 1.7.7 on oi_151a/GCC 4.6.4 12/03/13   - Ken Mays
+
 %include Solaris.inc
 
 %define src_url		%{sf_download}/%{sname}
@@ -64,6 +65,7 @@
 Source109:              wine-winemine.desktop
 Source110:              wine-wordpad.desktop
 Source1000:             wine-svg-icons.tar.bz2
+Patch1:			wine-01-solaris.diff
 NoSource:		1
 Group:			System/Virtualization
 License:		LGPL
@@ -116,6 +118,7 @@
 %prep
 %setup -q -n %{sname}-%{version}
 %setup -n %{sname}-%{version} -D -T -a 1000
+%patch1 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -274,6 +277,7 @@
 %changelog
 * Mon Dec 1 2013 - Ken Mays <kma...@gm...>
 - Bump to 1.7.7
+- Added patches/wine-01-solaris.diff
 * Fri Nov 15 2013 - Ken Mays <kma...@gm...>
 - Bump to 1.7.6
 * Sat Jan 19 2013 - Ken Mays <kma...@gm...>

Added: spec-files-extra/trunk/patches/wine-01-solaris.diff
===================================================================
--- spec-files-extra/trunk/patches/wine-01-solaris.diff	                        (rev 0)
+++ spec-files-extra/trunk/patches/wine-01-solaris.diff	2013-12-03 21:55:30 UTC (rev 5624)
@@ -0,0 +1,63 @@
+diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
+index 68b0dfe..bbe4c52 100644
+--- a/dlls/msvcrt/math.c
++++ b/dlls/msvcrt/math.c
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ #include "config.h"
++#include "wine/port.h"
+ 
+ #include <stdio.h>
+ #define __USE_ISOC9X 1
+@@ -33,16 +34,6 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+ 
+-#ifndef HAVE_FINITE
+-#ifndef finite /* Could be a macro */
+-#ifdef isfinite
+-#define finite(x) isfinite(x)
+-#else
+-#define finite(x) (!isnan(x)) /* At least catch some cases */
+-#endif
+-#endif
+-#endif
+-
+ #ifndef signbit
+ #define signbit(x) 0
+ #endif
+diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
+index c37b677..433065a 100644
+--- a/dlls/wined3d/utils.c
++++ b/dlls/wined3d/utils.c
+@@ -3816,7 +3816,7 @@ void wined3d_ftoa(float value, char *s)
+         ++idx;
+ 
+     sprintf(s, "%.8e", value);
+-    if (isfinite(value))
++    if (finite(value))
+         s[idx] = '.';
+ }
+ 
+diff --git a/include/wine/port.h b/include/wine/port.h
+index c5359dd..2fd4215 100644
+--- a/include/wine/port.h
++++ b/include/wine/port.h
+@@ -268,6 +268,16 @@ int isinf(double x);
+ int isnan(double x);
+ #endif
+ 
++#ifndef HAVE_FINITE
++#ifndef finite /* Could be a macro */
++#ifdef isfinite
++#define finite(x) isfinite(x)
++#else
++#define finite(x) (!isnan(x)) /* At least catch some cases */
++#endif
++#endif
++#endif
++
+ #ifndef HAVE_LSTAT
+ int lstat(const char *file_name, struct stat *buf);
+ #endif /* HAVE_LSTAT */


Property changes on: spec-files-extra/trunk/patches/wine-01-solaris.diff
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property