diff --git a/wine-6.6_revert_commit_4f78781.patch b/wine-6.6_revert_commit_4f78781.patch new file mode 100644 index 0000000..1a4dbfb --- /dev/null +++ b/wine-6.6_revert_commit_4f78781.patch @@ -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) diff --git a/wine.changes b/wine.changes index 1b4e48f..8efa659 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 19 10:51:51 UTC 2021 - Dave Plater + +- Added wine-6.6_revert_commit_4f78781.patch to fix boo#1184951 + ------------------------------------------------------------------- Sat Apr 10 06:06:28 UTC 2021 - Marcus Meissner diff --git a/wine.spec b/wine.spec index c47f4c6..8010198 100644 --- a/wine.spec +++ b/wine.spec @@ -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} . #