Removed patch for wine64 support on FreeBSD (accepted upstream).

README.md

@@ -160,7 +160,7 @@ Included bug fixes and improvements
 * Support for process ACLs ([Wine Bug #22006](https://bugs.winehq.org/show_bug.cgi?id=22006))
 * Support for setcap on wine-preloader ([Wine Bug #26256](https://bugs.winehq.org/show_bug.cgi?id=26256))
 * Support for stored file ACLs ([Wine Bug #31858](https://bugs.winehq.org/show_bug.cgi?id=31858))
-* Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](https://bugs.winehq.org/show_bug.cgi?id=34330))
+* ~~Support for wine64 on FreeBSD/PC-BSD~~ ([Wine Bug #34330](https://bugs.winehq.org/show_bug.cgi?id=34330))
 * Tumblebugs 2 requires DXTn software encoding support ([Wine Bug #29586](https://bugs.winehq.org/show_bug.cgi?id=29586))
 * ~~Unity3D Editor requires ProductId registry value~~ ([Wine Bug #36964](https://bugs.winehq.org/show_bug.cgi?id=36964))
 * Update a XIM candidate position when cursor location changes ([Wine Bug #30938](https://bugs.winehq.org/show_bug.cgi?id=30938))

debian/changelog

@@ -26,6 +26,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
   * Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream).
   * Removed patch to export SHILCreateFromPath by name (accepted upstream).
   * Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream).
+  * Removed patch for wine64 support on FreeBSD (accepted upstream).
   * Partially removed patches for ntdll DOS attributes (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 15 Dec 2014 22:42:09 +0100
 

patches/Makefile

@@ -59,7 +59,6 @@ PATCHLIST := \
 	kernel32-UTF7_Support.ok \
 	kernel32-VerifyVersionInfo.ok \
 	libs-Unicode_Collation.ok \
-	libwine-BSD_mmap_fixed.ok \
 	makedep-PARENTSPEC.ok \
 	msdmo-Fix_Typo.ok \
 	msvcp90-basic_string_wchar_dtor.ok \
@@ -840,21 +839,6 @@ libs-Unicode_Collation.ok:
 		echo '+    { "Dmitry Timoshkov", "libs: Fix most problems with CompareString.", 1 },'; \
 	) > libs-Unicode_Collation.ok
 
-# Patchset libwine-BSD_mmap_fixed
-# |
-# | 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 '+    { "André Hentschel", "libwine: Use try_mmap_fixed for wine64 on FreeBSD.", 1 },'; \
-	) > libwine-BSD_mmap_fixed.ok
-
 # Patchset makedep-PARENTSPEC
 # |
 # | Modified files:

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

@@ -1,36 +0,0 @@
-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

@@ -1 +0,0 @@
-Fixes: [34330] Support for wine64 on FreeBSD/PC-BSD