haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qbittorrent: bump to version 3.3.4.

Browse Source 
* Upgrade 3.3.1 to 3.3.4, switching back to Qt4. The reason is that
  although the application builds fine against Qt5 and even seems to
  work, it cannot save its configuration. The Qt5-based version of
  qbittorrent is therefore not usable. A Qt5-based variant is added
  with all architectures marked as untested in case someone would
  like to troubleshoot the issue.
* Drop 3.2.3 (which used Qt4) as we now have 3.3.4 (also Qt4-based).
* Replace hard coded info in qbittorrent.rdef by @FIELD@-style vars
  to make it generic with regards to the $portVersion.
* Added missing lib:libexecinfo and lib:libssl in REQUIRES to match
  their devel: counterparts in BUILD_REQUIRES.
* Added dependency on libGL, as suggested by diversys. It seems to me
  that it is not required but I'm probably missing something.

Warning: If building against Qt4 fails then uninstall Qt5 and retry.
This commit is contained in:
fbrosson
2016-04-09 21:53:38 +00:00
committed by Jérôme Duval
parent 0984e8c03d
commit 45c32bb5da
5 changed files with 131 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net-p2p/qbittorrent/additional-files/qbittorrent.rdef
View File

@@ -1,18 +1,18 @@
resource app_signature "application/x-vnd.qbittorrent";
resource app_signature "@APP_SIGNATURE@";
resource app_flags B_MULTIPLE_LAUNCH;
resource app_version {
major = 3,
middle = 2,
minor = 3,
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_DEVELOPMENT,
variety = B_APPV_FINAL,
internal = 0,
short_info = "qBittorrent",
long_info = "qBittorrent - BitTorrent client in C++ and Qt.\nCopyright ©2006-2015 Christophe Dumez"
long_info = "qBittorrent - BitTorrent client in C++ and Qt.\nCopyright ©2006-2016 Christophe Dumez"
};
resource vector_icon array {

0
net-p2p/qbittorrent/patches/qbittorrent-3.3.1.patchset → net-p2p/qbittorrent/patches/qbittorrent-3.3.4.patchset
View File

72
net-p2p/qbittorrent/qbittorrent-3.2.3.recipe
View File

@@ -1,72 +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 Qt4 toolkit and libtorrent-rasterbar."
HOMEPAGE="http://www.qbittorrent.org/"
COPYRIGHT="2006-2015 The qBittorrent project"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://sourceforge.net/projects/qbittorrent/files/qbittorrent/qbittorrent-$portVersion/qbittorrent-$portVersion.tar.gz"
CHECKSUM_SHA256="d4ebaab27fdebd37aa3c7f221c8c3d12a40d22d9e5423d1eec235d4085cc7358"
ADDITIONAL_FILES="qbittorrent.rdef"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
PROVIDES="
qbittorrent$secondaryArchSuffix = $portVersion
app:qBittorrent = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
libqt4${secondaryArchSuffix} >= 4.8.0
lib:libboost_system$secondaryArchSuffix
lib:libtorrent_rasterbar$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
libqt4${secondaryArchSuffix}_devel >= 4.8.0
boost${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtorrent_rasterbar$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
bootstrap.sh
BOOST_CPPFLAGS=-I/system/$relativeHearersDir runConfigure \
./configure --with-boost-libdir=/system/$relativeLibDir
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir
make install
mv $prefix/bin/qbittorrent $appsDir/qBittorrent
strip $appsDir/qBittorrent
addResourcesToBinaries $portDir/additional-files/qbittorrent.rdef \
$appsDir/qBittorrent
rm -r $prefix/{bin,data,documentation}
# TODO: install locale files from dist/qt-translations
addAppDeskbarSymlink $appsDir/qBittorrent
}

95
net-p2p/qbittorrent/qbittorrent-3.3.4.recipe Normal file
View File

@@ -0,0 +1,95 @@
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
}

39
net-p2p/qbittorrent/qbittorrent-3.3.1.recipe → net-p2p/qbittorrent/qbittorrent_qt5-3.3.4.recipe
View File

@@ -4,38 +4,46 @@ 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 Qt4 toolkit and libtorrent-rasterbar."
qBittorrent is based on Qt toolkit and libtorrent-rasterbar."
HOMEPAGE="http://www.qbittorrent.org/"
COPYRIGHT="2006-2015 The qBittorrent project"
COPYRIGHT="2006-2016 The qBittorrent project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/qbittorrent/files/qbittorrent/qbittorrent-$portVersion/qbittorrent-$portVersion.tar.gz"
CHECKSUM_SHA256="98579f15c86932331f7f274ddc936e84ec7efb95b8a86f3f6c53066c99b8a3c3"
SOURCE_URI="https://downloads.sf.net/qbittorrent/qbittorrent-$portVersion.tar.xz"
CHECKSUM_SHA256="c0d0d4b72c240f113b59a061146803bc1b7926d3d7f39b06b50a4d26f5ad91b8"
SOURCE_DIR="qbittorrent-$portVersion"
PATCHES="qbittorrent-$portVersion.patchset"
ADDITIONAL_FILES="qbittorrent.rdef"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
PROVIDES="
qbittorrent$secondaryArchSuffix = $portVersion
qbittorrent_qt5$secondaryArchSuffix = $portVersion
app:qBittorrent = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libexecinfo$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libqt5$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libtorrent_rasterbar$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
CONFLICTS="
qbittorrent$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
boost${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libqt5$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtorrent_rasterbar$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
@@ -43,6 +51,7 @@ BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:cut
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
@@ -52,7 +61,7 @@ BUILD_PREREQUIRES="
BUILD()
{
bootstrap.sh
BOOST_CPPFLAGS=-I/system/$relativeHearersDir runConfigure \
BOOST_CPPFLAGS=-I/system/$relativeHeadersDir runConfigure \
./configure --with-boost-libdir=/system/$relativeLibDir \
--disable-qt-dbus
make $jobArgs
@@ -68,7 +77,19 @@ INSTALL()
rm -r $prefix/{bin,data,documentation}
strip $appsDir/qBittorrent/qBittorrent
addResourcesToBinaries $portDir/additional-files/qbittorrent.rdef \
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