From 3ce5de8ffc2d5b6e73ee7c6ecf59c35e9d5a28e6 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 10 Jul 2017 17:44:44 +0300 Subject: [PATCH] qBittorrent: bump version --- ...2.patchset => qbittorrent-3.3.13.patchset} | 0 .../patches/qbittorrent-3.3.4.patchset | 49 ---------- ....3.12.recipe => qbittorrent-3.3.13.recipe} | 23 ++--- net-p2p/qbittorrent/qbittorrent-3.3.4.recipe | 95 ------------------- 4 files changed, 12 insertions(+), 155 deletions(-) rename net-p2p/qbittorrent/patches/{qbittorrent-3.3.12.patchset => qbittorrent-3.3.13.patchset} (100%) delete mode 100644 net-p2p/qbittorrent/patches/qbittorrent-3.3.4.patchset rename net-p2p/qbittorrent/{qbittorrent-3.3.12.recipe => qbittorrent-3.3.13.recipe} (85%) delete mode 100644 net-p2p/qbittorrent/qbittorrent-3.3.4.recipe diff --git a/net-p2p/qbittorrent/patches/qbittorrent-3.3.12.patchset b/net-p2p/qbittorrent/patches/qbittorrent-3.3.13.patchset similarity index 100% rename from net-p2p/qbittorrent/patches/qbittorrent-3.3.12.patchset rename to net-p2p/qbittorrent/patches/qbittorrent-3.3.13.patchset diff --git a/net-p2p/qbittorrent/patches/qbittorrent-3.3.4.patchset b/net-p2p/qbittorrent/patches/qbittorrent-3.3.4.patchset deleted file mode 100644 index 181726e9e..000000000 --- a/net-p2p/qbittorrent/patches/qbittorrent-3.3.4.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From 12906e1526d1efdec43624c7d86b7a1042687a41 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Mon, 30 Nov 2015 11:40:43 +0300 -Subject: Disable QtLockedFile on Haiku - - -diff --git a/src/app/qtsingleapplication/qtlockedfile_unix.cpp b/src/app/qtsingleapplication/qtlockedfile_unix.cpp -index 976c1b9..65813b8 100644 ---- a/src/app/qtsingleapplication/qtlockedfile_unix.cpp -+++ b/src/app/qtsingleapplication/qtlockedfile_unix.cpp -@@ -61,6 +61,7 @@ bool QtLockedFile::lock(LockMode mode, bool block) - if (m_lock_mode != NoLock) - unlock(); - -+#ifndef __HAIKU__ - struct flock fl; - fl.l_whence = SEEK_SET; - fl.l_start = 0; -@@ -75,7 +76,7 @@ bool QtLockedFile::lock(LockMode mode, bool block) - return false; - } - -- -+#endif - m_lock_mode = mode; - return true; - } -@@ -91,6 +92,8 @@ bool QtLockedFile::unlock() - if (!isLocked()) - return true; - -+#ifndef __HAIKU__ -+ - struct flock fl; - fl.l_whence = SEEK_SET; - fl.l_start = 0; -@@ -102,7 +105,8 @@ bool QtLockedFile::unlock() - qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); - return false; - } -- -+ -+#endif - m_lock_mode = NoLock; - return true; - } --- -2.2.2 - diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.12.recipe b/net-p2p/qbittorrent/qbittorrent-3.3.13.recipe similarity index 85% rename from net-p2p/qbittorrent/qbittorrent-3.3.12.recipe rename to net-p2p/qbittorrent/qbittorrent-3.3.13.recipe index 4c9386e73..81a418077 100644 --- a/net-p2p/qbittorrent/qbittorrent-3.3.12.recipe +++ b/net-p2p/qbittorrent/qbittorrent-3.3.13.recipe @@ -1,16 +1,17 @@ SUMMARY="BitTorrent client in C++ and Qt" -DESCRIPTION="The qBittorrent project aims to provide a Free Software \ -alternative to µtorrent. Additionally, qBittorrent runs and provides \ -the same features on all major platforms (Linux, Mac OS X, Windows, \ -OS/2, FreeBSD). +DESCRIPTION="The qBittorrent project aims to provide an open-source software \ +alternative to µTorrent. -qBittorrent is based on Qt toolkit and libtorrent-rasterbar." -HOMEPAGE="http://www.qbittorrent.org/" +Additionally, qBittorrent runs and provides the same features on all major \ +platforms (Linux, Mac OS X, Windows, OS/2, FreeBSD). + +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="1" SOURCE_URI="https://downloads.sf.net/qbittorrent/qbittorrent-$portVersion.tar.xz" -CHECKSUM_SHA256="56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f" +CHECKSUM_SHA256="84317b5127def320cb17fedc2ba78807660216b6ee44650d94eb75e2c8ce468d" SOURCE_DIR="qbittorrent-$portVersion" PATCHES="qbittorrent-$portVersion.patchset" ADDITIONAL_FILES="qbittorrent.rdef" @@ -28,10 +29,10 @@ REQUIRES=" lib:libexecinfo$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libQt5Concurrent$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix + lib:libQt5Xml$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libtorrent_rasterbar$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -43,10 +44,10 @@ BUILD_REQUIRES=" devel:libexecinfo$secondaryArchSuffix devel:libGL$secondaryArchSuffix devel:libQt5Concurrent$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Xml$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix + devel:libQt5Xml$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libtorrent_rasterbar$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.4.recipe b/net-p2p/qbittorrent/qbittorrent-3.3.4.recipe deleted file mode 100644 index 3d0d226cc..000000000 --- a/net-p2p/qbittorrent/qbittorrent-3.3.4.recipe +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY="BitTorrent client in C++ and Qt" -DESCRIPTION="The qBittorrent project aims to provide a Free Software \ -alternative to µtorrent. Additionally, qBittorrent runs and provides \ -the same features on all major platforms (Linux, Mac OS X, Windows, \ -OS/2, FreeBSD). - -qBittorrent is based on Qt toolkit and libtorrent-rasterbar." -HOMEPAGE="http://www.qbittorrent.org/" -COPYRIGHT="2006-2016 The qBittorrent project" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://downloads.sf.net/qbittorrent/qbittorrent-$portVersion.tar.xz" -CHECKSUM_SHA256="c0d0d4b72c240f113b59a061146803bc1b7926d3d7f39b06b50a4d26f5ad91b8" -PATCHES="qbittorrent-$portVersion.patchset" -ADDITIONAL_FILES="qbittorrent.rdef" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86" - -PROVIDES=" - qbittorrent$secondaryArchSuffix = $portVersion - app:qBittorrent = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libboost_system$secondaryArchSuffix - lib:libexecinfo$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - libqt4$secondaryArchSuffix >= 4.8.0 - lib:libssl$secondaryArchSuffix - lib:libtorrent_rasterbar$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -CONFLICTS=" - qbittorrent_qt5$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - boost${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix - devel:libexecinfo$secondaryArchSuffix - devel:libGL$secondaryArchSuffix - libqt4${secondaryArchSuffix}_devel >= 4.8.0 - devel:libssl$secondaryArchSuffix - devel:libtorrent_rasterbar$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:awk - cmd:cut - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - bootstrap.sh - BOOST_CPPFLAGS=-I/system/$relativeHeadersDir runConfigure \ - ./configure --with-boost-libdir=/system/$relativeLibDir \ - --with-qt4 - make $jobArgs -} - -INSTALL() -{ - make install - - mkdir -p $appsDir/qBittorrent/translations - cp dist/qt-translations/*.qm $appsDir/qBittorrent/translations - mv $prefix/bin/qbittorrent $appsDir/qBittorrent/qBittorrent - rm -r $prefix/{bin,data,documentation} - strip $appsDir/qBittorrent/qBittorrent - - APP_SIGNATURE="application/x-vnd.qbittorrent" - MAJOR="`echo "$portVersion" | cut -d. -f1`" - MIDDLE="`echo "$portVersion" | cut -d. -f2`" - MINOR="`echo "$portVersion" | cut -d. -f3`" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - $portDir/additional-files/qbittorrent.rdef \ - > qbittorrent.rdef - - addResourcesToBinaries qbittorrent.rdef \ - $appsDir/qBittorrent/qBittorrent - - addAppDeskbarSymlink $appsDir/qBittorrent/qBittorrent -}