Added patch for wine64 support on FreeBSD/PC-BSD.

README.md

@@ -35,7 +35,7 @@ Wine. All those differences are also documented on the
 Included bugfixes and improvements
 ==================================
 
-**Bugfixes and features included in the next upcoming release [7]:**
+**Bugfixes and features included in the next upcoming release [8]:**
 
 * Add partially support for sessionStorage
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
@@ -43,6 +43,7 @@ Included bugfixes and improvements
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](http://bugs.winehq.org/show_bug.cgi?id=22682))
 * Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](http://bugs.winehq.org/show_bug.cgi?id=32572))
 * Support for UTF7 encoding/decoding ([Wine Bug #27388](http://bugs.winehq.org/show_bug.cgi?id=27388))
+* Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](http://bugs.winehq.org/show_bug.cgi?id=34330))
 * Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](http://bugs.winehq.org/show_bug.cgi?id=20465))
 
 

debian/changelog

@@ -9,6 +9,9 @@ wine-compholio (1.7.29) UNRELEASED; urgency=low
   * Added patch for implementation of D3DXGetShaderInputSemantics.
   * Added patch to ensure tests check exact return value of ParseURLFromOutsideSourceX.
   * Added patch for additional ATL thunks.
+  * Added patch to add partially support for sessionStorage.
+  * Added patch for implementation of GetNumaProcessorNode.
+  * Added patch for wine64 support on FreeBSD/PC-BSD.
   * Removed patch to fix issues with drag image in ImageLists (accepted upstream).
   * Removed patch to set ldr.EntryPoint for main executable (accepted upstream).
   * Removed patch to implement stubs for [Get|Set]SystemFileCacheSize (accepted upstream).

patches/Makefile

@@ -41,6 +41,7 @@ PATCHLIST := \
 	kernel32-Named_Pipe.ok \
 	kernel32-UTF7_Support.ok \
 	libs-Unicode_Collation.ok \
+	libwine-BSD_mmap_fixed.ok \
 	mshtml-sessionStorage.ok \
 	msvcp90-basic_string_wchar_dtor.ok \
 	ntdll-ATL_Thunk.ok \
@@ -579,10 +580,28 @@ libs-Unicode_Collation.ok:
 		echo '+    { "libs-Unicode_Collation", "Dmitry Timoshkov", "Fix comparison of punctuation characters." },'; \
 	) > libs-Unicode_Collation.ok
 
+# Patchset libwine-BSD_mmap_fixed
+# |
+# | Included patches:
+# |   *	Use try_mmap_fixed for wine64 on FreeBSD. [by André Hentschel]
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#34330] Support for wine64 on FreeBSD/PC-BSD
+# |
+# | Modified files:
+# |   *	libs/wine/mmap.c
+# |
+.INTERMEDIATE: libwine-BSD_mmap_fixed.ok
+libwine-BSD_mmap_fixed.ok:
+	$(call APPLY_FILE,libwine-BSD_mmap_fixed/0001-libwine-Use-try_mmap_fixed-for-wine64-on-FreeBSD.patch)
+	@( \
+		echo '+    { "libwine-BSD_mmap_fixed", "André Hentschel", "Use try_mmap_fixed for wine64 on FreeBSD." },'; \
+	) > libwine-BSD_mmap_fixed.ok
+
 # Patchset mshtml-sessionStorage
 # |
 # | Included patches:
-# |   *	Implement sessionStorage(partially). [by Zhenbo Li]
+# |   *	Implement sessionStorage (partially). [by Zhenbo Li]
 # |
 # | Modified files:
 # |   *	dlls/mshtml/htmlstorage.c, dlls/mshtml/htmlwindow.c, dlls/mshtml/mshtml_private.h, dlls/mshtml/nsiface.idl,
@@ -594,7 +613,7 @@ mshtml-sessionStorage.ok:
 	$(call APPLY_FILE,mshtml-sessionStorage/0002-mshtml-Fixed-create_storage-and-IHTMLStorage-Release.patch)
 	$(call APPLY_FILE,mshtml-sessionStorage/0003-mshtml-Added-IHTMLStorage-getItem-setItem-methods-im.patch)
 	@( \
-		echo '+    { "mshtml-sessionStorage", "Zhenbo Li", "Implement sessionStorage(partially)." },'; \
+		echo '+    { "mshtml-sessionStorage", "Zhenbo Li", "Implement sessionStorage (partially)." },'; \
 	) > mshtml-sessionStorage.ok
 
 # Patchset msvcp90-basic_string_wchar_dtor

patches/libwine-BSD_mmap_fixed/0001-libwine-Use-try_mmap_fixed-for-wine64-on-FreeBSD.patch

@@ -0,0 +1,36 @@
+From addabfd06c4d78e92fa795aaba74c448fb892a1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
+Date: Sat, 3 May 2014 19:01:06 +0200
+Subject: libwine: Use try_mmap_fixed for wine64 on FreeBSD
+
+---
+ libs/wine/mmap.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
+index b219147..36bf1b1 100644
+--- a/libs/wine/mmap.c
++++ b/libs/wine/mmap.c
+@@ -82,7 +82,8 @@ static inline int get_fdzero(void)
+     return fd;
+ }
+ 
+-#if (defined(__svr4__) || defined(__NetBSD__)) && !defined(MAP_TRYFIXED)
++#if (defined(__svr4__) || defined(__NetBSD__) || (defined(__FreeBSD__) && defined(__x86_64__))) && \
++    !defined(MAP_TRYFIXED)
+ /***********************************************************************
+  *             try_mmap_fixed
+  *
+@@ -213,7 +214,8 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
+ #ifdef MAP_TRYFIXED
+         /* If available, this will attempt a fixed mapping in-kernel */
+         flags |= MAP_TRYFIXED;
+-#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__)
++#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) || \
++      (defined(__FreeBSD__) && defined(__x86_64__))
+         if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) )
+             return start;
+ #endif
+-- 
+2.1.2
+

patches/libwine-BSD_mmap_fixed/definition

@@ -0,0 +1,4 @@
+Author: André Hentschel
+Subject: Use try_mmap_fixed for wine64 on FreeBSD.
+Revision: 1
+Fixes: [34330] Support for wine64 on FreeBSD/PC-BSD

patches/mshtml-sessionStorage/definition

@@ -1,5 +1,4 @@
 Author: Zhenbo Li
-Subject: Implement sessionStorage(partially).
+Subject: Implement sessionStorage (partially).
 Revision: 1
 Fixes: Add partially support for sessionStorage
-