Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Dec 2020 09:28:07 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r558081 - in head/emulators/wine-devel: . files
Message-ID:  <202012140928.0BE9S7FX064385@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Mon Dec 14 09:28:07 2020
New Revision: 558081
URL: https://svnweb.freebsd.org/changeset/ports/558081

Log:
  Update to Wine 6.0 RC2, which brings bug fixes only since we're in code
  freeze.
  
  Wine Staging now uses the same version designation as Wine itself after
  a report of mine, so revert special casing STAGING_DISTFILES; similarly
  my two patches files/extrapatch-dlls-ntdll-unix-file.c and
  files/extrapatch-staging-server-fd.c are now upstream, so remove them.

Deleted:
  head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c
  head/emulators/wine-devel/files/extrapatch-staging-server-fd.c
Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/distinfo

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Mon Dec 14 08:45:46 2020	(r558080)
+++ head/emulators/wine-devel/Makefile	Mon Dec 14 09:28:07 2020	(r558081)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	6.0-rc1
+DISTVERSION=	6.0-rc2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -107,14 +107,12 @@ SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
-STAGING_DIST=		v${DISTVERSION:S/-//}.tar.gz
+STAGING_DIST=		v${DISTVERSION}.tar.gz
 STAGING_DISTFILES=	${STAGING_DIST}:staging
 STAGING_EXTRACT_DEPENDS=	bash:shells/bash \
 				git:devel/git \
 				autoconf>0:devel/autoconf
 STAGING_LIB_DEPENDS=	libtxc_dxtn.so:graphics/s2tc
-STAGING_EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c \
-			${PATCHDIR}/extrapatch-staging-server-fd.c
 
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat

Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo	Mon Dec 14 08:45:46 2020	(r558080)
+++ head/emulators/wine-devel/distinfo	Mon Dec 14 09:28:07 2020	(r558081)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1607184256
-SHA256 (wine-6.0-rc1.tar.xz) = 78ddc948f946c662779bd5943d91812740480021bc951cbcadeb102c38b53bc8
-SIZE (wine-6.0-rc1.tar.xz) = 24194552
-SHA256 (v6.0rc1.tar.gz) = 8de3866030ccd2e8387a3079dd543406c739850ab0fcc16e3bf66b55d2d230c6
-SIZE (v6.0rc1.tar.gz) = 10331511
+TIMESTAMP = 1607854914
+SHA256 (wine-6.0-rc2.tar.xz) = f20887cbe62cc42539b21f5823d64fdc310018b1533ebf042da81927f3920d76
+SIZE (wine-6.0-rc2.tar.xz) = 24190236
+SHA256 (v6.0-rc2.tar.gz) = 35b3790a7d8260cfc3e19c09b7868b46187c059b8c35d758934579e6344e710f
+SIZE (v6.0-rc2.tar.gz) = 9815463



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012140928.0BE9S7FX064385>