[qbittorrent] update to the latest git

leigh123linux leigh123linux at fedoraproject.org
Tue Nov 25 11:53:05 UTC 2014


commit d5c1ee6119ea5cc495603f56f7713fefa9f0bb60
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 25 11:52:51 2014 +0000

    update to the latest git

 .gitignore             |    1 +
 qbittorrent.spec       |    7 +++++--
 remove-donate.patch    |   19 ++++++++++---------
 sources                |    2 +-
 use_system_qjson.patch |    8 ++++----
 5 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77cdf21..31a7044 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /qbittorrent-3.2.0.git2b061da.tar.gz
 /qbittorrent-3.2.0.git94043e6.tar.gz
 /qbittorrent-3.2.0.gitb0f767e.tar.gz
+/qbittorrent-3.2.0.git060d3fc.tar.gz
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 7942106..238d955 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -1,10 +1,10 @@
 #global _hardened_build 1
-%global _internal_version b0f767e
+%global _internal_version 060d3fc
 
 Name:    qbittorrent
 Summary: A Bittorrent Client
 Version: 3.2.0
-Release: 0.9.git%{_internal_version}%{?dist}
+Release: 0.10.git%{_internal_version}%{?dist}
 Epoch:   1
 License: GPLv2+
 URL:     http://sourceforge.net/projects/qbittorrent
@@ -122,6 +122,9 @@ fi
 %{_mandir}/man1/qbittorrent-nox.1*
 
 %changelog
+* Tue Nov 25 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.10.git060d3fc
+- update to the latest git
+
 * Mon Oct 27 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.9.gitb0f767e
 - update to the latest git
 
diff --git a/remove-donate.patch b/remove-donate.patch
index 51c1ede..b2cba3f 100644
--- a/remove-donate.patch
+++ b/remove-donate.patch
@@ -1,6 +1,6 @@
---- a/src/mainwindow.h	2014-03-01 11:41:35.000000000 +0000
-+++ b/src/mainwindow.h	2014-09-08 18:49:37.033994067 +0100
-@@ -217,7 +217,6 @@ private slots:
+--- a/src/mainwindow.h
++++ b/src/mainwindow.h
+@@ -218,7 +218,6 @@ private slots:
      void on_actionSpeed_in_title_bar_triggered();
      void on_actionTop_tool_bar_triggered();
      void on_action_Import_Torrent_triggered();
@@ -8,9 +8,9 @@
      void on_actionExecution_Logs_triggered(bool checked);
      void on_actionAutoExit_qBittorrent_toggled(bool );
      void on_actionAutoSuspend_system_toggled(bool );
---- a/src/mainwindow.cpp	2014-03-01 11:41:35.000000000 +0000
-+++ b/src/mainwindow.cpp	2014-09-08 18:59:01.255526985 +0100
-@@ -135,7 +135,6 @@ MainWindow::MainWindow(QWidget *parent,
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -137,7 +137,6 @@ MainWindow::MainWindow(QWidget *parent,
    actionDecreasePriority->setIcon(IconProvider::instance()->getIcon("go-down"));
    actionDelete->setIcon(IconProvider::instance()->getIcon("list-remove"));
    actionDocumentation->setIcon(IconProvider::instance()->getIcon("help-contents"));
@@ -18,7 +18,7 @@
    actionExit->setIcon(IconProvider::instance()->getIcon("application-exit"));
    actionIncreasePriority->setIcon(IconProvider::instance()->getIcon("go-up"));
    actionLock_qBittorrent->setIcon(IconProvider::instance()->getIcon("object-locked"));
-@@ -1412,11 +1411,6 @@ void MainWindow::handleUpdateCheckFinish
+@@ -1421,11 +1420,6 @@ void MainWindow::handleUpdateCheckFinish
  }
  #endif
  
@@ -30,8 +30,9 @@
  void MainWindow::showConnectionSettings()
  {
    on_actionOptions_triggered();
---- a/src/mainwindow.ui	2014-03-01 11:41:35.000000000 +0000
-+++ b/src/mainwindow.ui	2014-09-08 18:51:08.696694259 +0100
+
+--- a/src/mainwindow.ui
++++ b/src/mainwindow.ui
 @@ -52,7 +52,6 @@
      <addaction name="actionBugReport"/>
      <addaction name="actionWebsite"/>
diff --git a/sources b/sources
index 63d8de1..0884d7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad2c768b18a1074930cab9b7a33328b3  qbittorrent-3.2.0.gitb0f767e.tar.gz
+03e5124611c05c4bcef64f399ff19d7e  qbittorrent-3.2.0.git060d3fc.tar.gz
diff --git a/use_system_qjson.patch b/use_system_qjson.patch
index 3187eed..525e9c3 100644
--- a/use_system_qjson.patch
+++ b/use_system_qjson.patch
@@ -8,9 +8,9 @@
  HEADERS += $$PWD/httpserver.h \
             $$PWD/httpconnection.h \
             $$PWD/httprequestparser.h \
-@@ -21,9 +23,4 @@ SOURCES += $$PWD/httpserver.cpp \
-            $$PWD/httprequestheader.cpp \
-            $$PWD/httpresponseheader.cpp
+@@ -23,9 +25,4 @@ SOURCES += $$PWD/httpserver.cpp \
+            $$PWD/abstractrequesthandler.cpp \
+            $$PWD/requesthandler.cpp
  
 -# QJson JSON parser/serializer for using with Qt4
 -lessThan(QT_MAJOR_VERSION, 5) {
@@ -20,7 +20,7 @@
  RESOURCES += $$PWD/webui.qrc
 --- a/src/webui/jsonutils.h
 +++ b/src/webui/jsonutils.h
-@@ -37,8 +37,8 @@
+@@ -36,8 +36,8 @@
  #include <QJsonArray>
  #else
  #include <QString>


More information about the scm-commits mailing list