From nobody Sun Oct 24 01:51:23 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E090B180AB75; Sun, 24 Oct 2021 01:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HcLfM4WV5z4lcP; Sun, 24 Oct 2021 01:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BA7447E6; Sun, 24 Oct 2021 01:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19O1pNJo021676; Sun, 24 Oct 2021 01:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19O1pNev021675; Sun, 24 Oct 2021 01:51:23 GMT (envelope-from git) Date: Sun, 24 Oct 2021 01:51:23 GMT Message-Id: <202110240151.19O1pNev021675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 58a766e89fa9 - main - emulators/wine-devel: Package win32u.dll on 64-bit, too List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58a766e89fa983048907cbfa02aebcd4a0fa2251 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=58a766e89fa983048907cbfa02aebcd4a0fa2251 commit 58a766e89fa983048907cbfa02aebcd4a0fa2251 Author: Damjan Jovanovic AuthorDate: 2021-10-24 01:46:39 +0000 Commit: Gerald Pfeifer CommitDate: 2021-10-24 01:50:34 +0000 emulators/wine-devel: Package win32u.dll on 64-bit, too Since upstream commit 80df54a407680859ea777ae0b60aef6f8f378719 in early October 2021, and thus the recent 6.19 release, user32 directly links to win32u which has evolved from a pure stub during that period. We have been packaging win32u since FreeBSD commit 1b62862f143abe52c91f69e09c024d8814fd6b95 and the update to Wine 6.11, alas only on i386. Now it builds and is necessary universally, so package it everywhere. Bump PORTREVISION. PR: 259223 Reported by: Thibault Payet Approved by: maintainer (= author) --- emulators/wine-devel/Makefile | 1 + emulators/wine-devel/pkg-plist | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c4d06c212f90..cc6d1027d0cf 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.19 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index d55ad6aba1af..b04221c936f2 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -2277,7 +2277,7 @@ lib/wine/%%WINEARCH%%-unix/wiaservc.dll.so lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so %%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so -%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32u.dll.so +lib/wine/%%WINEARCH%%-unix/win32u.dll.so lib/wine/%%WINEARCH%%-unix/win32u.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/win87em.dll16.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/winaspi.dll16.so @@ -3314,7 +3314,7 @@ lib/wine/%%WINEARCH%%-windows/wiaservc.dll lib/wine/%%WINEARCH%%-windows/wimgapi.dll %%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32k.sys %%WINE32%%lib/wine/%%WINEARCH%%-windows/win32s16.dll16 -%%WINE32%%lib/wine/%%WINEARCH%%-windows/win32u.dll +lib/wine/%%WINEARCH%%-windows/win32u.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16 %%WINE32%%lib/wine/%%WINEARCH%%-windows/winaspi.dll16 %%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16