leigh123linux pushed to qbittorrent (master). "update to the latest git (pre beta)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 25 14:23:58 UTC 2015
>From ca8222b653c0fedcbccf3d5d88dd772585ec03b6 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Sat, 25 Apr 2015 15:23:45 +0100
Subject: update to the latest git (pre beta)
diff --git a/.gitignore b/.gitignore
index 31a7044..372660b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/qbittorrent-3.2.0.git94043e6.tar.gz
/qbittorrent-3.2.0.gitb0f767e.tar.gz
/qbittorrent-3.2.0.git060d3fc.tar.gz
+/qbittorrent-3.2.0.git866f965.tar.gz
diff --git a/0001-Fix-compilation-on-ARM.-Closes-2204.patch b/0001-Fix-compilation-on-ARM.-Closes-2204.patch
deleted file mode 100644
index f43381e..0000000
--- a/0001-Fix-compilation-on-ARM.-Closes-2204.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da9396ca947875b6a312b92cda240d82d1051361 Mon Sep 17 00:00:00 2001
-From: sledgehammer999 <hammered999 at gmail.com>
-Date: Tue, 2 Dec 2014 14:26:23 +0200
-Subject: [PATCH] Fix compilation on ARM. Closes #2204.
-
----
- src/qtlibtorrent/torrentspeedmonitor.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qtlibtorrent/torrentspeedmonitor.cpp b/src/qtlibtorrent/torrentspeedmonitor.cpp
-index 9b593ac..82e21c2 100644
---- a/src/qtlibtorrent/torrentspeedmonitor.cpp
-+++ b/src/qtlibtorrent/torrentspeedmonitor.cpp
-@@ -140,7 +140,7 @@ Sample<qreal> SpeedSample::average() const
- if (m_speedSamples.empty())
- return Sample<qreal>();
-
-- return Sample<qreal>(m_sum) * (1. / m_speedSamples.size());
-+ return Sample<qreal>(m_sum) * (qreal(1.) / m_speedSamples.size());
- }
-
- void TorrentSpeedMonitor::removeSamples(const QTorrentHandle& h) {
---
-1.9.3
-
diff --git a/build_flags.patch b/build_flags.patch
index 60c6406..9591087 100644
--- a/build_flags.patch
+++ b/build_flags.patch
@@ -1,14 +1,14 @@
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -14,9 +14,9 @@ exists($$OUT_PWD/../conf.pri) {
- QT += dbus
+ QT += dbus
}
-QMAKE_CXXFLAGS += -Wformat -Wformat-security
+QMAKE_CXXFLAGS += -fPIE -Wformat -Wformat-security
!haiku {
-- QMAKE_LFLAGS_APP += -rdynamic
-+ QMAKE_LFLAGS_APP += -Wl,-z,now -pie -rdynamic
+- QMAKE_LFLAGS_APP += -rdynamic
++ QMAKE_LFLAGS_APP += -Wl,-z,now -pie -rdynamic
}
# Man page
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 7a12b97..842efa1 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -1,10 +1,10 @@
#global _hardened_build 1
-%global _internal_version 060d3fc
+%global _internal_version 866f965
Name: qbittorrent
Summary: A Bittorrent Client
Version: 3.2.0
-Release: 0.12.git%{_internal_version}%{?dist}
+Release: 0.13.git%{_internal_version}%{?dist}
Epoch: 1
License: GPLv2+
URL: http://sourceforge.net/projects/qbittorrent
@@ -16,9 +16,7 @@ Source1: qbittorrent-nox.README
Source2: qbittorrent-nox
Patch0: build_flags.patch
-Patch1: use_system_qjson.patch
-Patch2: remove-donate.patch
-Patch3: 0001-Fix-compilation-on-ARM.-Closes-2204.patch
+Patch1: remove-donate.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -50,19 +48,17 @@ It aims to be as fast as possible and to provide multi-OS, unicode support.
%setup -q -n %{name}-qBittorrent-%{_internal_version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
rm -rf src/qtsingleapp
rm -rf src/webui/qjson
cp -p %{SOURCE1} .
-sed -i -e 's at Exec=qbittorrent %U at Exec=env TMPDIR=/var/tmp qbittorrent %U at g' src/Icons/qBittorrent.desktop
+sed -i -e 's at Exec=qbittorrent %U at Exec=env TMPDIR=/var/tmp qbittorrent %U at g' src/icons/qBittorrent.desktop
%build
# use ./configure instead of %%configure as it doesn't work
# configure and make headless first
mkdir -p build-nox
cd build-nox
-../configure --prefix=%{_prefix} --disable-gui --with-qtsingleapplication=system
+../configure --prefix=%{_prefix} --disable-gui --with-qtsingleapplication=system --with-qjson=system
cp conf.pri ..
make %{?_smp_mflags}
mv -f ../conf.pri ../conf.pri.nox
@@ -70,7 +66,7 @@ mv -f ../conf.pri ../conf.pri.nox
cd ..
mkdir -p build-gui
cd build-gui
-../configure --prefix=%{_prefix} --with-qtsingleapplication=system
+../configure --prefix=%{_prefix} --with-qtsingleapplication=system --with-qjson=system
cp conf.pri ..
make %{?_smp_mflags}
mv -f ../conf.pri ../conf.pri.gui
@@ -112,6 +108,7 @@ fi
%files
%doc README.md NEWS COPYING AUTHORS TODO Changelog
%{_bindir}/qbittorrent
+%{_datadir}/appdata/qBittorrent.appdata.xml
%{_datadir}/applications/qBittorrent.desktop
%{_datadir}/icons/hicolor/*/apps/qbittorrent.png
%{_datadir}/pixmaps/qbittorrent.png
@@ -124,6 +121,9 @@ fi
%{_mandir}/man1/qbittorrent-nox.1*
%changelog
+* Sat Apr 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.13.git866f965
+- update to the latest git (pre beta)
+
* Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 1:3.2.0-0.12.git060d3fc
- Rebuild for boost 1.57.0
diff --git a/remove-donate.patch b/remove-donate.patch
index b2cba3f..91e8b54 100644
--- a/remove-donate.patch
+++ b/remove-donate.patch
@@ -1,6 +1,6 @@
---- a/src/mainwindow.h
-+++ b/src/mainwindow.h
-@@ -218,7 +218,6 @@ private slots:
+--- a/src/gui/mainwindow.h
++++ b/src/gui/mainwindow.h
+@@ -214,7 +214,6 @@ private slots:
void on_actionSpeed_in_title_bar_triggered();
void on_actionTop_tool_bar_triggered();
void on_action_Import_Torrent_triggered();
@@ -8,32 +8,31 @@
void on_actionExecution_Logs_triggered(bool checked);
void on_actionAutoExit_qBittorrent_toggled(bool );
void on_actionAutoSuspend_system_toggled(bool );
---- 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"));
-- actionDonate_money->setIcon(IconProvider::instance()->getIcon("wallet-open"));
- actionExit->setIcon(IconProvider::instance()->getIcon("application-exit"));
- actionIncreasePriority->setIcon(IconProvider::instance()->getIcon("go-up"));
- actionLock_qBittorrent->setIcon(IconProvider::instance()->getIcon("object-locked"));
-@@ -1421,11 +1420,6 @@ void MainWindow::handleUpdateCheckFinish
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -142,7 +142,6 @@ MainWindow::MainWindow(QWidget *parent)
+ actionBottomPriority->setIcon(IconProvider::instance()->getIcon("go-bottom"));
+ actionDelete->setIcon(IconProvider::instance()->getIcon("list-remove"));
+ actionDocumentation->setIcon(IconProvider::instance()->getIcon("help-contents"));
+- actionDonate_money->setIcon(IconProvider::instance()->getIcon("wallet-open"));
+ actionExit->setIcon(IconProvider::instance()->getIcon("application-exit"));
+ actionIncreasePriority->setIcon(IconProvider::instance()->getIcon("go-up"));
+ actionTopPriority->setIcon(IconProvider::instance()->getIcon("go-top"));
+@@ -1505,11 +1504,6 @@ void MainWindow::handleUpdateCheckFinish
}
#endif
-void MainWindow::on_actionDonate_money_triggered()
-{
-- QDesktopServices::openUrl(QUrl("http://sourceforge.net/donate/index.php?group_id=163414"));
+- QDesktopServices::openUrl(QUrl("http://sourceforge.net/donate/index.php?group_id=163414"));
-}
-
void MainWindow::showConnectionSettings()
{
- on_actionOptions_triggered();
-
---- a/src/mainwindow.ui
-+++ b/src/mainwindow.ui
-@@ -52,7 +52,6 @@
+ on_actionOptions_triggered();
+--- a/src/gui/mainwindow.ui
++++ b/src/gui/mainwindow.ui
+@@ -53,7 +53,6 @@
<addaction name="actionBugReport"/>
<addaction name="actionWebsite"/>
<addaction name="actionDocumentation"/>
@@ -41,7 +40,7 @@
<addaction name="actionCheck_for_updates"/>
<addaction name="actionAbout"/>
</widget>
-@@ -308,14 +307,6 @@
+@@ -348,14 +348,6 @@
<string>Import torrent...</string>
</property>
</action>
diff --git a/sources b/sources
index 0884d7d..473c25b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03e5124611c05c4bcef64f399ff19d7e qbittorrent-3.2.0.git060d3fc.tar.gz
+1fc72f0d4140f84bd398401ee9f41452 qbittorrent-3.2.0.git866f965.tar.gz
diff --git a/use_system_qjson.patch b/use_system_qjson.patch
deleted file mode 100644
index 525e9c3..0000000
--- a/use_system_qjson.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/webui/webui.pri
-+++ b/src/webui/webui.pri
-@@ -1,5 +1,7 @@
- INCLUDEPATH += $$PWD
-
-+LIBS += -lqjson
-+
- HEADERS += $$PWD/httpserver.h \
- $$PWD/httpconnection.h \
- $$PWD/httprequestparser.h \
-@@ -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) {
-- include(qjson/qjson.pri)
--}
--
- RESOURCES += $$PWD/webui.qrc
---- a/src/webui/jsonutils.h
-+++ b/src/webui/jsonutils.h
-@@ -36,8 +36,8 @@
- #include <QJsonArray>
- #else
- #include <QString>
--#include "qjson/parser.h"
--#include "qjson/serializer.h"
-+#include <qjson/parser.h>
-+#include <qjson/serializer.h>
- #endif
-
- namespace json {
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qbittorrent.git/commit/?h=master&id=ca8222b653c0fedcbccf3d5d88dd772585ec03b6
More information about the scm-commits
mailing list