app-emulation/wine: Drop orphaned patches

Package-Manager: portage-2.3.0

12 files changed, 0 insertions, 876 deletions

diff --git a/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch b/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
deleted file mode 100644
index 823619271315..000000000000
--- a/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1ede664b18bd8a88359a3cebb291ad49833ee033 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 01:29:01 -0400
-Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
-
-If mesa had been built with shared glapi, glAccum is not available in
-libOSMesa without explicitly linking to libGL. In addition, in
-mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
-libglapi if mesa was built with shared glapi, see
-https://bugs.gentoo.org/show_bug.cgi?id=399813
-And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
-libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cc32c24..275b792 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1128,7 +1128,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
- 
-         if test "x$with_osmesa" != "xno"
-         then
--            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
-+                osmesa_save_CC=$CC
-+                CC=$CXX
-+                WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+                CC=$osmesa_save_CC
-+            fi
-             WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
-                              [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
-         fi
--- 
-1.8.0
-
diff --git a/app-emulation/wine/files/wine-1.7.0-freetype-header-location.patch b/app-emulation/wine/files/wine-1.7.0-freetype-header-location.patch
deleted file mode 100644
index aba4b89860ea..000000000000
--- a/app-emulation/wine/files/wine-1.7.0-freetype-header-location.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-From 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 Mon Sep 17 00:00:00 2001
-From: Alexandre Julliard <julliard@winehq.org>
-Date: Sat, 30 Nov 2013 11:22:25 +0100
-Subject: [PATCH] configure: Update FreeType configure checks for the changed
- headers location.
-
----
- configure             | 78 +++++++++++++++------------------------------------
- configure.ac          | 40 +++++++-------------------
- dlls/gdi32/freetype.c | 62 ++++++++++++++--------------------------
- include/config.h.in   | 33 ----------------------
- 4 files changed, 54 insertions(+), 159 deletions(-)
-
-diff --git a/configure b/configure
-index 80348f3..9b2f2c2 100755
---- a/configure
-+++ b/configure
-@@ -11419,7 +11419,21 @@ test "$cross_compiling" = yes || FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-confi
- FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"}
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
-+for ac_header in ft2build.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ft2build_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FT2BUILD_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+        if test "$ac_cv_header_ft2build_h" = "yes"
-+        then
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5
- $as_echo_n "checking for -lfreetype... " >&6; }
- if ${ac_cv_lib_soname_freetype+:} false; then :
-   $as_echo_n "(cached) " >&6
-@@ -11461,7 +11475,7 @@ fi
- if test "x$ac_cv_lib_soname_freetype" = "x"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
- $as_echo "not found" >&6; }
--       ft_lib=no
-+       FREETYPE_LIBS=""
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_freetype" >&5
- $as_echo "$ac_cv_lib_soname_freetype" >&6; }
-@@ -11470,51 +11484,11 @@ cat >>confdefs.h <<_ACEOF
- #define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype"
- _ACEOF
- 
--       ft_lib=yes
--fi
--        if test "$ft_lib" = "yes"
--        then
--    	for ac_header in ft2build.h \
--                             freetype/freetype.h \
--                             freetype/ftglyph.h \
--                             freetype/fttypes.h \
--                             freetype/tttables.h \
--                             freetype/ftsnames.h \
--                             freetype/ttnameid.h \
--                             freetype/ftoutln.h \
--                             freetype/ftwinfnt.h \
--                             freetype/ftmodapi.h \
--                             freetype/ftlcdfil.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H
--# include <ft2build.h>
--#endif
--"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--    	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ft2build.h>
--#include <freetype/fttrigon.h>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
- 
--$as_echo "#define HAVE_FREETYPE_FTTRIGON_H 1" >>confdefs.h
-+$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
- 
--                        wine_cv_fttrigon=yes
--else
--  wine_cv_fttrigon=no
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--            ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <freetype/ftmodapi.h>
-+                 ac_fn_c_check_type "$LINENO" "FT_TrueTypeEngineType" "ac_cv_type_FT_TrueTypeEngineType" "#include <ft2build.h>
-+#include FT_MODULE_H
- "
- if test "x$ac_cv_type_FT_TrueTypeEngineType" = xyes; then :
- 
-@@ -11525,15 +11499,9 @@ _ACEOF
- 
- fi
- 
--    	    	if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
--    	then
--
--$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
--
--            else
--                FREETYPE_LIBS=""
--    	fi
-+fi
-         else
-+            FREETYPE_CFLAGS=""
-             FREETYPE_LIBS=""
-         fi
- CPPFLAGS=$ac_save_CPPFLAGS
-@@ -11541,14 +11509,14 @@ test -z "$FREETYPE_CFLAGS" || FREETYPE_CFLAGS=`echo " $FREETYPE_CFLAGS" | sed 's
- test -z "$FREETYPE_LIBS" || FREETYPE_LIBS=`echo " $FREETYPE_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
- 
- fi
--if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then :
-+if test "x$ac_cv_lib_soname_freetype" = x; then :
-   case "x$with_freetype" in
-   xno) ;;
-   *)   as_fn_error $? "FreeType ${notice_platform}development files not found. Fonts will not be built.
- Use the --without-freetype option if you really want this." "$LINENO" 5 ;;
- esac
- fi
--test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
-+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parport header/ppdev.h" >&5
- $as_echo_n "checking for parport header/ppdev.h... " >&6; }
-diff --git a/configure.ac b/configure.ac
-index 81b7027..c4021b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1463,42 +1463,22 @@ then
-     WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype],
-                        [`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`],
-                        [`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`],
--        [WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS])
--        if test "$ft_lib" = "yes"
-+        [AC_CHECK_HEADERS([ft2build.h])
-+        if test "$ac_cv_header_ft2build_h" = "yes"
-         then
--    	AC_CHECK_HEADERS(ft2build.h \
--                             freetype/freetype.h \
--                             freetype/ftglyph.h \
--                             freetype/fttypes.h \
--                             freetype/tttables.h \
--                             freetype/ftsnames.h \
--                             freetype/ttnameid.h \
--                             freetype/ftoutln.h \
--                             freetype/ftwinfnt.h \
--                             freetype/ftmodapi.h \
--                             freetype/ftlcdfil.h,,,
--                             [#ifdef HAVE_FT2BUILD_H
--# include <ft2build.h>
--#endif])
--    	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
--#include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
--              [Define if you have the <freetype/fttrigon.h> header file.])
--                        wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
--            AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
--    	dnl Check that we have at least freetype/freetype.h
--    	if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
--    	then
--    	    AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
--            else
--                FREETYPE_LIBS=""
--    	fi
-+            WINE_CHECK_SONAME(freetype,FT_Init_FreeType,
-+                [AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-+                 AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <ft2build.h>
-+#include FT_MODULE_H])],
-+                [FREETYPE_LIBS=""],[$FREETYPE_LIBS])
-         else
-+            FREETYPE_CFLAGS=""
-             FREETYPE_LIBS=""
-         fi])
- fi
--WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes],
-+WINE_ERROR_WITH(freetype,[test "x$ac_cv_lib_soname_freetype" = x],
-                 [FreeType ${notice_platform}development files not found. Fonts will not be built.])
--test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no}
-+test "x$ac_cv_lib_soname_freetype" = x && enable_fonts=${enable_fonts:-no}
- 
- dnl **** Check for parport (currently Linux only) ****
- AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
-diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
-index fb4f2af..e230299 100644
---- a/dlls/gdi32/freetype.c
-+++ b/dlls/gdi32/freetype.c
-@@ -77,6 +77,23 @@
- #undef SetRectRgn
- #endif /* HAVE_CARBON_CARBON_H */
- 
-+#ifdef HAVE_FT2BUILD_H
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_TYPES_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_SFNT_NAMES_H
-+#include FT_TRUETYPE_IDS_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
-+#include FT_MODULE_H
-+#include FT_WINFONTS_H
-+#ifdef FT_LCD_FILTER_H
-+#include FT_LCD_FILTER_H
-+#endif
-+#endif /* HAVE_FT2BUILD_H */
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winternl.h"
-@@ -95,43 +112,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
- 
- #ifdef HAVE_FREETYPE
- 
--#ifdef HAVE_FT2BUILD_H
--#include <ft2build.h>
--#endif
--#ifdef HAVE_FREETYPE_FREETYPE_H
--#include <freetype/freetype.h>
--#endif
--#ifdef HAVE_FREETYPE_FTGLYPH_H
--#include <freetype/ftglyph.h>
--#endif
--#ifdef HAVE_FREETYPE_TTTABLES_H
--#include <freetype/tttables.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTYPES_H
--#include <freetype/fttypes.h>
--#endif
--#ifdef HAVE_FREETYPE_FTSNAMES_H
--#include <freetype/ftsnames.h>
--#endif
--#ifdef HAVE_FREETYPE_TTNAMEID_H
--#include <freetype/ttnameid.h>
--#endif
--#ifdef HAVE_FREETYPE_FTOUTLN_H
--#include <freetype/ftoutln.h>
--#endif
--#ifdef HAVE_FREETYPE_FTTRIGON_H
--#include <freetype/fttrigon.h>
--#endif
--#ifdef HAVE_FREETYPE_FTWINFNT_H
--#include <freetype/ftwinfnt.h>
--#endif
--#ifdef HAVE_FREETYPE_FTMODAPI_H
--#include <freetype/ftmodapi.h>
--#endif
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
--#include <freetype/ftlcdfil.h>
--#endif
--
- #ifndef HAVE_FT_TRUETYPEENGINETYPE
- typedef enum
- {
-@@ -186,7 +166,7 @@ MAKE_FUNCPTR(FT_Vector_Transform);
- MAKE_FUNCPTR(FT_Vector_Unit);
- static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos);
- static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
- static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter);
- #endif
- 
-@@ -924,7 +904,7 @@ static BOOL is_hinting_enabled(void)
- 
- static BOOL is_subpixel_rendering_enabled( void )
- {
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
-     static int enabled = -1;
-     if (enabled == -1)
-     {
-@@ -3918,7 +3898,7 @@ static BOOL init_freetype(void)
-     /* Don't warn if these ones are missing */
-     pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0);
-     pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0);
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
-     pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
- #endif
- 
-@@ -6706,7 +6686,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
-     case WINE_GGO_HBGR_BITMAP:
-     case WINE_GGO_VRGB_BITMAP:
-     case WINE_GGO_VBGR_BITMAP:
--#ifdef HAVE_FREETYPE_FTLCDFIL_H
-+#ifdef FT_LCD_FILTER_H
-       {
-         switch (ft_face->glyph->format)
-         {
-diff --git a/include/config.h.in b/include/config.h.in
-index a14db5b..79f8b45 100644
---- a/include/config.h.in
-+++ b/include/config.h.in
-@@ -132,39 +132,6 @@
- /* Define if FreeType 2 is installed */
- #undef HAVE_FREETYPE
- 
--/* Define to 1 if you have the <freetype/freetype.h> header file. */
--#undef HAVE_FREETYPE_FREETYPE_H
--
--/* Define to 1 if you have the <freetype/ftglyph.h> header file. */
--#undef HAVE_FREETYPE_FTGLYPH_H
--
--/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
--#undef HAVE_FREETYPE_FTLCDFIL_H
--
--/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
--#undef HAVE_FREETYPE_FTMODAPI_H
--
--/* Define to 1 if you have the <freetype/ftoutln.h> header file. */
--#undef HAVE_FREETYPE_FTOUTLN_H
--
--/* Define to 1 if you have the <freetype/ftsnames.h> header file. */
--#undef HAVE_FREETYPE_FTSNAMES_H
--
--/* Define if you have the <freetype/fttrigon.h> header file. */
--#undef HAVE_FREETYPE_FTTRIGON_H
--
--/* Define to 1 if you have the <freetype/fttypes.h> header file. */
--#undef HAVE_FREETYPE_FTTYPES_H
--
--/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
--#undef HAVE_FREETYPE_FTWINFNT_H
--
--/* Define to 1 if you have the <freetype/ttnameid.h> header file. */
--#undef HAVE_FREETYPE_TTNAMEID_H
--
--/* Define to 1 if you have the <freetype/tttables.h> header file. */
--#undef HAVE_FREETYPE_TTTABLES_H
--
- /* Define to 1 if the system has the type `fsblkcnt_t'. */
- #undef HAVE_FSBLKCNT_T
- 
--- 
-1.9.1
-
diff --git a/app-emulation/wine/files/wine-1.7.19-makefile-race-cond.patch b/app-emulation/wine/files/wine-1.7.19-makefile-race-cond.patch
deleted file mode 100644
index 294b5ae93943..000000000000
--- a/app-emulation/wine/files/wine-1.7.19-makefile-race-cond.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 5c163b8..b600cf7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,7 +52,8 @@ __tooldeps__: libs/port libs/wine libs/wpp
- __builddeps__: __tooldeps__ include
- .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__
- 
--loader server: libs/port libs/wine tools
-+loader: libs/port libs/wine tools
-+server: libs/port libs/wine tools include
- fonts: tools/sfnt2fon
- include: tools tools/widl
- libs/wine tools: libs/port
-
diff --git a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
deleted file mode 100644
index e20ea2c28dcd..000000000000
--- a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 01:29:01 -0400
-Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
-
-If mesa had been built with shared glapi, glAccum is not available in
-libOSMesa without explicitly linking to libGL. In addition, in
-mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
-libglapi if mesa was built with shared glapi, see
-https://bugs.gentoo.org/show_bug.cgi?id=399813
-And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
-libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 66b4dd6..0303d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1213,7 +1213,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
- 
-         if test "x$with_osmesa" != "xno"
-         then
--            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+            if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
-+                osmesa_save_CC=$CC
-+                CC=$CXX
-+                WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+                CC=$osmesa_save_CC
-+            fi
-             WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
-                              [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
-         fi
--- 
-1.8.3.2
-
diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch
deleted file mode 100644
index 3d653993385c..000000000000
--- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 695c19cdd2fc24aaa7ed89976c4965b376707131 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 25 Feb 2015 22:45:42 +0100
-Subject: ntdll: Fix race-condition when threads are killed during shutdown.
-
-When exit_thread is executed, nb_threads is decremented before the thread is
-fully shutdown. When another thread runs ExitProcess() this will cause a SIGQUIT
-signal to all threads, effectively decrementing nb_threads twice. The process
-will terminate with a wrong exitcode then because the refcount reaches zero too
-early.
-
-Currently Wine has no locking protection of LdrShutdownProcess(), so it can
-only be executed safely when all other threads have terminated before. Most
-likely there are more Wine bugs in this area, but the attached patch should
-fix the most critical one (messed up refcounting of threads) for now.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org> : rebase to be applied after
- Maarten Lankhorst's "override pthreads to fix gstreamer v5" patch.]
----
- dlls/ntdll/thread.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 4f181dc..1bdbcbf 100755
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -461,6 +461,7 @@ static void exit_thread_common( int status )
-     static void *prev_teb;
-     TEB *teb;
- #endif
-+    sigset_t sigset;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-     {
-@@ -473,7 +474,7 @@ static void exit_thread_common( int status )
-         SERVER_END_REQ;
-     }
- 
--    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
-+    if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
-     {
-         LdrShutdownProcess();
-         exit( status );
-@@ -499,6 +500,11 @@ static void exit_thread_common( int status )
-     reap_thread(NtCurrentTeb());
- #endif
- 
-+    sigemptyset( &sigset );
-+    sigaddset( &sigset, SIGQUIT );
-+    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
-+    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-+
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.3.1
-
diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch
deleted file mode 100644
index eee42ff900f8..000000000000
--- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-pre.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0d92921d264d5d0d1041c66353f022f1bc88577f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 8 Mar 2015 00:10:31 -0500
-Subject: [PATCH] Revert "ntdll: Fix race-condition when threads are killed
- during shutdown."
-
-This reverts Sebastian Lackner's Wine-Staging patch to allow Maarten
-Lankhorst's "override pthreads to fix gstreamer v5" to apply
----
- dlls/ntdll/thread.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 74e64c9..3696c8e 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -370,7 +370,6 @@ void terminate_thread( int status )
- void exit_thread( int status )
- {
-     static void *prev_teb;
--    sigset_t sigset;
-     TEB *teb;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-@@ -384,7 +383,7 @@ void exit_thread( int status )
-         SERVER_END_REQ;
-     }
- 
--    if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
-+    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
-     {
-         LdrShutdownProcess();
-         exit( status );
-@@ -406,11 +405,6 @@ void exit_thread( int status )
-         }
-     }
- 
--    sigemptyset( &sigset );
--    sigaddset( &sigset, SIGQUIT );
--    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
--    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
--
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.3.1
-
diff --git a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
deleted file mode 100644
index 25eb2357f9b3..000000000000
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b97783fd33b4d9897c149d7a14747aa4969bd9e9 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:56:04 +0100
-Subject: Reapply various changes conflicting with Maarten Lankhorst's
- gstreamer hack v5.
-
----
- dlls/ntdll/thread.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 1e7f231..cf0461d 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -461,6 +461,8 @@ static void exit_thread_common( int status )
-     static void *prev_teb;
-     TEB *teb;
- #endif
-+    shmlocal_t *shmlocal;
-+    sigset_t sigset;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-     {
-@@ -502,6 +504,11 @@ static void exit_thread_common( int status )
-     reap_thread(NtCurrentTeb());
- #endif
- 
-+    sigemptyset( &sigset );
-+    sigaddset( &sigset, SIGQUIT );
-+    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
-+    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-+
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.3.2
-
diff --git a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch b/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
deleted file mode 100644
index 81aa699be94c..000000000000
--- a/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1527fb44c331f2c61224514beb758895a5f85c8d Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:51:48 +0100
-Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
- hack v5.
-
-Note: These changes have to be reapplied with the corresponding -post patchset
-afterwards.
----
- dlls/ntdll/thread.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 30a4720..843be0f 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -385,8 +385,6 @@ void terminate_thread( int status )
- void exit_thread( int status )
- {
-     static void *prev_teb;
--    shmlocal_t *shmlocal;
--    sigset_t sigset;
-     TEB *teb;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-@@ -425,11 +423,6 @@ void exit_thread( int status )
-         }
-     }
- 
--    sigemptyset( &sigset );
--    sigaddset( &sigset, SIGQUIT );
--    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
--    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
--
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.3.2
-
diff --git a/app-emulation/wine/files/wine-1.7.45-libunwind-osx-only.patch b/app-emulation/wine/files/wine-1.7.45-libunwind-osx-only.patch
deleted file mode 100644
index e7a7905589ca..000000000000
--- a/app-emulation/wine/files/wine-1.7.45-libunwind-osx-only.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 36a9f9dd05c3b9df77c44c91663e9bd6cae1c848 Mon Sep 17 00:00:00 2001
-From: Ken Thomases <ken@codeweavers.com>
-Date: Mon, 15 Jun 2015 20:42:33 -0500
-Subject: [PATCH 1/1] configure: Only check for libunwind.h on OS X.
-
----
- configure    | 13 ++++++++++++-
- configure.ac |  2 +-
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index a104097..c0951db 100755
---- a/configure
-+++ b/configure
-@@ -6626,7 +6626,6 @@ for ac_header in \
- 	lber.h \
- 	ldap.h \
- 	libproc.h \
--	libunwind.h \
- 	link.h \
- 	linux/cdrom.h \
- 	linux/compiler.h \
-@@ -7849,6 +7848,18 @@ uninstall::
-     ;;
- 
-   darwin*|macosx*)
-+    for ac_header in libunwind.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default"
-+if test "x$ac_cv_header_libunwind_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBUNWIND_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-     LIBEXT="dylib"
-     DLLFLAGS="$DLLFLAGS -fPIC"
-     LIBWINE_LDFLAGS="-multiply_defined suppress"
-diff --git a/configure.ac b/configure.ac
-index df28b27..f9df3f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -424,7 +424,6 @@ AC_CHECK_HEADERS(\
- 	lber.h \
- 	ldap.h \
- 	libproc.h \
--	libunwind.h \
- 	link.h \
- 	linux/cdrom.h \
- 	linux/compiler.h \
-@@ -751,6 +750,7 @@ uninstall::
-     ;;
- 
-   darwin*|macosx*)
-+    AC_CHECK_HEADERS(libunwind.h)
-     LIBEXT="dylib"
-     DLLFLAGS="$DLLFLAGS -fPIC"
-     LIBWINE_LDFLAGS="-multiply_defined suppress"
--- 
-1.9.1
-
diff --git a/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch b/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch
deleted file mode 100644
index 9168654a841f..000000000000
--- a/app-emulation/wine/files/wine-1.7.47-critical-security-cookie-fix.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Erich E. Hoover <erich.e.hoover@wine-staging.com>
-Date: Fri, 10 Jul 2015 20:52:33 +0000 (-0600)
-Subject: ntdll: Only set the security cookie if it has not already been set.
-X-Git-Url: http://source.winehq.org/git/wine.git/commitdiff_plain/e9d7cf99ada80ea8345c301481c63a24780f2b63
-
-ntdll: Only set the security cookie if it has not already been set.
----
-
-diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
-index 410e060..ff947da 100644
---- a/dlls/ntdll/virtual.c
-+++ b/dlls/ntdll/virtual.c
-@@ -61,6 +61,12 @@ WINE_DECLARE_DEBUG_CHANNEL(module);
- #define MAP_NORESERVE 0
- #endif
- 
-+#ifdef _WIN64
-+#define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-+#endif
-+#define DEFAULT_SECURITY_COOKIE_32  0xbb40e64e
-+#define DEFAULT_SECURITY_COOKIE_16  (DEFAULT_SECURITY_COOKIE_32 >> 16)
-+
- /* File view */
- struct file_view
- {
-@@ -1053,6 +1059,36 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st )
-     return status;
- }
- 
-+/***********************************************************************
-+ *           set_security_cookie
-+ *
-+ * Create a random security cookie for buffer overflow protection. Make
-+ * sure it does not accidentally match the default cookie value.
-+ */
-+static void set_security_cookie(ULONG_PTR *cookie)
-+{
-+    static ULONG seed;
-+
-+    if (!cookie) return;
-+    if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId();
-+    while (1)
-+    {
-+        if (*cookie == DEFAULT_SECURITY_COOKIE_16)
-+            *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */
-+        else if (*cookie == DEFAULT_SECURITY_COOKIE_32)
-+            *cookie = RtlRandom( &seed );
-+#ifdef DEFAULT_SECURITY_COOKIE_64
-+        else if (*cookie == DEFAULT_SECURITY_COOKIE_64)
-+        {
-+            *cookie = RtlRandom( &seed );
-+            /* fill up, but keep the highest word clear */
-+            *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16;
-+        }
-+#endif
-+        else
-+            break;
-+    }
-+}
- 
- /***********************************************************************
-  *           map_image
-@@ -1285,18 +1321,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
-     loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE,
-                                             IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size );
-     if (loadcfg && loadcfg_size >= sizeof(*loadcfg))
--    {
--        static ULONG seed;
--        ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie;
--
--        if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId();
--        if (cookie)
--        {
--            *cookie = RtlRandom( &seed );
--            if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */
--                *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16;
--        }
--    }
-+        set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie);
- 
-     /* set the image protections */
- 
diff --git a/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-post.patch
deleted file mode 100644
index c36dd4d75063..000000000000
--- a/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-post.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2f0514345d325ecd20a88e3b0cb896ca9d23deae Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:56:04 +0100
-Subject: Reapply various changes conflicting with Maarten Lankhorst's
- gstreamer hack v5.
-
----
- dlls/ntdll/ntdll_misc.h | 1 +
- dlls/ntdll/thread.c     | 7 +++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index e1be304..d5bc678 100644
---- a/dlls/ntdll/ntdll_misc.h
-+++ b/dlls/ntdll/ntdll_misc.h
-@@ -244,6 +244,7 @@ struct ntdll_thread_data
-     WINE_VM86_TEB_INFO vm86;          /* 1fc vm86 private data */
-     void              *exit_frame;    /* 204 exit frame pointer */
- #endif
-+    void              *pthread_stack; /* 208/318 pthread stack */
-     struct list entry;
-     BOOL detached;
- };
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 2011c1e2..9f824eb 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -467,6 +467,8 @@ static void exit_thread_common( int status )
-     static void *prev_teb;
-     TEB *teb;
- #endif
-+    shmlocal_t *shmlocal;
-+    sigset_t sigset;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-     {
-@@ -508,6 +510,11 @@ static void exit_thread_common( int status )
-     reap_thread(NtCurrentTeb());
- #endif
- 
-+    sigemptyset( &sigset );
-+    sigaddset( &sigset, SIGQUIT );
-+    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
-+    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-+
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.6.4
-
diff --git a/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-pre.patch b/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-pre.patch
deleted file mode 100644
index e9c9ac18a166..000000000000
--- a/app-emulation/wine/files/wine-1.7.55-gstreamer-v5-staging-pre.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c96187cdbddd742728557062b85d05ac320c3e8f Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 19 Mar 2015 07:51:48 +0100
-Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
- hack v5.
-
-Note: These changes have to be reapplied with the corresponding -post patchset
-afterwards.
----
- dlls/ntdll/ntdll_misc.h | 1 -
- dlls/ntdll/thread.c     | 7 -------
- 2 files changed, 8 deletions(-)
-
-diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index e7facf3..88531df 100644
---- a/dlls/ntdll/ntdll_misc.h
-+++ b/dlls/ntdll/ntdll_misc.h
-@@ -243,7 +243,6 @@ struct ntdll_thread_data
-     WINE_VM86_TEB_INFO vm86;          /* 1fc vm86 private data */
-     void              *exit_frame;    /* 204 exit frame pointer */
- #endif
--    void              *pthread_stack; /* 208/318 pthread stack */
- };
- 
- C_ASSERT( FIELD_OFFSET(TEB, SpareBytes1) + sizeof(struct ntdll_thread_data) <=
-diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 6ad4b95..3ad51a2 100644
---- a/dlls/ntdll/thread.c
-+++ b/dlls/ntdll/thread.c
-@@ -391,8 +391,6 @@ void terminate_thread( int status )
- void exit_thread( int status )
- {
-     static void *prev_teb;
--    shmlocal_t *shmlocal;
--    sigset_t sigset;
-     TEB *teb;
- 
-     if (status)  /* send the exit code to the server (0 is already the default) */
-@@ -431,11 +429,6 @@ void exit_thread( int status )
-         }
-     }
- 
--    sigemptyset( &sigset );
--    sigaddset( &sigset, SIGQUIT );
--    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
--    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
--
-     close( ntdll_get_thread_data()->wait_fd[0] );
-     close( ntdll_get_thread_data()->wait_fd[1] );
-     close( ntdll_get_thread_data()->reply_fd );
--- 
-2.6.4
-