[qbittorrent/f14/master] * Mon Aug 02 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-2 - rebuild for new boost versi

Leigh Scott leigh123linux at fedoraproject.org
Mon Aug 2 18:50:20 UTC 2010


commit 9a4f36df518e7362fa82a7ca1a65567866ff621e
Author: Leigh Scott <leigh123linux at googlemail.com>
Date:   Mon Aug 2 19:50:06 2010 +0100

    * Mon Aug 02 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-2
    - rebuild for new boost version
    - add gcc45 patch (temporary patch till it's fixed properly)

 gcc45_temp_fix.patch |   36 ++++++++++++++++++++++++++++++++++++
 qbittorrent.spec     |    8 +++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/gcc45_temp_fix.patch b/gcc45_temp_fix.patch
new file mode 100644
index 0000000..25dad4b
--- /dev/null
+++ b/gcc45_temp_fix.patch
@@ -0,0 +1,36 @@
+--- qbittorrent-2.3.0/src/main.cpp.orig	2010-07-27 09:03:38.000000000 +0100
++++ qbittorrent-2.3.0/src/main.cpp	2010-08-02 19:26:43.000000000 +0100
+@@ -129,22 +129,6 @@ void sigtermHandler(int) {
+   qDebug("Catching SIGTERM, exiting cleanly");
+   qApp->exit();
+ }
+-void sigsegvHandler(int) {
+-  signal(SIGABRT, 0);
+-  signal(SIGSEGV, 0);
+-  std::cerr << "\n\n*************************************************************\n";
+-  std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
+-  print_stacktrace();
+-  std::raise(SIGSEGV);
+-}
+-void sigabrtHandler(int) {
+-  signal(SIGABRT, 0);
+-  signal(SIGSEGV, 0);
+-  std::cerr << "\n\n*************************************************************\n";
+-  std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
+-  print_stacktrace();
+-  std::raise(SIGABRT);
+-}
+ #endif
+ 
+ #ifndef DISABLE_GUI
+@@ -282,10 +266,8 @@ int main(int argc, char *argv[]){
+   app.setQuitOnLastWindowClosed(false);
+ #endif
+ #if defined(Q_WS_X11) || defined(Q_WS_MAC)
+-  signal(SIGABRT, sigabrtHandler);
+   signal(SIGTERM, sigtermHandler);
+   signal(SIGINT, sigintHandler);
+-  signal(SIGSEGV, sigsegvHandler);
+ #endif
+   // Read torrents given on command line
+   QStringList torrentCmdLine = app.arguments();
diff --git a/qbittorrent.spec b/qbittorrent.spec
index d96a5e9..aaeb97e 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch:   1
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -16,6 +16,7 @@ Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Source1: qbittorrent-nox.README
 Patch0:  disable_extra_debug.patch
 Patch1:  qt_deprecated.patch
+Patch2:  gcc45_temp_fix.patch
 
 # Upstream patches
 
@@ -53,6 +54,7 @@ It aims to be as fast as possible and to provide multi-OS, unicode support.
 %setup -q -n %{name}-%{version}
 #%patch0 -p1 -b .disable_extra_debug
 %patch1 -p1 -b .qt_deprecated
+%patch2 -p1 -b .gcc45_temp_fix
 # Upstream patches
 
 cp -p %{SOURCE1} .
@@ -127,6 +129,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Aug 02 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-2
+- rebuild for new boost version
+- add gcc45 patch (temporary patch till it's fixed properly)
+
 * Tue Jul 27 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-1
 - update to 2.3.0 final
 


More information about the scm-commits mailing list