Attachment 96074 Details for Bug 134628 – file.shar

file.shar

file.shar (text/plain), 8.58 KB, created by tkato432 on 2009-05-17 19:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-05-17 19:10:03 UTC

Size: 8.58 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	net-p2p_qbittorrent.diff
>#	net-p2p_rblibtorrent-devel.diff
>#
>echo x - net-p2p_qbittorrent.diff
>sed 's/^X//' >net-p2p_qbittorrent.diff << '4489cf8942087f2f097192317d985421'
>Xdiff -urN /usr/ports/net-p2p/qbittorrent/Makefile net-p2p/qbittorrent/Makefile
>X--- /usr/ports/net-p2p/qbittorrent/Makefile	2009-03-24 14:17:28.000000000 +0900
>X+++ net-p2p/qbittorrent/Makefile	2009-04-29 22:10:28.000000000 +0900
>X@@ -6,7 +6,7 @@
>X #
>X 
>X PORTNAME=	qbittorrent
>X-PORTVERSION=	1.3.2
>X+PORTVERSION=	1.3.3
>X CATEGORIES=	net-p2p
>X MASTER_SITES=	SF
>X 
>X@@ -17,7 +17,7 @@
>X 		execinfo.1:${PORTSDIR}/devel/libexecinfo \
>X 		zzip.13:${PORTSDIR}/devel/zziplib \
>X 		curl.5:${PORTSDIR}/ftp/curl \
>X-		torrent-rasterbar.2:${PORTSDIR}/net-p2p/rblibtorrent-devel
>X+		torrent-rasterbar.3:${PORTSDIR}/net-p2p/rblibtorrent-devel
>X 
>X USE_QT_VER=	4
>X QT_COMPONENTS=	corelib gui network xml \
>Xdiff -urN /usr/ports/net-p2p/qbittorrent/distinfo net-p2p/qbittorrent/distinfo
>X--- /usr/ports/net-p2p/qbittorrent/distinfo	2009-03-24 14:17:28.000000000 +0900
>X+++ net-p2p/qbittorrent/distinfo	2009-04-14 03:52:41.000000000 +0900
>X@@ -1,3 +1,3 @@
>X-MD5 (qbittorrent-1.3.2.tar.gz) = 680ea41e5601d5cd7990b303f9ad503c
>X-SHA256 (qbittorrent-1.3.2.tar.gz) = f0d269424272ab1d6ce2a161ff7c01ff8ced63f5a7cf25616bbde02298329a5d
>X-SIZE (qbittorrent-1.3.2.tar.gz) = 1660128
>X+MD5 (qbittorrent-1.3.3.tar.gz) = 863f963beefc3c93dfe25ee6a6b0ed47
>X+SHA256 (qbittorrent-1.3.3.tar.gz) = 3a8adf958a727e1fcc2fbdc03a0691209f0b60f75b6bb385c9c1aca27dceb964
>X+SIZE (qbittorrent-1.3.3.tar.gz) = 1667700
>4489cf8942087f2f097192317d985421
>echo x - net-p2p_rblibtorrent-devel.diff
>sed 's/^X//' >net-p2p_rblibtorrent-devel.diff << '777c2393e7c90c0e61ac5a5faea0c974'
>Xdiff -urN /usr/ports/net-p2p/rblibtorrent-devel/Makefile net-p2p/rblibtorrent-devel/Makefile
>X--- /usr/ports/net-p2p/rblibtorrent-devel/Makefile	2009-04-22 05:32:11.000000000 +0900
>X+++ net-p2p/rblibtorrent-devel/Makefile	2009-04-29 22:05:28.000000000 +0900
>X@@ -6,8 +6,7 @@
>X #
>X 
>X PORTNAME=	libtorrent
>X-PORTVERSION=	0.14.2
>X-PORTREVISION=	2
>X+PORTVERSION=	0.14.3
>X CATEGORIES=	net-p2p
>X MASTER_SITES=	SF
>X PKGNAMEPREFIX=	rb
>X@@ -32,7 +31,8 @@
>X 		--with-boost-thread=boost_thread \
>X 		--with-boost-regex=boost_regex \
>X 		--with-boost-program-options=boost_program_options \
>X-		--with-asio=shipped
>X+		--with-asio=shipped \
>X+		--with-zlib=system
>X USE_LDCONFIG=	yes
>X 
>X CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>Xdiff -urN /usr/ports/net-p2p/rblibtorrent-devel/distinfo net-p2p/rblibtorrent-devel/distinfo
>X--- /usr/ports/net-p2p/rblibtorrent-devel/distinfo	2009-03-24 14:17:28.000000000 +0900
>X+++ net-p2p/rblibtorrent-devel/distinfo	2009-04-29 02:30:39.000000000 +0900
>X@@ -1,3 +1,3 @@
>X-MD5 (libtorrent-rasterbar-0.14.2.tar.gz) = 97bb2db5ac21e9a81c96fc0e2abe6d29
>X-SHA256 (libtorrent-rasterbar-0.14.2.tar.gz) = bf43ea3fbedc2839f66357c3f0bea5f05f563cd9ffd9f7c3c6d81f33374a466e
>X-SIZE (libtorrent-rasterbar-0.14.2.tar.gz) = 1978048
>X+MD5 (libtorrent-rasterbar-0.14.3.tar.gz) = 6ce3148f8fbddbdfa472ef3c4c4cae61
>X+SHA256 (libtorrent-rasterbar-0.14.3.tar.gz) = c769c8b7f0cf87664fb26f9b43ef5d6e485a2c2c70fc75ef8a75c79e1114f4bb
>X+SIZE (libtorrent-rasterbar-0.14.3.tar.gz) = 1985127
>Xdiff -urN /usr/ports/net-p2p/rblibtorrent-devel/files/patch-socket_ops.hpp net-p2p/rblibtorrent-devel/files/patch-socket_ops.hpp
>X--- /usr/ports/net-p2p/rblibtorrent-devel/files/patch-socket_ops.hpp	2007-10-02 13:26:50.000000000 +0900
>X+++ net-p2p/rblibtorrent-devel/files/patch-socket_ops.hpp	1970-01-01 09:00:00.000000000 +0900
>X@@ -1,11 +0,0 @@
>X---- include/libtorrent/asio/detail/socket_ops.hpp.orig	Wed Aug  8 03:43:42 2007
>X-+++ include/libtorrent/asio/detail/socket_ops.hpp	Mon Sep 10 12:46:17 2007
>X-@@ -715,7 +715,7 @@
>X-   if (error)
>X-     ec = translate_netdb_error(error);
>X-   return retval;
>X--#elif defined(__MACH__) && defined(__APPLE__)
>X-+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) 
>X-   (void)(buffer);
>X-   (void)(buflength);
>X-   int error = 0;
>Xdiff -urN /usr/ports/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp
>X--- /usr/ports/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp	2009-04-22 05:32:13.000000000 +0900
>X+++ net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp	2009-04-29 15:56:49.000000000 +0900
>X@@ -1,19 +1,75 @@
>X---- src/storage.cpp.orig	2009-02-08 17:13:04.000000000 +0900
>X-+++ src/storage.cpp	2009-04-19 05:32:24.000000000 +0900
>X-@@ -82,9 +82,11 @@
>X- #include <cstdio>
>X+--- src/storage.cpp.orig	2009-04-13 02:37:54.000000000 +0900
>X++++ src/storage.cpp	2009-04-29 15:56:16.000000000 +0900
>X+@@ -53,7 +53,7 @@
>X+ #include <boost/multi_index_container.hpp>
>X+ #include <boost/multi_index/member.hpp>
>X+ #include <boost/multi_index/ordered_index.hpp>
>X+-#if BOOST_VERSION >= 103500
>X++#if 0 // BOOST_VERSION >= 103500
>X+ #include <boost/system/system_error.hpp>
>X  #endif
>X  
>X--#if defined(__APPLE__)
>X-+#if defined(__APPLE__) || defined(__FreeBSD__)
>X- // for getattrlist()
>X-+#ifdef __APPLE__
>X- #include <sys/attr.h>
>X-+#endif
>X- #include <unistd.h>
>X- // for statfs()
>X- #include <sys/param.h>
>X-@@ -496,7 +498,7 @@
>X+@@ -185,15 +185,15 @@
>X+ 		}
>X+ #ifndef BOOST_NO_EXCEPTIONS
>X+ 		}
>X+-#if BOOST_VERSION >= 103500
>X++#if 0 // BOOST_VERSION >= 103500
>X+ 		catch (boost::system::system_error& e)
>X+ 		{
>X+ 			ec = e.code();
>X+ 		}
>X+ #else
>X+-		catch (boost::filesystem::filesystem_error& e)
>X++		catch (std::exception& e)
>X+ 		{
>X+-			ec = error_code(e.system_error(), get_system_category());
>X++			ec = error_code(errno, get_posix_category());
>X+ 		}
>X+ #endif // BOOST_VERSION
>X+ #endif // BOOST_NO_EXCEPTIONS
>X+@@ -458,17 +458,17 @@
>X+ 			}
>X+ #ifndef BOOST_NO_EXCEPTIONS
>X+ 			}
>X+-#if BOOST_VERSION >= 103500
>X++#if 0 // BOOST_VERSION >= 103500
>X+ 			catch (boost::system::system_error& e)
>X+ 			{
>X+ 				set_error(m_save_path / file_iter->path, e.code());
>X+ 				return true;
>X+ 			}
>X+ #else
>X+-			catch (boost::filesystem::filesystem_error& e)
>X++			catch (std::exception& e)
>X+ 			{
>X+ 				set_error(m_save_path / file_iter->path
>X+-					, error_code(e.system_error(), get_system_category()));
>X++					, error_code(errno, get_posix_category()));
>X+ 				return true;
>X+ 			}
>X+ #endif // BOOST_VERSION
>X+@@ -501,16 +501,16 @@
>X+ #endif
>X+ #ifndef BOOST_NO_EXCEPTIONS
>X+ 			}
>X+-#if BOOST_VERSION >= 103500
>X++#if 0 // BOOST_VERSION >= 103500
>X+ 			catch (boost::system::system_error& e)
>X+ 			{
>X+ 				set_error(f, e.code());
>X+ 				return false;
>X+ 			}
>X+ #else
>X+-			catch (boost::filesystem::filesystem_error& e)
>X++			catch (std::exception& e)
>X+ 			{
>X+-				set_error(f, error_code(e.system_error(), get_system_category()));
>X++				set_error(f, error_code(errno, get_posix_category()));
>X+ 				return false;
>X+ 			}
>X+ #endif // BOOST_VERSION
>X+@@ -558,17 +558,17 @@
>X  			m_mapped_files->rename_file(index, new_filename);
>X  #ifndef BOOST_NO_EXCEPTIONS
>X  		}
>X@@ -22,3 +78,35 @@
>X  		catch (boost::system::system_error& e)
>X  		{
>X  			set_error(old_name, e.code());
>X+ 			return true;
>X+ 		}
>X+ #else
>X+-		catch (boost::filesystem::filesystem_error& e)
>X++		catch (std::exception& e)
>X+ 		{
>X+-			set_error(old_name, error_code(e.system_error()
>X+-				, get_system_category()));
>X++			set_error(old_name, error_code(errno
>X++				, get_posix_category()));
>X+ 			return true;
>X+ 		}
>X+ #endif // BOOST_VERSION
>X+@@ -591,15 +591,15 @@
>X+ #endif
>X+ 		{ fs::remove(safe_convert(p)); }
>X+ #ifndef BOOST_NO_EXCEPTIONS
>X+-#if BOOST_VERSION >= 103500
>X++#if 0 // BOOST_VERSION >= 103500
>X+ 		catch (boost::system::system_error& e)
>X+ 		{
>X+ 			set_error(p, e.code());
>X+ 		}
>X+ #else
>X+-		catch (boost::filesystem::filesystem_error& e)
>X++		catch (std::exception& e)
>X+ 		{
>X+-			set_error(p, error_code(e.system_error(), get_system_category()));
>X++			set_error(p, errno, get_posix_category()));
>X+ 		}
>X+ #endif // BOOST_VERSION
>X+ #endif // BOOST_NO_EXCEPTIONS
>Xdiff -urN /usr/ports/net-p2p/rblibtorrent-devel/pkg-plist net-p2p/rblibtorrent-devel/pkg-plist
>X--- /usr/ports/net-p2p/rblibtorrent-devel/pkg-plist	2009-04-22 05:32:13.000000000 +0900
>X+++ net-p2p/rblibtorrent-devel/pkg-plist	2009-04-29 15:52:42.000000000 +0900
>X@@ -290,7 +290,7 @@
>X lib/libtorrent-rasterbar.a
>X lib/libtorrent-rasterbar.la
>X lib/libtorrent-rasterbar.so
>X-lib/libtorrent-rasterbar.so.2
>X+lib/libtorrent-rasterbar.so.3
>X libdata/pkgconfig/libtorrent-rasterbar.pc
>X @dirrm include/libtorrent/kademlia
>X @dirrm include/libtorrent/extensions
>777c2393e7c90c0e61ac5a5faea0c974
>exit

Actions: View

Attachments on bug 134628: 96074