commit f3da5c2b787ad30d2ed3e08f0edba74c54c03407
Author: Jan Rękorajski <[email protected]>
Date: Mon May 29 10:10:27 2017 +0200
- up to 3.3.11
- segfaults with system QtSingleApplication, build with bundled
qbittorrent.spec | 7 ++++---
qmake.patch | 20 ++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 1d000bc..89cfe94 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without qsa # build with bundled QtSingleApplication
+%bcond_with qsa # build with bundled QtSingleApplication
%define qtver 5.7
%define rasterbar_ver 2:1.0.11
@@ -8,12 +8,12 @@ Summary: qbittorrent - Qt-based torrent client
Summary(hu.UTF-8): qbittorrent - Qt-alapú torrent kliens
Summary(pl.UTF-8): qbittorrent - graficzny klient torrenta oparty na Qt
Name: qbittorrent
-Version: 3.3.10
+Version: 3.3.11
Release: 1
License: GPL v2+
Group: X11/Applications
Source0:
http://downloads.sourceforge.net/qbittorrent/%{name}-%{version}.tar.xz
-# Source0-md5: 47497bf0fb27ad54efde2bcd5c549e5b
+# Source0-md5: c0b23cc43bb99cf2bf51a2e4d4f6d926
Patch1: qmake.patch
URL: http://qbittorrent.sourceforge.net/
BuildConflicts: libtorrent-rasterbar >= 2:1.1
@@ -94,5 +94,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/appdata/qBittorrent.appdata.xml
%{_mandir}/man1/qbittorrent.1*
%{_iconsdir}/hicolor/*/apps/qbittorrent.png
+%{_iconsdir}/hicolor/*x*/status/qbittorrent-tray.png
%{_desktopdir}/qBittorrent.desktop
%{_pixmapsdir}/qbittorrent.png
diff --git a/qmake.patch b/qmake.patch
index ca61382..193994d 100644
--- a/qmake.patch
+++ b/qmake.patch
@@ -1,16 +1,16 @@
---- qbittorrent-3.2.0/m4/qbittorrent.m4~ 2015-05-10 03:31:33.000000000
+0200
-+++ qbittorrent-3.2.0/m4/qbittorrent.m4 2015-06-25 09:55:58.292190284
+0200
+--- qbittorrent-3.3.11/m4/qbittorrent.m4.orig 2017-05-29 09:55:47.560076042
+0200
++++ qbittorrent-3.3.11/m4/qbittorrent.m4 2017-05-29 09:57:34.790498191
+0200
@@ -12,10 +12,10 @@
[QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
])
--AC_CHECK_FILE([$QT_QMAKE/qmake],
+-AS_IF([test -f "$QT_QMAKE/qmake"],
- [QT_QMAKE="$QT_QMAKE/qmake"],
-- [AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
+- [AS_IF([test -f "$QT_QMAKE/qmake-qt4"],
- [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
-+AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
++AS_IF([test -f "$QT_QMAKE/qmake-qt4"],
+ [QT_QMAKE="$QT_QMAKE/qmake-qt4"],
-+ [AC_CHECK_FILE([$QT_QMAKE/qmake],
++ [AS_IF([test -f "$QT_QMAKE/qmake"],
+ [QT_QMAKE="$QT_QMAKE/qmake"],
[QT_QMAKE=""])
])
@@ -19,13 +19,13 @@
[host_bins])
])
--AC_CHECK_FILE([$QT_QMAKE/qmake],
+-AS_IF([test -f "$QT_QMAKE/qmake"],
- [QT_QMAKE="$QT_QMAKE/qmake"],
-- [AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
+- [AS_IF([test -f "$QT_QMAKE/qmake-qt5"],
- [QT_QMAKE="$QT_QMAKE/qmake-qt5"],
-+AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
++AS_IF([test -f "$QT_QMAKE/qmake-qt5"],
+ [QT_QMAKE="$QT_QMAKE/qmake-qt5"],
-+ [AC_CHECK_FILE([$QT_QMAKE/qmake],
++ [AS_IF([test -f "$QT_QMAKE/qmake"],
+ [QT_QMAKE="$QT_QMAKE/qmake"],
[QT_QMAKE=""])
])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qbittorrent.git/commitdiff/f3da5c2b787ad30d2ed3e08f0edba74c54c03407
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
