Date: Sun, 08 Feb 2026 00:42:11 +0000 From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8205a98493ef - main - emulators/wine: Fix up i386-only patch Message-ID: <6987dbe3.33204.738edf09@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=8205a98493ef24a661b0afb0726cfca7b24312cb commit 8205a98493ef24a661b0afb0726cfca7b24312cb Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2026-02-08 00:34:37 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2026-02-08 00:41:50 +0000 emulators/wine: Fix up i386-only patch --- emulators/wine/files/extra-patch-tools-winebuild-res32 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/emulators/wine/files/extra-patch-tools-winebuild-res32 b/emulators/wine/files/extra-patch-tools-winebuild-res32 index 7c6c62b9fe58..4c77701ff27a 100644 --- a/emulators/wine/files/extra-patch-tools-winebuild-res32 +++ b/emulators/wine/files/extra-patch-tools-winebuild-res32 @@ -27,7 +27,7 @@ to minimize divergence and risk on 64-bit x86). const void *data; unsigned int data_size; unsigned int data_offset; -@@ -158,6 +156,28 @@ static void put_string( const struct string_id *str ) +@@ -139,6 +137,28 @@ static void put_string( const struct string_id *str ) } } @@ -56,7 +56,7 @@ to minimize divergence and risk on 64-bit x86). /* check the file header */ /* all values must be zero except header size */ static int check_header(void) -@@ -179,7 +199,7 @@ static int check_header(void) +@@ -160,7 +180,7 @@ static int check_header(void) } /* load the next resource from the current file */ @@ -64,8 +64,8 @@ to minimize divergence and risk on 64-bit x86). +static void load_next_resource( DLLSPEC *spec ) { unsigned int hdr_size; - struct resource *res = add_resource( spec ); -@@ -189,9 +209,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) + struct resource *res = ARRAY_ADD( &spec->resources, struct resource ); +@@ -170,9 +190,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); @@ -75,7 +75,7 @@ to minimize divergence and risk on 64-bit x86). res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; if ((const unsigned char *)res->data < input_buffer || (const unsigned char *)res->data >= input_buffer + input_buffer_size) -@@ -220,7 +237,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) +@@ -201,7 +218,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) if ((ret = check_header())) { @@ -84,10 +84,10 @@ to minimize divergence and risk on 64-bit x86). } return ret; } -@@ -473,7 +490,7 @@ void output_resources( DLLSPEC *spec ) +@@ -441,7 +458,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.balign 4\n" ); - output( ".L__wine_spec_res_%d:\n", i ); + output( ".L__wine_spec_res_%d:\n", i++ ); - output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size ); + dump_res_data( res ); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6987dbe3.33204.738edf09>