From owner-svn-ports-all@freebsd.org Thu May 14 07:40:27 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A9652E815E; Thu, 14 May 2020 07:40:27 +0000 (UTC) (envelope-from gerald@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49N3Nq37gKz41BP; Thu, 14 May 2020 07:40:27 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 66CDB7552; Thu, 14 May 2020 07:40:27 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04E7eRBR004819; Thu, 14 May 2020 07:40:27 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04E7eQUZ004816; Thu, 14 May 2020 07:40:26 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202005140740.04E7eQUZ004816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 14 May 2020 07:40:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535220 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 535220 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2020 07:40:27 -0000 Author: gerald Date: Thu May 14 07:40:26 2020 New Revision: 535220 URL: https://svnweb.freebsd.org/changeset/ports/535220 Log: Revert 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21 from upstream which causes problems upon startup while, hopefully, a fix will be created upstream. (This changes tools/winegcc/winegcc.c) Backport 23543f20058d1655d3ad552474ce99c01bbd78ea from upstream which landed after the Wine 5.8 snapshot (and should be included in the next) and avoid crashes related to fonts. With these two changes Wine should mostly work again. Added: head/emulators/wine-devel/files/patch-dlls-dwrite-opentype.c (contents, props changed) head/emulators/wine-devel/files/patch-tools-winegcc (contents, props changed) Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu May 14 07:36:29 2020 (r535219) +++ head/emulators/wine-devel/Makefile Thu May 14 07:40:26 2020 (r535220) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 5.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Added: head/emulators/wine-devel/files/patch-dlls-dwrite-opentype.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-dlls-dwrite-opentype.c Thu May 14 07:40:26 2020 (r535220) @@ -0,0 +1,27 @@ +The following is a backport of code contributed between Wine 5.8 and 5.9; +it should be included in Wine 5.9 released later this month at which point +this patch can (and should) go again. + +commit 23543f20058d1655d3ad552474ce99c01bbd78ea +Author: Gijs Vermeulen +Date: Mon May 11 15:43:59 2020 +0200 + + dwrite: Set ret on unimplemented lookup in opentype_layout_apply_gsub_lookup. + + Signed-off-by: Gijs Vermeulen + Signed-off-by: Nikolay Sivov + Signed-off-by: Alexandre Julliard + +--- UTC +diff --git dlls/dwrite/opentype.c dlls/dwrite/opentype.c +index 0feb2feadc..f22cd7469b 100644 +--- dlls/dwrite/opentype.c ++++ dlls/dwrite/opentype.c +@@ -4478,6 +4478,7 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont + case GSUB_LOOKUP_LIGATURE_SUBST: + case GSUB_LOOKUP_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: ++ ret = FALSE; + WARN("Unimplemented lookup %d.\n", lookup_type); + break; + default: Added: head/emulators/wine-devel/files/patch-tools-winegcc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-tools-winegcc Thu May 14 07:40:26 2020 (r535220) @@ -0,0 +1,33 @@ +Revert commit 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21 +Author: Alexandre Julliard +Date: Tue Apr 21 11:27:53 2020 +0200 + + winegcc: No longer use a constructor for module initialization. + + Signed-off-by: Alexandre Julliard + +--- UTC +diff --git tools/winegcc/winegcc.c tools/winegcc/winegcc.c +index 8a7db2ad34..9008c457bd 100644 +--- tools/winegcc/winegcc.c ++++ tools/winegcc/winegcc.c +@@ -553,6 +553,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) + strarray_add( flags, "-Wl,--no-wchar-size-warning" ); + if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) + strarray_add( flags, "-Wl,-z,defs" ); ++ if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" )) ++ strarray_add( flags, "-Wl,-init,__wine_spec_init" ); + + strarray_addall( link_args, flags ); + return link_args; +@@ -1408,8 +1410,8 @@ static void build(struct options* opts) + } + } + +- if (!is_pe) fixup_constructors( opts, output_path ); +- else if (opts->wine_builtin) make_wine_builtin( opts, output_path ); ++ if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); ++ if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); + + /* create the loader script */ + if (generate_app_loader)