diff options
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 8 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls-dbghelp | 61 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 6 |
4 files changed, 10 insertions, 67 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 7470c4eaad2a..b6b401d4fbfd 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 5.5 +DISTVERSION= 5.6 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 95992539c226..dcaf2515b592 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1585468461 -SHA256 (wine-5.5.tar.xz) = a0e3139b0beaa8cd0cd3fbafc96cd6097df615caa7045f377aeccce70cddf5fc -SIZE (wine-5.5.tar.xz) = 23630916 -SHA256 (v5.5.tar.gz) = 3559ed0f91dd9a863b4d3df70c41cdba385ce7a64f15102501a39e9f2c53b69c -SIZE (v5.5.tar.gz) = 9920540 +TIMESTAMP = 1586547097 +SHA256 (wine-5.6.tar.xz) = 50198a7e71d58fbdc521bbfde8b45bd9727b6cff5c8f101b586bc455d1bc00e6 +SIZE (wine-5.6.tar.xz) = 23678216 diff --git a/emulators/wine-devel/files/patch-dlls-dbghelp b/emulators/wine-devel/files/patch-dlls-dbghelp deleted file mode 100644 index cd94b29cbb2c..000000000000 --- a/emulators/wine-devel/files/patch-dlls-dbghelp +++ /dev/null @@ -1,61 +0,0 @@ -From: Gerald Pfeifer <gerald@pfeifer.com> -To: wine-devel@winehq.org, Jacek Caban <jacek@codeweavers.com> -Date: Sat, 28 Mar 2020 16:23:58 +0100 (CET) -Subject: [PATCH] dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined. - -[ Jacek, this materialized as a consequence of your changes - over the last 14 days, between Wine 5.4 and Wine 5.5. ] - -In dlls/dbghelp/module.c we have unconditional code like the following: - - if (note[2] == NT_GNU_BUILD_ID) - { - -NT_GNU_BUILD_ID is #defined in image_private.h, which is #included by -module.c, alas that definition is conditional on __ELF__ *not* being -defined: - - #ifndef __ELF__ - : - #ifndef NT_GNU_BUILD_ID - #define NT_GNU_BUILD_ID 3 - #endif - #endif - -This causes problems on some (newer) versions of FreeBSD, where -apparently __ELF__ is defined while NT_GNU_BUILD_ID is not (at -least not without including sys/elf_common.h which we do not). - -I do not have access to the version of FreeBSD 11.3 where that -issue was reported. It did successfully pass on a different -version of FreeBSD 11.3, though. - -Gerald - - -Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com> ---- - dlls/dbghelp/image_private.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- UTC -diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h -index 9be6d3ebdc..d3c154b713 100644 ---- dlls/dbghelp/image_private.h -+++ dlls/dbghelp/image_private.h -@@ -52,10 +52,11 @@ - #ifndef SHT_NULL - #define SHT_NULL 0 - #endif -+#endif -+ - #ifndef NT_GNU_BUILD_ID - #define NT_GNU_BUILD_ID 3 - #endif --#endif - - /* structure holding information while handling an ELF image - * allows one by one section mapping for memory savings --- -2.25.0 - diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 19665e805165..2c18894617a9 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -168,6 +168,7 @@ include/wine/windows/cmdbas.idl include/wine/windows/cmdtxt.idl include/wine/windows/cmnquery.h include/wine/windows/cmnquery.idl +include/wine/windows/codecapi.h include/wine/windows/colinf.idl include/wine/windows/colordlg.h include/wine/windows/comcat.h @@ -351,6 +352,7 @@ include/wine/windows/dplobby8.h include/wine/windows/dpnathlp.h include/wine/windows/drmexternals.h include/wine/windows/drmexternals.idl +include/wine/windows/dsclient.h include/wine/windows/dsconf.h include/wine/windows/dsgetdc.h include/wine/windows/dshow.h @@ -795,6 +797,8 @@ include/wine/windows/slerror.h include/wine/windows/slpublic.h include/wine/windows/snmp.h include/wine/windows/softpub.h +include/wine/windows/spatialaudioclient.h +include/wine/windows/spatialaudioclient.idl include/wine/windows/sperror.h include/wine/windows/sql.h include/wine/windows/sqlext.h @@ -1424,6 +1428,7 @@ lib/wine/dsdmo.dll.so lib/wine/dsound.dll.so lib/wine/dsquery.dll.so lib/wine/dssenh.dll.so +lib/wine/dsuiext.dll.so lib/wine/dswave.dll.so lib/wine/dwmapi.dll.so lib/wine/dwrite.dll.so @@ -1879,6 +1884,7 @@ lib/wine/fakedlls/dsdmo.dll lib/wine/fakedlls/dsound.dll lib/wine/fakedlls/dsquery.dll lib/wine/fakedlls/dssenh.dll +lib/wine/fakedlls/dsuiext.dll lib/wine/fakedlls/dswave.dll lib/wine/fakedlls/dwmapi.dll lib/wine/fakedlls/dwrite.dll |