[gentoo-commits] gentoo-x86 commit in app-emulation/wine/files: wine-1.7.39-gstreamer-v5-staging-pre.patch wine-1.7.39-gstreamer-v5-staging-post.patch

[gentoo-commits] gentoo-x86 commit in app-emulation/wine/files: wine-1.7.39-gstreamer-v5-staging-pre.patch wine-1.7.39-gstreamer-v5-staging-post.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    15/03/22 19:58:44

  Added:                wine-1.7.39-gstreamer-v5-staging-pre.patch
                        wine-1.7.39-gstreamer-v5-staging-post.patch
  Log:
  Version bump from NP-Hardass overlay, see https://www.winehq.org/news/2015032001 for the announcement.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.1                  app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-pre.patch?rev=1.1&content-type=text/plain

Index: wine-1.7.39-gstreamer-v5-staging-pre.patch
===================================================================
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




1.1                  app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.39-gstreamer-v5-staging-post.patch?rev=1.1&content-type=text/plain

Index: wine-1.7.39-gstreamer-v5-staging-post.patch
===================================================================
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