From 3b1ce1609ca0fa5408ea4fc0afdd105256a6a34e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 22 Nov 2017 02:24:12 +0300 Subject: [PATCH] qBittorrent: bump version --- ...16.patchset => qbittorrent-4.0.0.patchset} | 22 +++++++++---------- ...3.3.16.recipe => qbittorrent-4.0.0.recipe} | 12 +++++----- 2 files changed, 16 insertions(+), 18 deletions(-) rename net-p2p/qbittorrent/patches/{qbittorrent-3.3.16.patchset => qbittorrent-4.0.0.patchset} (84%) rename net-p2p/qbittorrent/{qbittorrent-3.3.16.recipe => qbittorrent-4.0.0.recipe} (90%) diff --git a/net-p2p/qbittorrent/patches/qbittorrent-3.3.16.patchset b/net-p2p/qbittorrent/patches/qbittorrent-4.0.0.patchset similarity index 84% rename from net-p2p/qbittorrent/patches/qbittorrent-3.3.16.patchset rename to net-p2p/qbittorrent/patches/qbittorrent-4.0.0.patchset index 5732d0c30..0164c8319 100644 --- a/net-p2p/qbittorrent/patches/qbittorrent-3.3.16.patchset +++ b/net-p2p/qbittorrent/patches/qbittorrent-4.0.0.patchset @@ -1,6 +1,6 @@ -From 258ae785b6379f62a0eeb39b9d0a497cb86a1cd6 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Mon, 30 Nov 2015 11:40:43 +0300 +From 5b6538b0a729e7037dcbccf54ff3e97507933f80 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 22 Nov 2017 01:34:52 +0300 Subject: Disable QtLockedFile on Haiku @@ -45,20 +45,19 @@ index 976c1b9..65813b8 100644 return true; } -- -2.14.2 +2.15.0 - -From 5c46079abe28a5be1f6fcf5dc698a4aca7e4f9ed Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 11 Oct 2017 21:19:08 +0200 +From f5ca55fbdea69bb1d627a984e480a4ad6998ec11 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Wed, 22 Nov 2017 01:33:59 +0300 Subject: Link with libnetwork on Haiku diff --git a/configure.ac b/configure.ac -index 1019ffe..c932918 100644 +index 2d9d74c..d4996ab 100644 --- a/configure.ac +++ b/configure.ac -@@ -67,6 +67,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], +@@ -55,6 +55,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], LIBS="-lexecinfo $LIBS"], [AC_MSG_RESULT([no])]) @@ -72,5 +71,4 @@ index 1019ffe..c932918 100644 AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null], [AC_MSG_RESULT([yes]) -- -2.14.2 - +2.15.0 diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.16.recipe b/net-p2p/qbittorrent/qbittorrent-4.0.0.recipe similarity index 90% rename from net-p2p/qbittorrent/qbittorrent-3.3.16.recipe rename to net-p2p/qbittorrent/qbittorrent-4.0.0.recipe index 02dfc75ce..3aa7145e6 100644 --- a/net-p2p/qbittorrent/qbittorrent-3.3.16.recipe +++ b/net-p2p/qbittorrent/qbittorrent-4.0.0.recipe @@ -9,15 +9,15 @@ qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library." HOMEPAGE="https://www.qbittorrent.org/" COPYRIGHT="2006-2017 The qBittorrent project" LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://downloads.sf.net/qbittorrent/qbittorrent-$portVersion.tar.xz" -CHECKSUM_SHA256="ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57" -SOURCE_DIR="qbittorrent-$portVersion" +REVISION="1" +SOURCE_URI="https://github.com/qbittorrent/qBittorrent/archive/release-$portVersion.tar.gz" +CHECKSUM_SHA256="ae5f08436a42acee2b638d329b4ce6873069ea1c0e924b7bd64589c10b2a90c5" +SOURCE_DIR="qBittorrent-release-$portVersion" PATCHES="qbittorrent-$portVersion.patchset" ADDITIONAL_FILES="qbittorrent.rdef.in" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" qbittorrent$secondaryArchSuffix = $portVersion