pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove qtorrent, libtorrent-rasterbar - newer versions in HEAD



Module Name:	pkgsrc-wip
Committed By:	nia <nia%NetBSD.org@localhost>
Pushed By:	nee
Date:		Mon Dec 16 18:37:21 2019 +0000
Changeset:	c41c619029b965ad2156cdcd462f32fedd5552bf

Modified Files:
	Makefile
Removed Files:
	libtorrent-rasterbar/DESCR
	libtorrent-rasterbar/Makefile
	libtorrent-rasterbar/Makefile.common
	libtorrent-rasterbar/PLIST
	libtorrent-rasterbar/TODO
	libtorrent-rasterbar/buildlink3.mk
	libtorrent-rasterbar/distinfo
	libtorrent-rasterbar/patches/patch-src_Makefile.in
	libtorrent-rasterbar/patches/patch-src_utp__stream.cpp
	qbittorrent/DESCR
	qbittorrent/Makefile
	qbittorrent/PLIST
	qbittorrent/TODO
	qbittorrent/distinfo
	qbittorrent/patches/patch-configure
	qbittorrent/patches/patch-src_filesystemwatcher.h
	qbittorrent/patches/patch-src_fs__utils.cpp
	qbittorrent/patches/patch-src_main.cpp
	qbittorrent/patches/patch-src_stacktrace.h

Log Message:
Remove qtorrent, libtorrent-rasterbar - newer versions in HEAD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c41c619029b965ad2156cdcd462f32fedd5552bf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   2 -
 libtorrent-rasterbar/DESCR                         |   5 -
 libtorrent-rasterbar/Makefile                      |  11 --
 libtorrent-rasterbar/Makefile.common               |  32 -----
 libtorrent-rasterbar/PLIST                         | 138 ---------------------
 libtorrent-rasterbar/TODO                          |  17 ---
 libtorrent-rasterbar/buildlink3.mk                 |  13 --
 libtorrent-rasterbar/distinfo                      |   7 --
 libtorrent-rasterbar/patches/patch-src_Makefile.in |  22 ----
 .../patches/patch-src_utp__stream.cpp              |  14 ---
 qbittorrent/DESCR                                  |   6 -
 qbittorrent/Makefile                               |  44 -------
 qbittorrent/PLIST                                  |  16 ---
 qbittorrent/TODO                                   |  13 --
 qbittorrent/distinfo                               |  10 --
 qbittorrent/patches/patch-configure                |  25 ----
 qbittorrent/patches/patch-src_filesystemwatcher.h  |  35 ------
 qbittorrent/patches/patch-src_fs__utils.cpp        |  34 -----
 qbittorrent/patches/patch-src_main.cpp             |  16 ---
 qbittorrent/patches/patch-src_stacktrace.h         |  36 ------
 20 files changed, 496 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 2816a6d6b5..5e59d743e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1971,7 +1971,6 @@ SUBDIR+=	libtermkey
 SUBDIR+=	libtextcat
 SUBDIR+=	libtlen2
 SUBDIR+=	libtogl
-SUBDIR+=	libtorrent-rasterbar
 SUBDIR+=	libtxc_dxtn
 SUBDIR+=	libucl
 SUBDIR+=	libudev
@@ -4191,7 +4190,6 @@ SUBDIR+=	pywm
 SUBDIR+=	pyzor
 SUBDIR+=	q
 SUBDIR+=	q2pro
-SUBDIR+=	qbittorrent
 SUBDIR+=	qcdloop
 SUBDIR+=	qdevelop
 SUBDIR+=	qemu-git
diff --git a/libtorrent-rasterbar/DESCR b/libtorrent-rasterbar/DESCR
deleted file mode 100644
index a246d54667..0000000000
--- a/libtorrent-rasterbar/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-libtorrent is a feature complete C++ bittorrent implementation
-focusing on efficiency and scalability. It runs on embedded devices as
-well as desktops. It boasts a well documented library interface that
-is easy to use. It comes with a simple bittorrent client demonstrating
-the use of the library.
diff --git a/libtorrent-rasterbar/Makefile b/libtorrent-rasterbar/Makefile
deleted file mode 100644
index c8d092df4b..0000000000
--- a/libtorrent-rasterbar/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2013/12/12 13:35:15 noud4 Exp $
-#
-
-CATEGORIES=	net
-MAINTAINER=	ryoon%NetBSD.org@localhost
-HOMEPAGE=	http://www.rasterbar.com/products/libtorrent/index.html
-COMMENT=	The rasterbar libtorrent is a feature complete C++ bittorrent library
-
-PKGCONFIG_OVERRIDE=	libtorrent-rasterbar.pc.in
-
-.include "../../wip/libtorrent-rasterbar/Makefile.common"
diff --git a/libtorrent-rasterbar/Makefile.common b/libtorrent-rasterbar/Makefile.common
deleted file mode 100644
index b023595814..0000000000
--- a/libtorrent-rasterbar/Makefile.common
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2013/12/12 13:35:15 noud4 Exp $
-#
-
-# used by wip/py-libtorrent-rasterbar/Makefile
-# used by wip/libtorrent-rasterbar/Makefile
-DISTNAME=	libtorrent-rasterbar-0.16.12
-CATEGORIES=	net
-MASTER_SITES=	http://libtorrent.googlecode.com/files/ \
-		${MASTER_SITE_SOURCEFORGE:=libtorrent/}
-LICENSE=	modified-bsd
-
-USE_LANGUAGES=	c c++
-
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-boost-system=boost_system
-CONFIGURE_ARGS+=	--with-boost-filesystem=boost_filesystem
-CONFIGURE_ARGS+=	--with-boost-thread=boost_thread
-CONFIGURE_ARGS+=	--with-boost-regex=boost_regex
-CONFIGURE_ARGS+=	--with-boost-program-options=boost_program_options
-CONFIGURE_ARGS+=	--with-libgeoip
-CONFIGURE_ARGS+=	--with-dht=on
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--with-zlib=system
-
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../net/GeoIP/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libtorrent-rasterbar/PLIST b/libtorrent-rasterbar/PLIST
deleted file mode 100644
index 55c24817eb..0000000000
--- a/libtorrent-rasterbar/PLIST
+++ /dev/null
@@ -1,138 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/15 11:53:00 noud4 Exp $
-include/libtorrent/ConvertUTF.h
-include/libtorrent/add_torrent_params.hpp
-include/libtorrent/address.hpp
-include/libtorrent/alert.hpp
-include/libtorrent/alert_types.hpp
-include/libtorrent/alloca.hpp
-include/libtorrent/allocator.hpp
-include/libtorrent/assert.hpp
-include/libtorrent/aux_/session_impl.hpp
-include/libtorrent/bandwidth_limit.hpp
-include/libtorrent/bandwidth_manager.hpp
-include/libtorrent/bandwidth_queue_entry.hpp
-include/libtorrent/bandwidth_socket.hpp
-include/libtorrent/bencode.hpp
-include/libtorrent/bitfield.hpp
-include/libtorrent/bloom_filter.hpp
-include/libtorrent/broadcast_socket.hpp
-include/libtorrent/bt_peer_connection.hpp
-include/libtorrent/buffer.hpp
-include/libtorrent/build_config.hpp
-include/libtorrent/chained_buffer.hpp
-include/libtorrent/config.hpp
-include/libtorrent/connection_queue.hpp
-include/libtorrent/copy_ptr.hpp
-include/libtorrent/create_torrent.hpp
-include/libtorrent/deadline_timer.hpp
-include/libtorrent/debug.hpp
-include/libtorrent/disk_buffer_holder.hpp
-include/libtorrent/disk_buffer_pool.hpp
-include/libtorrent/disk_io_thread.hpp
-include/libtorrent/entry.hpp
-include/libtorrent/enum_net.hpp
-include/libtorrent/error.hpp
-include/libtorrent/error_code.hpp
-include/libtorrent/escape_string.hpp
-include/libtorrent/extensions.hpp
-include/libtorrent/extensions/logger.hpp
-include/libtorrent/extensions/lt_trackers.hpp
-include/libtorrent/extensions/metadata_transfer.hpp
-include/libtorrent/extensions/smart_ban.hpp
-include/libtorrent/extensions/ut_metadata.hpp
-include/libtorrent/extensions/ut_pex.hpp
-include/libtorrent/file.hpp
-include/libtorrent/file_pool.hpp
-include/libtorrent/file_storage.hpp
-include/libtorrent/fingerprint.hpp
-include/libtorrent/gzip.hpp
-include/libtorrent/hasher.hpp
-include/libtorrent/http_connection.hpp
-include/libtorrent/http_parser.hpp
-include/libtorrent/http_seed_connection.hpp
-include/libtorrent/http_stream.hpp
-include/libtorrent/http_tracker_connection.hpp
-include/libtorrent/i2p_stream.hpp
-include/libtorrent/identify_client.hpp
-include/libtorrent/instantiate_connection.hpp
-include/libtorrent/intrusive_ptr_base.hpp
-include/libtorrent/invariant_check.hpp
-include/libtorrent/io.hpp
-include/libtorrent/io_service.hpp
-include/libtorrent/io_service_fwd.hpp
-include/libtorrent/ip_filter.hpp
-include/libtorrent/kademlia/dht_tracker.hpp
-include/libtorrent/kademlia/find_data.hpp
-include/libtorrent/kademlia/logging.hpp
-include/libtorrent/kademlia/msg.hpp
-include/libtorrent/kademlia/node.hpp
-include/libtorrent/kademlia/node_entry.hpp
-include/libtorrent/kademlia/node_id.hpp
-include/libtorrent/kademlia/observer.hpp
-include/libtorrent/kademlia/refresh.hpp
-include/libtorrent/kademlia/routing_table.hpp
-include/libtorrent/kademlia/rpc_manager.hpp
-include/libtorrent/kademlia/traversal_algorithm.hpp
-include/libtorrent/lazy_entry.hpp
-include/libtorrent/lsd.hpp
-include/libtorrent/magnet_uri.hpp
-include/libtorrent/max.hpp
-include/libtorrent/natpmp.hpp
-include/libtorrent/packet_buffer.hpp
-include/libtorrent/parse_url.hpp
-include/libtorrent/pch.hpp
-include/libtorrent/pe_crypto.hpp
-include/libtorrent/peer.hpp
-include/libtorrent/peer_connection.hpp
-include/libtorrent/peer_id.hpp
-include/libtorrent/peer_info.hpp
-include/libtorrent/peer_request.hpp
-include/libtorrent/piece_block_progress.hpp
-include/libtorrent/piece_picker.hpp
-include/libtorrent/policy.hpp
-include/libtorrent/proxy_base.hpp
-include/libtorrent/ptime.hpp
-include/libtorrent/puff.hpp
-include/libtorrent/random.hpp
-include/libtorrent/rsa.hpp
-include/libtorrent/rss.hpp
-include/libtorrent/session.hpp
-include/libtorrent/session_settings.hpp
-include/libtorrent/session_status.hpp
-include/libtorrent/settings.hpp
-include/libtorrent/size_type.hpp
-include/libtorrent/sliding_average.hpp
-include/libtorrent/socket.hpp
-include/libtorrent/socket_io.hpp
-include/libtorrent/socket_type.hpp
-include/libtorrent/socket_type_fwd.hpp
-include/libtorrent/socks5_stream.hpp
-include/libtorrent/ssl_stream.hpp
-include/libtorrent/stat.hpp
-include/libtorrent/storage.hpp
-include/libtorrent/storage_defs.hpp
-include/libtorrent/string_util.hpp
-include/libtorrent/struct_debug.hpp
-include/libtorrent/thread.hpp
-include/libtorrent/time.hpp
-include/libtorrent/timestamp_history.hpp
-include/libtorrent/tommath.h
-include/libtorrent/tommath_class.h
-include/libtorrent/tommath_superclass.h
-include/libtorrent/torrent.hpp
-include/libtorrent/torrent_handle.hpp
-include/libtorrent/torrent_info.hpp
-include/libtorrent/tracker_manager.hpp
-include/libtorrent/udp_socket.hpp
-include/libtorrent/udp_tracker_connection.hpp
-include/libtorrent/union_endpoint.hpp
-include/libtorrent/upnp.hpp
-include/libtorrent/utf8.hpp
-include/libtorrent/utp_socket_manager.hpp
-include/libtorrent/utp_stream.hpp
-include/libtorrent/version.hpp
-include/libtorrent/web_connection_base.hpp
-include/libtorrent/web_peer_connection.hpp
-include/libtorrent/xml_parse.hpp
-lib/libtorrent-rasterbar.la
-lib/pkgconfig/libtorrent-rasterbar.pc
diff --git a/libtorrent-rasterbar/TODO b/libtorrent-rasterbar/TODO
deleted file mode 100644
index d6ba4bfbf0..0000000000
--- a/libtorrent-rasterbar/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-linking:
-
-  CXXLD    libtorrent-rasterbar.la
-ld: .libs/torrent.o(.text+0x18f16): unresolvable relocation against symbol `_ZNKSs5emptyEv'
-ld: final link failed: Nonrepresentable section on output
-
-probably related to:
-
-https://code.google.com/p/libtorrent/issues/detail?id=382
-http://comments.gmane.org/gmane.comp.lib.boost.build/25685
-
-patch-src_Makefile.in linking works, the lib is usable,
-and the patch should be improved.
-
-
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2016-5301, CVE-2017-9847
diff --git a/libtorrent-rasterbar/buildlink3.mk b/libtorrent-rasterbar/buildlink3.mk
deleted file mode 100644
index 393c460ffa..0000000000
--- a/libtorrent-rasterbar/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/06/26 00:30:36 ryo-on Exp $
-
-BUILDLINK_TREE+=	libtorrent-rasterbar
-
-.if !defined(LIBTORRENT_RASTERBAR_BUILDLINK3_MK)
-LIBTORRENT_RASTERBAR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libtorrent-rasterbar+=	libtorrent-rasterbar>=0.14.10
-BUILDLINK_PKGSRCDIR.libtorrent-rasterbar?=	../../wip/libtorrent-rasterbar
-
-.endif	# LIBTORRENT_RASTERBAR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libtorrent-rasterbar
diff --git a/libtorrent-rasterbar/distinfo b/libtorrent-rasterbar/distinfo
deleted file mode 100644
index 33de96cd5d..0000000000
--- a/libtorrent-rasterbar/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/07/13 07:57:39 thomasklausner Exp $
-
-SHA1 (libtorrent-rasterbar-0.16.12.tar.gz) = cd326fd2609c3d00c25dabdd441a0704efbf0207
-RMD160 (libtorrent-rasterbar-0.16.12.tar.gz) = 61956d465297f4ad7c989d5839f8a5abacba9e86
-Size (libtorrent-rasterbar-0.16.12.tar.gz) = 3002825 bytes
-SHA1 (patch-src_Makefile.in) = 4d82afaacb30c13daeb7c7736e2799e083d76980
-SHA1 (patch-src_utp__stream.cpp) = f387adb5627ce95801ddcaccec80bd19c6765f54
diff --git a/libtorrent-rasterbar/patches/patch-src_Makefile.in b/libtorrent-rasterbar/patches/patch-src_Makefile.in
deleted file mode 100644
index ab4a3dfb76..0000000000
--- a/libtorrent-rasterbar/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2013/12/12 13:35:15 noud4 Exp $
-
-to link against boost >= 1.50
-
---- src/Makefile.in.orig	2013-12-12 10:51:24.000000000 +0000
-+++ src/Makefile.in
-@@ -192,10 +192,11 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libtorrent_rasterbar_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
--	$(AM_CXXFLAGS) $(CXXFLAGS) $(libtorrent_rasterbar_la_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+libtorrent_rasterbar_la_LINK = ${LIBTOOL} --mode=link \
-+        ${CC} -o ${.TARGET:.a=.la} \
-+            ${OBJS:.o=.lo} \
-+            -rpath ${PREFIX}/lib \
-+            $(libtorrent_rasterbar_la_LDFLAGS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
diff --git a/libtorrent-rasterbar/patches/patch-src_utp__stream.cpp b/libtorrent-rasterbar/patches/patch-src_utp__stream.cpp
deleted file mode 100644
index 428a7257f4..0000000000
--- a/libtorrent-rasterbar/patches/patch-src_utp__stream.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_utp__stream.cpp,v 1.1 2015/07/13 07:57:39 thomasklausner Exp $
-
-Make sure INT64_MAX is defined.
-
---- src/utp_stream.cpp.orig	2013-09-20 12:07:06.000000000 +0000
-+++ src/utp_stream.cpp
-@@ -30,6 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- */
- 
-+#define __STDC_LIMIT_MACROS
- #include "libtorrent/config.hpp"
- #include "libtorrent/utp_stream.hpp"
- #include "libtorrent/sliding_average.hpp"
diff --git a/qbittorrent/DESCR b/qbittorrent/DESCR
deleted file mode 100644
index f47588025d..0000000000
--- a/qbittorrent/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-The qBittorrent project
-aims to provide a Free Software alternative to utorrent. 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.
diff --git a/qbittorrent/Makefile b/qbittorrent/Makefile
deleted file mode 100644
index f8caf07c64..0000000000
--- a/qbittorrent/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2014/02/11 21:04:07 noud4 Exp $
-
-DISTNAME=	qbittorrent-3.1.3
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qbittorrent/}
-
-MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE=	http://www.qbittorrent.org/
-COMMENT=	P2P Bittorrent client
-LICENSE=	gnu-gpl-v2
-
-DEPENDS+=	libtorrent-rasterbar>=0.15.0:../../wip/libtorrent-rasterbar
-
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${DESTDIR}${PREFIX}
-CONFIGURE_ARGS+=	--qtdir=${PREFIX}/qt4
-CONFIGURE_ARGS+=	--with-libboost-inc=${PREFIX}/include
-CONFIGURE_ARGS+=	--with-libboost-lib=${PREFIX}/lib
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
-USE_LANGUAGES=		c++
-INSTALLATION_DIRS+=	bin
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	configure
-SUBST_VARS.paths=	PREFIX
-SUBST_MESSAGE.paths=	Fixing paths.
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
-.include "../../net/GeoIP/buildlink3.mk"	# TODO optional
-
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../wip/libtorrent-rasterbar/buildlink3.mk"
-
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt4-tools=	full
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/qbittorrent/PLIST b/qbittorrent/PLIST
deleted file mode 100644
index 2e7872f47d..0000000000
--- a/qbittorrent/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/12 15:33:21 noud4 Exp $
-bin/qbittorrent
-man/man1/qbittorrent.1
-share/applications/qBittorrent.desktop
-share/icons/hicolor/128x128/apps/qbittorrent.png
-share/icons/hicolor/16x16/apps/qbittorrent.png
-share/icons/hicolor/192x192/apps/qbittorrent.png
-share/icons/hicolor/22x22/apps/qbittorrent.png
-share/icons/hicolor/24x24/apps/qbittorrent.png
-share/icons/hicolor/32x32/apps/qbittorrent.png
-share/icons/hicolor/36x36/apps/qbittorrent.png
-share/icons/hicolor/48x48/apps/qbittorrent.png
-share/icons/hicolor/64x64/apps/qbittorrent.png
-share/icons/hicolor/72x72/apps/qbittorrent.png
-share/icons/hicolor/96x96/apps/qbittorrent.png
-share/pixmaps/qbittorrent.png
diff --git a/qbittorrent/TODO b/qbittorrent/TODO
deleted file mode 100644
index 7fab1187f0..0000000000
--- a/qbittorrent/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-For me this pkg works but i have to drag its window smaller
-to see the window content, giving me:
-
-QNativeImage: Unable to attach to shared memory segment. 
-X Error: BadDrawable (invalid Pixmap or Window parameter) 9
-  Major opcode: 62 (X_CopyArea)
-  Resource id:  0x0
-X Error: BadDrawable (invalid Pixmap or Window parameter) 9
-  Major opcode: 62 (X_CopyArea)
-  Resource id:  0x0
-
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2017-12778, CVE-2019-13640
diff --git a/qbittorrent/distinfo b/qbittorrent/distinfo
deleted file mode 100644
index c1418f26c4..0000000000
--- a/qbittorrent/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1 2013/12/12 15:33:21 noud4 Exp $
-
-SHA1 (qbittorrent-3.1.3.tar.gz) = 2edeedbb3239a3fe9710b7bba64b7ea4e67c0e5f
-RMD160 (qbittorrent-3.1.3.tar.gz) = d510cb1a9fb053ecff256a42605358c8d90f0a6e
-Size (qbittorrent-3.1.3.tar.gz) = 3880133 bytes
-SHA1 (patch-configure) = 27dc565c2d077a096560c66d9721ccd65582adc3
-SHA1 (patch-src_filesystemwatcher.h) = e5d91e0898aedeed96a6401e1d56856d89d292f3
-SHA1 (patch-src_fs__utils.cpp) = 6731692d048b31cfaa8ecb84a5ac74bed1004e57
-SHA1 (patch-src_main.cpp) = b0b0d58bb819bad17998a3d7681dcbee399c1e72
-SHA1 (patch-src_stacktrace.h) = 1863b33bf803f40bc1a84856b08b1db7dd681d7d
diff --git a/qbittorrent/patches/patch-configure b/qbittorrent/patches/patch-configure
deleted file mode 100644
index 3159f8db4b..0000000000
--- a/qbittorrent/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/12/12 15:33:21 noud4 Exp $
-
-Get the man dir right.
-Get the GeoIP.dat path right.
-
---- configure.orig	2013-11-19 22:55:00.000000000 +0000
-+++ configure
-@@ -352,6 +352,8 @@ public:
-                 }
-                 #ifdef Q_OS_FREEBSD
-                   conf->addLib("-lexecinfo");
-+                #endif
-+                #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-                   conf->addExtra("MANPREFIX = \$\$PREFIX");
-                 #else
-                   conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
-@@ -562,7 +564,7 @@ public:
- 			return true;
- #ifdef Q_WS_X11
- 		}
--                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
-+                if(QFile::exists("@PREFIX@/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
- 			return true;
-                 printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
- 		return false;
diff --git a/qbittorrent/patches/patch-src_filesystemwatcher.h b/qbittorrent/patches/patch-src_filesystemwatcher.h
deleted file mode 100644
index 22be244a2d..0000000000
--- a/qbittorrent/patches/patch-src_filesystemwatcher.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_filesystemwatcher.h,v 1.1 2013/12/12 15:33:22 noud4 Exp $
-
-Use statvfs on NetBSD.
-
---- src/filesystemwatcher.h.orig	2013-11-19 22:55:00.000000000 +0000
-+++ src/filesystemwatcher.h
-@@ -16,6 +16,9 @@
- #include <sys/param.h>
- #include <sys/mount.h>
- #include <string.h>
-+#elif defined(Q_OS_NETBSD)
-+#include <sys/param.h>
-+#include <sys/statvfs.h>
- #else
- #include <sys/vfs.h>
- #endif
-@@ -63,9 +66,17 @@ private:
-     if (!file.endsWith(QDir::separator()))
-       file += QDir::separator();
-     file += ".";
-+#if defined(Q_OS_NETBSD)
-+    struct statvfs buf;
-+#else
-     struct statfs buf;
-+#endif
-+#if defined(Q_OS_NETBSD)
-+    if (!statvfs(file.toLocal8Bit().constData(), &buf)) {
-+#else
-     if (!statfs(file.toLocal8Bit().constData(), &buf)) {
--#ifdef Q_WS_MAC
-+#endif
-+#if defined(Q_WS_MAC) || defined(Q_OS_NETBSD)
-       // XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
-       return (strcmp(buf.f_fstypename, "nfs") == 0 || strcmp(buf.f_fstypename, "cifs") == 0 || strcmp(buf.f_fstypename, "smbfs") == 0);
- #else
diff --git a/qbittorrent/patches/patch-src_fs__utils.cpp b/qbittorrent/patches/patch-src_fs__utils.cpp
deleted file mode 100644
index 8c98a9384c..0000000000
--- a/qbittorrent/patches/patch-src_fs__utils.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_fs__utils.cpp,v 1.1 2013/12/12 15:33:22 noud4 Exp $
-
-Use statvfs on NetBSD.
-
---- src/fs_utils.cpp.orig	2013-11-19 22:55:00.000000000 +0000
-+++ src/fs_utils.cpp
-@@ -52,6 +52,9 @@
- #if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD)
- #include <sys/param.h>
- #include <sys/mount.h>
-+#elif defined(Q_OS_NETBSD)
-+#include <sys/param.h>
-+#include <sys/statvfs.h>
- #else
- #include <sys/vfs.h>
- #endif
-@@ -282,9 +285,17 @@ long long fsutils::freeDiskSpaceOnPath(Q
- 
- #ifndef Q_WS_WIN
-   unsigned long long available;
-+#if defined(Q_OS_NETBSD)
-+  struct statvfs stats;
-+#else
-   struct statfs stats;
-+#endif
-   const QString statfs_path = dir_path.path()+"/.";
-+#if defined(Q_OS_NETBSD)
-+  const int ret = statvfs (qPrintable(statfs_path), &stats) ;
-+#else
-   const int ret = statfs (qPrintable(statfs_path), &stats) ;
-+#endif
-   if (ret == 0) {
-     available = ((unsigned long long)stats.f_bavail) *
-         ((unsigned long long)stats.f_bsize) ;
diff --git a/qbittorrent/patches/patch-src_main.cpp b/qbittorrent/patches/patch-src_main.cpp
deleted file mode 100644
index 75e74374db..0000000000
--- a/qbittorrent/patches/patch-src_main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_main.cpp,v 1.1 2013/12/12 15:33:22 noud4 Exp $
-
-Don't use execinfo on NetBSD.
-
---- src/main.cpp.orig	2013-11-19 22:55:00.000000000 +0000
-+++ src/main.cpp
-@@ -61,7 +61,9 @@ Q_IMPORT_PLUGIN(qico)
- #include "qinisettings.h"
- #if defined(Q_WS_X11) || defined(Q_WS_MAC)
- #include <signal.h>
-+#if !defined(Q_OS_NETBSD)
- #include <execinfo.h>
-+#endif
- #include "stacktrace.h"
- #endif
- 
diff --git a/qbittorrent/patches/patch-src_stacktrace.h b/qbittorrent/patches/patch-src_stacktrace.h
deleted file mode 100644
index e0b080a172..0000000000
--- a/qbittorrent/patches/patch-src_stacktrace.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_stacktrace.h,v 1.1 2013/12/12 15:33:22 noud4 Exp $
-
-Don't use execinfo on NetBSD.
-Don't use stacktrace on NetBSD.
-
---- src/stacktrace.h.orig	2013-11-19 22:55:00.000000000 +0000
-+++ src/stacktrace.h
-@@ -6,7 +6,9 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#if !defined(Q_OS_NETBSD)
- #include <execinfo.h>
-+#endif
- #include <cxxabi.h>
- 
- /** Print a demangled stack backtrace of the caller function to FILE* out. */
-@@ -14,6 +16,10 @@ static inline void print_stacktrace(FILE
- {
-     fprintf(out, "stack trace:\n");
- 
-+#if defined(Q_OS_NETBSD)
-+	fprintf(out, "  <empty, still todo>\n");
-+	return;
-+#else
-     // storage array for stack trace address data
-     void* addrlist[max_frames+1];
- 
-@@ -89,6 +95,7 @@ static inline void print_stacktrace(FILE
- 
-     free(funcname);
-     free(symbollist);
-+#endif
- }
- 
- #endif // _STACKTRACE_H_


Home | Main Index | Thread Index | Old Index