Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2021-04-21 21:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Wed Apr 21 21:00:20 2021 rev:337 rq:887336 version:6.6 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2021-04-12 15:49:56.281277464 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new.12324/wine.changes 2021-04-21 21:01:02.502356546 +0200 @@ -1,0 +2,12 @@ +Wed Apr 21 06:40:00 UTC 2021 - Dave Plater <davejpla...@gmail.com> + +- Added upstream fix wine-winegcc-missing-includes.patch and + deleted wine-6.6_revert_commit_4f78781.patch. +- This fixes carla and lmms builds. + +------------------------------------------------------------------- +Mon Apr 19 10:51:51 UTC 2021 - Dave Plater <davejpla...@gmail.com> + +- Added wine-6.6_revert_commit_4f78781.patch to fix boo#1184951. + +------------------------------------------------------------------- New: ---- wine-winegcc-missing-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.ux5nwV/_old 2021-04-21 21:01:03.370357913 +0200 +++ /var/tmp/diff_new_pack.ux5nwV/_new 2021-04-21 21:01:03.374357920 +0200 @@ -137,6 +137,8 @@ Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf Source8: wine-rpmlintrc +# PATCH FIX UPSTREAM wine-winegcc-missing-includes.patch fix https://bugs.winehq.org/show_bug.cgi?id=50996 +Patch0: wine-winegcc-missing-includes.patch # SUSE specific patches # - currently none, but add them here #Patch0: susefixes.patch @@ -216,7 +218,7 @@ %prep %setup -q -n wine-%{realver} -#patch0 -p1 +%autopatch -p1 # cp %{S:3} . # ++++++ wine-winegcc-missing-includes.patch ++++++ --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -904,6 +904,7 @@ no_compat_defines: const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; const char *isystem = gcc_defs ? "-isystem" : "-I"; + const char *idirafter = gcc_defs ? "-idirafter" : "-I"; if (opts->use_msvcrt) { @@ -921,11 +922,11 @@ no_compat_defines: 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] )); } - if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir )); + if (includedir) strarray_add( comp_args, strmake( "%s%s", idirafter, 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( "%s%s%s", idirafter, root, incl_dirs[j] )); } } else if (opts->wine_objdir)
