Attachment 190247 Details for Bug 225572 – Bump wine-gecko and wine-mono version

[patch] Bump wine-gecko and wine-mono version

wine.diff (text/plain), 5.74 KB, created by David Naylor on 2018-02-01 16:02:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2018-02-01 16:02:58 UTC

Size: 5.74 KB

patch

obsolete

>Index: i386-wine/Makefile.inc
>===================================================================
>--- i386-wine/Makefile.inc	(revision 460369)
>+++ i386-wine/Makefile.inc	(working copy)
>@@ -38,14 +38,12 @@
> PKGMESSAGE=	${WRKDIR}/pkg-message
> SUB_FILES=	pkg-message
> USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
>-USES=		tar:xz
>+USES=		desktop-file-utils tar:xz
> BUNDLE_LIBS=	yes
> 
>-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.40-x86.msi:emulators/wine-gecko
>-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:emulators/wine-mono
>+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko
>+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono
> 
>-PORTSCOUT=	limitw:1,even
>-
> # Included for OPSYS and OSVERSION
> .include <bsd.port.pre.mk>
> 
>@@ -57,8 +55,8 @@
> .endif
> .endfor
> 
>-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1000000) && !(${OSVERSION} >= 1003000 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200056 && ${OSVERSION} < 1300000))
>-IGNORE=		binaries compiled for FreeBSD 10.3+, 11.0+ and -current only
>+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200056 && ${OSVERSION} < 1300000))
>+IGNORE=		binaries compiled for FreeBSD 10.3+, 11.1+ and -current only
> DISTFILES=
> .endif
> 
>@@ -71,6 +69,7 @@
> 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
> 
> ${PLIST}: fetch
>+	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} > /dev/null
> 	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST}
> 
> port-update:
>Index: i386-wine/files/mergeplist.py
>===================================================================
>--- i386-wine/files/mergeplist.py	(revision 460369)
>+++ i386-wine/files/mergeplist.py	(working copy)
>@@ -101,8 +101,9 @@
>             plists[i] = OrderedSet(line.strip() for line in file.readlines())
>     empty = sum(len(plist) == 0 for plist in plists)
>     while empty < plists_len:
>-        line = plists[0].peek()
>         # Test if the top of the plists are all common
>+        if not empty:
>+            line = plists[0].peek()
>         if not empty and all(line == plist.peek() for plist in plists):
>             yield line
>             for plist in plists:
>@@ -116,7 +117,12 @@
>             for line in sorted(lines.keys()):
>                 suffix = lines[line][0].split('-', 2)
>                 suffix = len(suffix) == 2 and suffix[-1]
>-                if suffix and all(name.split('-', 2)[-1] == suffix for name in lines[line]):
>+                single_suffix = False
>+                if suffix:
>+                    plists_suffix_len = sum(1 for name in names if name.endswith(suffix))
>+                    single_suffix = plists_suffix_len == sum(1 for _ in lines[line]) and \
>+                        all(name.split('-', 2)[-1] == suffix for name in lines[line])
>+                if single_suffix:
>                     yield "%%" + suffix + "%%" + line
>                 else:
>                     for name in lines[line]:
>Index: wine/Makefile
>===================================================================
>--- wine/Makefile	(revision 460369)
>+++ wine/Makefile	(working copy)
>@@ -69,7 +69,7 @@
> 
> DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
> 
>-GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko-devel
>+GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko
> 
> GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>@@ -83,7 +83,7 @@
> LIBXSLT_CONFIGURE_WITH=	xslt
> LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
> 
>-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono-devel
>+MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono
> 
> MPG123_CONFIGURE_WITH=	mpg123
> MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
>Index: wine-gecko/Makefile
>===================================================================
>--- wine-gecko/Makefile	(revision 460369)
>+++ wine-gecko/Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	wine-gecko
>-DISTVERSION=	2.40
>+DISTVERSION=	2.47
> CATEGORIES=	emulators
>-MASTER_SITES=	SF/wine/Wine%20Gecko/${DISTVERSION}
>+MASTER_SITES=	http://dl.winehq.org/wine/wine-gecko/${DISTVERSION}/
> DISTNAME=	wine_gecko-${DISTVERSION}-x86
> EXTRACT_SUFX=	.msi
> EXTRACT_ONLY=
>Index: wine-gecko/distinfo
>===================================================================
>--- wine-gecko/distinfo	(revision 460369)
>+++ wine-gecko/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (wine_gecko-2.40-x86.msi) = 1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302
>-SIZE (wine_gecko-2.40-x86.msi) = 31741440
>+TIMESTAMP = 1466965350
>+SHA256 (wine_gecko-2.47-x86.msi) = 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a
>+SIZE (wine_gecko-2.47-x86.msi) = 49266176
>Index: wine-mono/Makefile
>===================================================================
>--- wine-mono/Makefile	(revision 460369)
>+++ wine-mono/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	wine-mono
>-DISTVERSION=	4.6.4
>+DISTVERSION=	4.7.1
> CATEGORIES=	emulators
> MASTER_SITES=	http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/
> EXTRACT_SUFX=	.msi
>Index: wine-mono/distinfo
>===================================================================
>--- wine-mono/distinfo	(revision 460369)
>+++ wine-mono/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1490129095
>-SHA256 (wine-mono-4.6.4.msi) = 91b7d58177b9a9355edf007dab94535471aebdddae12734ceb4a219d2ecc4152
>-SIZE (wine-mono-4.6.4.msi) = 45592064
>+TIMESTAMP = 1502173810
>+SHA256 (wine-mono-4.7.1.msi) = 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa
>+SIZE (wine-mono-4.7.1.msi) = 56470528

Actions: View | Diff

Attachments on bug 225572: 190211 | 190247