From 0d821860ea0532d82359668fa37355c904fd442b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 26 Feb 2019 21:01:06 +1000 Subject: [PATCH] QBittorent: bump version --- .../patches/qbittorrent-4.1.2.patchset | 74 ------------------- .../patches/qbittorrent-4.1.5.patchset | 25 +++++++ ...-4.1.2.recipe => qbittorrent-4.1.5.recipe} | 2 +- 3 files changed, 26 insertions(+), 75 deletions(-) delete mode 100644 net-p2p/qbittorrent/patches/qbittorrent-4.1.2.patchset create mode 100644 net-p2p/qbittorrent/patches/qbittorrent-4.1.5.patchset rename net-p2p/qbittorrent/{qbittorrent-4.1.2.recipe => qbittorrent-4.1.5.recipe} (97%) diff --git a/net-p2p/qbittorrent/patches/qbittorrent-4.1.2.patchset b/net-p2p/qbittorrent/patches/qbittorrent-4.1.2.patchset deleted file mode 100644 index 0164c8319..000000000 --- a/net-p2p/qbittorrent/patches/qbittorrent-4.1.2.patchset +++ /dev/null @@ -1,74 +0,0 @@ -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 - - -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.15.0 - -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 2d9d74c..d4996ab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], - LIBS="-lexecinfo $LIBS"], - [AC_MSG_RESULT([no])]) - -+AC_MSG_CHECKING([whether OS is Haiku]) -+AS_IF([expr "$host_os" : ".*haiku.*" > /dev/null], -+ [AC_MSG_RESULT([yes]) -+ LIBS="-lnetwork $LIBS"], -+ [AC_MSG_RESULT([no])]) -+ - AC_MSG_CHECKING([whether OS is macOS]) - AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null], - [AC_MSG_RESULT([yes]) --- -2.15.0 diff --git a/net-p2p/qbittorrent/patches/qbittorrent-4.1.5.patchset b/net-p2p/qbittorrent/patches/qbittorrent-4.1.5.patchset new file mode 100644 index 000000000..7e710fe18 --- /dev/null +++ b/net-p2p/qbittorrent/patches/qbittorrent-4.1.5.patchset @@ -0,0 +1,25 @@ +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 2d9d74c..d4996ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], + LIBS="-lexecinfo $LIBS"], + [AC_MSG_RESULT([no])]) + ++AC_MSG_CHECKING([whether OS is Haiku]) ++AS_IF([expr "$host_os" : ".*haiku.*" > /dev/null], ++ [AC_MSG_RESULT([yes]) ++ LIBS="-lnetwork $LIBS"], ++ [AC_MSG_RESULT([no])]) ++ + AC_MSG_CHECKING([whether OS is macOS]) + AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null], + [AC_MSG_RESULT([yes]) +-- +2.15.0 diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.2.recipe b/net-p2p/qbittorrent/qbittorrent-4.1.5.recipe similarity index 97% rename from net-p2p/qbittorrent/qbittorrent-4.1.2.recipe rename to net-p2p/qbittorrent/qbittorrent-4.1.5.recipe index bed8602cf..72e702041 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.1.2.recipe +++ b/net-p2p/qbittorrent/qbittorrent-4.1.5.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2006-2018 The qBittorrent project" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/qbittorrent/qBittorrent/archive/release-$portVersion.tar.gz" -CHECKSUM_SHA256="ffc5210f3d2d112b4618f9fc2b8efa57684566edf63920beee03f28d66347803" +CHECKSUM_SHA256="76c7d9c020a7d9f45f8956934dd89500b61986cc22b1e0b7a46dc1af11f11d2c" SOURCE_DIR="qBittorrent-release-$portVersion" PATCHES="qbittorrent-$portVersion.patchset" ADDITIONAL_FILES="qbittorrent.rdef.in"