From 27b5c4f8013ff11a41bd57661ed1f0c8aab16123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 27 Dec 2018 19:56:55 +0100 Subject: [PATCH] qbittorrent: update to 4.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/qbittorrent/patches/cpp14-x11.patch | 39 --------------------- srcpkgs/qbittorrent/template | 4 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/qbittorrent/patches/cpp14-x11.patch diff --git a/srcpkgs/qbittorrent/patches/cpp14-x11.patch b/srcpkgs/qbittorrent/patches/cpp14-x11.patch deleted file mode 100644 index 4d5824b110..0000000000 --- a/srcpkgs/qbittorrent/patches/cpp14-x11.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru build-x11.orig/src/src.pro build-x11/src/src.pro -Fix a SEGFAULT in qbittorrent when opening with existing torrents -or when adding a new torrent. -qbittorrent is compiled using -std=c++11 but boost and libtorrent-rasterbar -are compiled with whatever gcc uses as default and that seems to have switched -recently to c++14 in Void. -However switching below option to c++14 actually adds the -compile flag -std=g++1y which is a gnu variant of c++14 I am not sure if that -causes another trouble later. -Let's just mimic what the other packages do: do not set the support level -and let the compiler handle it. -PS: src/CMakeList.txt sets the support level based on compiler support but Void -builds using qmake instead of cmake. -see also https://github.com/qbittorrent/qBittorrent/issues/9485 ---- build-x11.orig/src/src.pro 2018-10-24 16:22:14.256256510 +0200 -+++ build-x11/src/src.pro 2018-10-24 16:50:50.260499780 +0200 -@@ -2,9 +2,6 @@ - TEMPLATE = app - CONFIG += qt thread silent - --# C++11 support --CONFIG += c++11 -- - # Platform specific configuration - win32: include(../winconf.pri) - macx: include(../macxconf.pri) -diff -ru build-nox.orig/src/src.pro build-nox/src/src.pro ---- build-nox.orig/src/src.pro 2018-10-24 16:22:14.256256510 +0200 -+++ build-nox/src/src.pro 2018-10-24 16:50:50.260499780 +0200 -@@ -2,9 +2,6 @@ - TEMPLATE = app - CONFIG += qt thread silent - --# C++11 support --CONFIG += c++11 -- - # Platform specific configuration - win32: include(../winconf.pri) - macx: include(../macxconf.pri) \ No newline at end of file diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index d4be2185ee..7005c2f764 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,6 +1,6 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.1.4 +version=4.1.5 revision=1 create_wrksrc=yes build_style=qmake @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://www.qbittorrent.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=5f7b4c5ae891ce7fbab880ff322764a0d433fccf655164f6b98ef08f1ae52386 +checksum=866e07c7886dea62cf0d7dc9a68d9aee1931cd18483b418298b2b072c9afd62a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-declarative-devel qt5-svg-devel"