[tor-commits] [torbrowser/maint-2.2] move qt and vidalia patches into their own directories

[erinn@xxxxxxxxxxxxxx]

commit aa1fbdf37bdda46b378dd784b337406d9ad084a2
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Sat Oct 29 15:25:19 2011 +0100

    move qt and vidalia patches into their own directories
---
 src/current-patches/qt-interlock-fix.patch         |   36 --------------------
 src/current-patches/qt/qt-interlock-fix.patch      |   36 ++++++++++++++++++++
 src/current-patches/vidalia-killbrowser.patch      |   22 ------------
 .../vidalia/vidalia-killbrowser.patch              |   22 ++++++++++++
 4 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/current-patches/qt-interlock-fix.patch b/src/current-patches/qt-interlock-fix.patch
deleted file mode 100644
index 78464fc..0000000
--- a/src/current-patches/qt-interlock-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- qatomic_windows.h-orig	Wed Nov 26 14:36:33 2008
-+++ qatomic_windows.h	Wed Nov 26 15:11:57 2008
-@@ -190,13 +190,32 @@
- 
- #if !(defined Q_CC_BOR) || (__BORLANDC__ < 0x560)
- 
-+#if defined(Q_CC_GNU)
-+#include <windows.h>
-+#endif
-+
-+#ifndef __INTERLOCKED_DECLARED
-+
-+extern "C" {
-+__declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
-+__declspec(dllimport) long __stdcall InterlockedIncrement(long *);
-+__declspec(dllimport) long __stdcall InterlockedDecrement(long *);
-+__declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
-+__declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
-+}
-+
-+#endif
-+/*
- extern "C" {
-     __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
-     __declspec(dllimport) long __stdcall InterlockedIncrement(long *);
-     __declspec(dllimport) long __stdcall InterlockedDecrement(long *);
-     __declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
-     __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
--}
-+}
-+*/
-+
-+
- 
- #else
- 
diff --git a/src/current-patches/qt/qt-interlock-fix.patch b/src/current-patches/qt/qt-interlock-fix.patch
new file mode 100644
index 0000000..78464fc
--- /dev/null
+++ b/src/current-patches/qt/qt-interlock-fix.patch
@@ -0,0 +1,36 @@
+--- qatomic_windows.h-orig	Wed Nov 26 14:36:33 2008
++++ qatomic_windows.h	Wed Nov 26 15:11:57 2008
+@@ -190,13 +190,32 @@
+ 
+ #if !(defined Q_CC_BOR) || (__BORLANDC__ < 0x560)
+ 
++#if defined(Q_CC_GNU)
++#include <windows.h>
++#endif
++
++#ifndef __INTERLOCKED_DECLARED
++
++extern "C" {
++__declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
++__declspec(dllimport) long __stdcall InterlockedIncrement(long *);
++__declspec(dllimport) long __stdcall InterlockedDecrement(long *);
++__declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
++__declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
++}
++
++#endif
++/*
+ extern "C" {
+     __declspec(dllimport) long __stdcall InterlockedCompareExchange(long *, long, long);
+     __declspec(dllimport) long __stdcall InterlockedIncrement(long *);
+     __declspec(dllimport) long __stdcall InterlockedDecrement(long *);
+     __declspec(dllimport) long __stdcall InterlockedExchange(long *, long);
+     __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long *, long);
+-}
++}
++*/
++
++
+ 
+ #else
+ 
diff --git a/src/current-patches/vidalia-killbrowser.patch b/src/current-patches/vidalia-killbrowser.patch
deleted file mode 100644
index 551b391..0000000
--- a/src/current-patches/vidalia-killbrowser.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/vidalia/mainwindow.cpp
-===================================================================
---- src/vidalia/mainwindow.cpp	(revision 2213)
-+++ src/vidalia/mainwindow.cpp	(working copy)
-@@ -260,6 +260,17 @@
-     _torControl->stop();
-   }
- 
-+  if (_browserProcess->state() != QProcess::NotRunning) {
-+    /* The browser is still running -- ask it to close.
-+       Currently this appears to have no affect, probably because killing
-+       FirefoxPortable doesn't kill firefox.exe. Switching to kil() did
-+       not help either. Once Vidalia starts firefox.exe directly this should work. */
-+    // Ignore the finished signal
-+    QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
-+    // Send the close request
-+    _browserProcess->terminate();
-+  }
-+
-   /* Disconnect all of the TorControl object's signals */
-   QObject::disconnect(_torControl, 0, 0, 0);
- 
diff --git a/src/current-patches/vidalia/vidalia-killbrowser.patch b/src/current-patches/vidalia/vidalia-killbrowser.patch
new file mode 100644
index 0000000..551b391
--- /dev/null
+++ b/src/current-patches/vidalia/vidalia-killbrowser.patch
@@ -0,0 +1,22 @@
+Index: src/vidalia/mainwindow.cpp
+===================================================================
+--- src/vidalia/mainwindow.cpp	(revision 2213)
++++ src/vidalia/mainwindow.cpp	(working copy)
+@@ -260,6 +260,17 @@
+     _torControl->stop();
+   }
+ 
++  if (_browserProcess->state() != QProcess::NotRunning) {
++    /* The browser is still running -- ask it to close.
++       Currently this appears to have no affect, probably because killing
++       FirefoxPortable doesn't kill firefox.exe. Switching to kil() did
++       not help either. Once Vidalia starts firefox.exe directly this should work. */
++    // Ignore the finished signal
++    QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
++    // Send the close request
++    _browserProcess->terminate();
++  }
++
+   /* Disconnect all of the TorControl object's signals */
+   QObject::disconnect(_torControl, 0, 0, 0);
+ 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits