maintenance update from Brad - most patches are now upstream.

This commit is contained in:
sthen 2008-04-24 00:19:40 +00:00
parent d55b3dbc24
commit 812c82a798
7 changed files with 7 additions and 94 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2008/04/01 21:22:10 jakemsr Exp $
# $OpenBSD: Makefile,v 1.10 2008/04/24 00:19:40 sthen Exp $
SHARED_ONLY= Yes
COMMENT= BitTorrent client for KDE
VERSION= 2.2.5
VERSION= 2.2.6
DISTNAME= ktorrent-${VERSION}
PKGNAME= ${DISTNAME}p1
CATEGORIES= net x11 x11/kde
EXTRACT_SUFX= .tar.bz2

View File

@ -1,5 +1,5 @@
MD5 (ktorrent-2.2.5.tar.bz2) = Bw6EESuN0UbBrUA8VAPwdg==
RMD160 (ktorrent-2.2.5.tar.bz2) = L7B3CARbrKNAV0hJyzFRNsu3w4o=
SHA1 (ktorrent-2.2.5.tar.bz2) = xHvm/eScS2C6dJq8yvaGNF5ZPiA=
SHA256 (ktorrent-2.2.5.tar.bz2) = fU4FsDrGtY/ny6RSJ2w+A45StBWCjlhGIk978q6ja+Y=
SIZE (ktorrent-2.2.5.tar.bz2) = 2593138
MD5 (ktorrent-2.2.6.tar.bz2) = GQ2aAHfInRvfaM7SGU200w==
RMD160 (ktorrent-2.2.6.tar.bz2) = pY2zCAiIEqvYKnFf342kQ7fO7nY=
SHA1 (ktorrent-2.2.6.tar.bz2) = jLCLoO7djY0SU2w2rNsvwagAgTc=
SHA256 (ktorrent-2.2.6.tar.bz2) = UyNwDWYwZSQ+phgcQbVXD2PdCnQpivWDtT5mqBtOzNE=
SIZE (ktorrent-2.2.6.tar.bz2) = 2644896

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-libktorrent_net_address_cpp,v 1.1 2007/12/27 10:24:51 sthen Exp $
--- libktorrent/net/address.cpp.orig Sat Sep 29 01:31:27 2007
+++ libktorrent/net/address.cpp Sat Sep 29 01:31:39 2007
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "address.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libktorrent_net_socket_cpp,v 1.3 2008/01/30 12:18:59 sthen Exp $
--- libktorrent/net/socket.cpp.orig Sun Jan 27 07:05:46 2008
+++ libktorrent/net/socket.cpp Mon Jan 28 12:19:27 2008
@@ -264,7 +264,7 @@ namespace net
bool Socket::setTOS(unsigned char type_of_service)
{
-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_BSD4)
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_BSD4)
unsigned int c = type_of_service;
#else
unsigned char c = type_of_service;

View File

@ -1,40 +0,0 @@
$OpenBSD: patch-libktorrent_util_fileops_cpp,v 1.3 2008/02/05 19:17:15 naddy Exp $
--- libktorrent/util/fileops.cpp.orig Sun Jan 27 07:06:02 2008
+++ libktorrent/util/fileops.cpp Sat Feb 2 13:27:40 2008
@@ -61,10 +61,13 @@ typedef int64_t __s64;
#define O_LARGEFILE 0
#endif
-
+#if HAVE_STATVFS
#include <sys/statvfs.h>
+#else
+#include <sys/param.h>
+#include <sys/mount.h>
+#endif
-
namespace bt
{
void MakeDir(const QString & dir,bool nothrow)
@@ -445,7 +448,19 @@ namespace bt
return false;
}
#else
- return false;
+ struct statfs stfs;
+ if (statfs(path.local8Bit(), &stfs) == 0)
+ {
+ bytes_free = ((Uint64)stfs.f_bavail) * ((Uint64)stfs.f_bsize);
+ return true;
+ }
+ else
+ {
+ Out(SYS_GEN|LOG_DEBUG) << "Error : statfs for " << path << " failed : "
+ << QString(strerror(errno)) << endl;
+
+ return false;
+ }
#endif
}
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libktorrent_util_functions_cpp,v 1.1 2008/04/01 21:22:10 jakemsr Exp $
--- libktorrent/util/functions.cpp.orig Mon Mar 31 20:18:16 2008
+++ libktorrent/util/functions.cpp Mon Mar 31 20:25:06 2008
@@ -178,7 +178,7 @@ namespace bt
{
struct timeval tv;
gettimeofday(&tv,0);
- global_time_stamp = (Uint64)(tv.tv_sec * 1000 + tv.tv_usec * 0.001);
+ global_time_stamp = (Uint64)tv.tv_sec * 1000 + (Uint64)tv.tv_usec * 0.001;
return global_time_stamp;
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugins_infowidget_peerview_cpp,v 1.1 2007/12/27 10:24:51 sthen Exp $
--- plugins/infowidget/peerview.cpp.orig Fri Nov 16 04:47:02 2007
+++ plugins/infowidget/peerview.cpp Fri Nov 16 04:47:21 2007
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>