From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- .../rtorrent/files/rtorrent-0.9.1-ncurses.patch | 10 ------ net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch | 37 ---------------------- .../files/rtorrent-0.9.6-cppunit-pkgconfig.patch | 28 ---------------- 3 files changed, 75 deletions(-) delete mode 100644 net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch delete mode 100644 net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch delete mode 100644 net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch (limited to 'net-p2p/rtorrent/files') diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch deleted file mode 100644 index 260cd9a38425..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.9.1-ncurses.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/display/canvas.h -+++ src/display/canvas.h -@@ -48,5 +48,5 @@ class Canvas { - public: - typedef std::vector attributes_list; - -- Canvas(int x = 0, int y = 0, int width = 0, int height = 0); -+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1); - ~Canvas() { delwin(m_window); } - void refresh() { wnoutrefresh(m_window); } diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch deleted file mode 100644 index 21ee708782b3..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.9.4-tinfo.patch +++ /dev/null @@ -1,37 +0,0 @@ -bug 462788 - - configure.ac | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 430c15d..50ce687 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,15 +31,21 @@ TORRENT_WITHOUT_STATVFS() - TORRENT_WITHOUT_STATFS() - - AX_PTHREAD([], AC_MSG_ERROR([requires pthread])) --AX_WITH_CURSES() -- --if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then -- AC_MSG_ERROR([requires either NcursesW or Ncurses library]) --fi -+PKG_CHECK_MODULES([CURSES],[ncursesw],[ -+ AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1) -+ ], -+ [PKG_CHECK_MODULES([CURSES],[ncurses],[ -+ AC_DEFINE(HAVE_NCURSES_H, 1) -+ ], -+ [AX_WITH_CURSES() -+ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then -+ AC_MSG_ERROR([requires either NcursesW or Ncurses library]) -+ fi]) -+ ]) - - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" --LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS" -+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS" - - PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, - CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch deleted file mode 100644 index 753f4cb8a7f3..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/620908 - -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2017-08-17 08:52:49.596897308 -0500 -+++ b/configure.ac 2017-08-17 08:54:57.171515415 -0500 -@@ -4,7 +4,6 @@ - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - AC_PROG_LIBTOOL -@@ -43,9 +42,11 @@ - fi]) - ]) - --CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" --CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" --LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS" -+PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) -+ -+CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS" -+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS" -+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBS" - - PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, - CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; -- cgit v1.2.3