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

Accepting request 887226 from home:plater

Browse Source 
- Added upstream fix wine-winegcc-missing-includes.patch and
  deleted wine-6.6_revert_commit_4f78781.patch.
- This fixes carla and lmms builds.

OBS-URL: https://build.opensuse.org/request/show/887226
OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=816
This commit is contained in:
Marcus Meissner 2021-04-21 15:27:08 +00:00 committed by Git OBS Bridge
parent 1c7e6634e4
commit d96fcc1f15
4 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wine-6.6_revert_commit_4f78781.patch
View File

@ -1,27 +0,0 @@
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)

24
wine-winegcc-missing-includes.patch Normal file
View File

@ -0,0 +1,24 @@
--- 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)

9
wine.changes
View File

@ -1,7 +1,14 @@
-------------------------------------------------------------------
Wed Apr 21 06:40:00 UTC 2021 - Dave Plater <davejplater@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 <davejplater@gmail.com>
- Added wine-6.6_revert_commit_4f78781.patch to fix boo#1184951
- 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,8 +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
# 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