rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

Accepting request 886647 from home:plater

Browse Source 
- Added wine-6.6_revert_commit_4f78781.patch to fix boo#1184951

OBS-URL: https://build.opensuse.org/request/show/886647
OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=815
This commit is contained in:
Marcus Meissner 2021-04-20 13:09:34 +00:00 committed by Git OBS Bridge
parent 6df51d32aa
commit 1c7e6634e4
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wine-6.6_revert_commit_4f78781.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 694e2544a24..ae8f64f099d 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -915,17 +915,16 @@ no_compat_defines:
}
strarray_add(comp_args, "-D__MSVCRT__");
}
- if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
- for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
+ if (includedir)
{
- if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
- strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
+ strarray_add( comp_args, strmake( "-I%s", includedir ));
+ strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
}
- if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir ));
for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
{
if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
- strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] ));
+ strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] ));
+ strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
}
}
else if (opts->wine_objdir)

5
wine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 19 10:51:51 UTC 2021 - Dave Plater <davejplater@gmail.com>
- Added wine-6.6_revert_commit_4f78781.patch to fix boo#1184951
-------------------------------------------------------------------
Sat Apr 10 06:06:28 UTC 2021 - Marcus Meissner <meissner@suse.com>

4
wine.spec
View File

@ -137,6 +137,8 @@ Source6: wine-msi.desktop
Source5: ubuntuwine.tar.bz2
Source7: baselibs.conf
Source8: wine-rpmlintrc
# PATCH FIX UPSTREAM wine-6.6_revert_commit_4f78781.patch fix https://bugs.winehq.org/show_bug.cgi?id=50996
Patch0: wine-6.6_revert_commit_4f78781.patch
# SUSE specific patches
# - currently none, but add them here
#Patch0: susefixes.patch
@ -216,7 +218,7 @@ libraries.
%prep
%setup -q -n wine-%{realver}
#patch0 -p1
%autopatch -p1
#
cp %{S:3} .
#