diff --git a/qbittorrent-3.0.9-gcc-4.8.patch b/qbittorrent-3.0.9-gcc-4.8.patch deleted file mode 100644 index 12291da..0000000 --- a/qbittorrent-3.0.9-gcc-4.8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qbittorrent-3.0.9/src/main.cpp.orig 2013-06-05 03:31:19.268600050 +0200 -+++ qbittorrent-3.0.9/src/main.cpp 2013-06-05 03:30:06.407413357 +0200 -@@ -207,7 +207,7 @@ - qDebug("Message: %s", qPrintable(message)); - app.sendMessage(message); - } else { // Raise main window -- app.sendMessage("qbt://show"); -+ app.sendMessage((QString)"qbt://show"); - } - return 0; - } diff --git a/qbittorrent-3.1.12-libboost-1.57.patch b/qbittorrent-3.1.12-libboost-1.57.patch deleted file mode 100644 index 88d0ec4..0000000 --- a/qbittorrent-3.1.12-libboost-1.57.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h.orig 2015-02-19 22:16:34.767200481 +0100 -+++ qbittorrent-3.1.11/src/qtlibtorrent/qbtsession.h 2015-02-19 22:12:45.290535475 +0100 -@@ -43,9 +43,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include - #include - #include -+#endif - - #include "qtracker.h" - #include "qtorrenthandle.h" ---- qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/qtlibtorrent/filterparserthread.h 2015-02-19 22:18:32.677199626 +0100 -@@ -37,8 +37,10 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include - #include -+#endif - - using namespace std; - ---- qbittorrent-3.1.11/src/preferences/options_imp.cpp~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/preferences/options_imp.cpp 2015-02-19 22:19:55.923865690 +0100 -@@ -38,7 +38,9 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include -+#endif - - #include "options_imp.h" - #include "preferences.h" ---- qbittorrent-3.1.11/src/preferences/options_imp.h~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/preferences/options_imp.h 2015-02-19 22:20:37.453865390 +0100 -@@ -32,7 +32,9 @@ - #define OPTIONS_IMP_H - - #include "ui_options.h" -+#ifndef Q_MOC_RUN - #include -+#endif - - // actions on double-click on torrents - enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION}; ---- qbittorrent-3.1.11/src/properties/peeraddition.h~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/properties/peeraddition.h 2015-02-19 22:22:30.387197906 +0100 -@@ -36,7 +36,9 @@ - #include - #include - #include "ui_peer.h" -+#ifndef Q_MOC_RUN - #include -+#endif - - #include - #if BOOST_VERSION < 103500 ---- qbittorrent-3.1.11/src/geoip/geoipmanager.h~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/geoip/geoipmanager.h 2015-02-19 22:24:06.623863876 +0100 -@@ -31,7 +31,9 @@ - #ifndef GEOIPMANAGER_H - #define GEOIPMANAGER_H - -+#ifndef Q_MOC_RUN - #include -+#endif - #include - #include - ---- qbittorrent-3.1.11/src/trackerlogin.h~ 2014-10-22 21:45:31.000000000 +0200 -+++ qbittorrent-3.1.11/src/trackerlogin.h 2015-02-19 22:25:55.037196425 +0100 -@@ -33,7 +33,9 @@ - - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif - #include "ui_login.h" - #include "qtorrenthandle.h" - diff --git a/qbittorrent-3.1.8-libqt4-4.8.5.patch b/qbittorrent-3.1.8-libqt4-4.8.5.patch deleted file mode 100644 index 2c319b5..0000000 --- a/qbittorrent-3.1.8-libqt4-4.8.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qbittorrent-3.1.8/src/messageboxraised.h.orig 2014-02-23 15:07:30.560084578 +0100 -+++ qbittorrent-3.1.8/src/messageboxraised.h 2014-02-23 15:06:36.511629586 +0100 -@@ -31,7 +31,7 @@ - #ifndef MESSAGEBOXRAISED_H - #define MESSAGEBOXRAISED_H - --#include -+#include - - class MessageBoxRaised : public QMessageBox - { diff --git a/qbittorrent.spec b/qbittorrent.spec index 4eef4ed..c604e5b 100644 --- a/qbittorrent.spec +++ b/qbittorrent.spec @@ -1,5 +1,5 @@ Name: qbittorrent -Version: 4.6.7 +Version: 5.0.1 Release: 1mamba Summary: Free and reliable P2P Bittorrent client Group: Graphical Desktop/Applications/Networking @@ -9,20 +9,22 @@ Packager: Silvan Calarco URL: https://www.qbittorrent.org/download Source: http://downloads.sourceforge.net/qbittorrent/qbittorrent-%{version}.tar.gz Source1: qbittorrent-nox.README -Patch0: qbittorrent-3.0.9-gcc-4.8.patch -Patch1: qbittorrent-3.1.8-libqt4-4.8.5.patch -Patch2: qbittorrent-3.1.12-libboost-1.57.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libQt5Svg-devel +BuildRequires: libQt6Core +BuildRequires: libQt6DBus +BuildRequires: libQt6Gui +BuildRequires: libQt6Network +BuildRequires: libQt6Sql +BuildRequires: libQt6Widgets +BuildRequires: libQt6Xml BuildRequires: libgcc BuildRequires: libglvnd-devel BuildRequires: libopenssl-devel BuildRequires: libstdc++6-devel BuildRequires: libtorrent-rasterbar-devel BuildRequires: libz-devel -BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: libtorrent-rasterbar-devel >= 1.2.10 BuildRequires: gcc-c++ @@ -38,55 +40,38 @@ Group: Applications/Networking %description nox A Headless Bittorrent Client with a feature rich Web UI allowing users to control the clinet remotely. -#% debug_package +%debug_package %prep %setup -q cp -p %{S:1} doc/README %build -mkdir build-nox build-gui +%cmake \ + -DGUI=ON -# headless version -pushd build-nox -../configure \ - --prefix=%{_prefix} \ - --disable-gui \ - --enable-systemd +%cmake_build -cp conf.pri .. -%make -mv -f ../conf.pri ../conf.pri.nox -popd +%define _vpath_builddir build-nox -# gui version -pushd build-gui -../configure \ - --prefix=%{_prefix} - -# --with-qtsingleapplication=system +%cmake \ + -DGUI=OFF \ + -DSYSTEMD=ON -cp conf.pri .. -%make -mv -f ../conf.pri ../conf.pri.gui -popd +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" # headless version -cp conf.pri.nox conf.pri -make install -C build-nox \ - INSTALL_ROOT=%{buildroot} +%makeinstall -C build-nox #install -d -m0755 %{buildroot}%{_unitdir} #mv %{buildroot}%{_prefix}%{_unitdir}/qbittorrent-nox@.service \ # %{buildroot}%{_unitdir}/qbittorrent-nox@.service # gui version -cp conf.pri.gui conf.pri -make install -C build-gui \ - INSTALL_ROOT=%{buildroot} +%makeinstall -C build %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -95,12 +80,13 @@ make install -C build-gui \ %defattr(-,root,root) %{_bindir}/qbittorrent %{_mandir}/man1/qbittorrent.1* -#%{_datadir}/metainfo/org.qbittorrent.qBittorrent.appdata.xml +%{_metainfodir}/org.qbittorrent.qBittorrent.metainfo.xml %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/status/qbittorrent-tray.png %{_datadir}/icons/hicolor/scalable/apps/qbittorrent.svg %{_datadir}/icons/hicolor/scalable/status/qbittorrent-tray*.svg +%lang(ru) %{_mandir}/ru/man1/qbittorrent.1* %doc AUTHORS COPYING #NEWS TODO Changelog @@ -109,10 +95,14 @@ make install -C build-gui \ %{_bindir}/qbittorrent-nox %{_unitdir}/qbittorrent-nox@.service %{_mandir}/man1/qbittorrent-nox.1* +%lang(ru) %{_mandir}/ru/man1/qbittorrent-nox.1* %doc AUTHORS COPYING #doc/README %changelog +* Sat Nov 02 2024 Automatic Build System 5.0.1-1mamba +- automatic version update by autodist + * Wed Sep 18 2024 Automatic Build System 4.6.7-1mamba - automatic version update by autodist