update patches

4 files changed, 42 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 654aca1eae10..36329a249412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Jun  7 02:51:20 UTC 2017
 pkgbase = rtorrent-ps
 	pkgdesc = Extended rTorrent distribution with UI enhancements, colorization, and some added features
-	pkgver = 1.0.r68.g882aa4e
+	pkgver = 1.0.r180.g66e43c4
 	pkgrel = 1
 	url = https://github.com/pyroscope/rtorrent-ps
 	arch = any
@@ -28,7 +26,7 @@ pkgbase = rtorrent-ps
 	source = ps-ui_pyroscope_all.patch
 	source = ps-view-filter-by_all.patch
 	source = pyroscope.patch
-	source = skip-cppunit.patch
+	source = rt-base-cppunit-pkgconfig.patch
 	source = ui_pyroscope.cc
 	source = ui_pyroscope.h
 	source = ui_pyroscope.patch
@@ -47,7 +45,7 @@ pkgbase = rtorrent-ps
 	md5sums = 7a88f8ab5d41242fdf1428de0e2ca182
 	md5sums = 26faff00b306b6ef276a7d9e6d964994
 	md5sums = bd04a0699b80c8042e1cf63a7e0e4222
-	md5sums = f69c594c417103744619e29ea06f09aa
+	md5sums = d0a956f0eb4b53b66d83df2a8a4d16dc
 	md5sums = 21fd4b912ddabe32356eef0a4e87c681
 	md5sums = 1258acfc82c50a8f452ace87fef0b416
 	md5sums = 0a2bbaf74c7160ba33876dcc2f050f14
diff --git a/PKGBUILD b/PKGBUILD
index 3a9ec1e706cc..88324a4babad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=rtorrent
 pkgname=rtorrent-ps
 _pkgver=0.9.6
-pkgver=1.0.r68.g882aa4e
+pkgver=1.0.r180.g66e43c4
 pkgrel=1
 pkgdesc='Extended rTorrent distribution with UI enhancements, colorization, and some added features'
 url='https://github.com/pyroscope/rtorrent-ps'
@@ -27,7 +27,7 @@ source=("https://github.com/rakshasa/$_pkgname/archive/$_pkgver.tar.gz"
         'ps-ui_pyroscope_all.patch'
         'ps-view-filter-by_all.patch'
         'pyroscope.patch'
-        'skip-cppunit.patch'
+        'rt-base-cppunit-pkgconfig.patch'
         'ui_pyroscope.cc'
         'ui_pyroscope.h'
         'ui_pyroscope.patch')
@@ -46,7 +46,7 @@ md5sums=('b8b4009f95f8543244ae1d23b1810d7c'
          '7a88f8ab5d41242fdf1428de0e2ca182'
          '26faff00b306b6ef276a7d9e6d964994'
          'bd04a0699b80c8042e1cf63a7e0e4222'
-         'f69c594c417103744619e29ea06f09aa'
+         'd0a956f0eb4b53b66d83df2a8a4d16dc'
          '21fd4b912ddabe32356eef0a4e87c681'
          '1258acfc82c50a8f452ace87fef0b416'
          '0a2bbaf74c7160ba33876dcc2f050f14')
@@ -59,10 +59,11 @@ prepare() {
   sed -i -e "s:\\(AC_DEFINE(HAVE_CONFIG_H.*\\):\1  AC_DEFINE(RT_HEX_VERSION, "$RT_HEX_VERSION", for CPP if checks):" configure.ac
   grep "AC_DEFINE.*API_VERSION" configure.ac >/dev/null || sed -i -e "s:\\(AC_DEFINE(HAVE_CONFIG_H.*\\):\1  AC_DEFINE(API_VERSION, 0, api version):" configure.ac
 
-  RT_PATCHES=( "$srcdir"/skip-cppunit.patch )
+  RT_BASE_PATCHES=( "$srcdir"/rt-base-cppunit-pkgconfig.patch )
+  RT_PATCHES=( )
 
   # Patch rTorrent
-  for corepatch in $srcdir/ps-*_{${_pkgver},all}.patch "${RT_PATCHES[@]}"; do
+  for corepatch in "${RT_BASE_PATCHES[@]}" $srcdir/ps-*_{${_pkgver},all}.patch "${RT_PATCHES[@]}"; do
     test ! -e "$corepatch" || { msg2 "$(basename $corepatch)"; patch -uNp1 -i "$corepatch"; }
   done
 
@@ -86,8 +87,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --with-xmlrpc-c \
-    --disable-debug \
-    --disable-instrumentation
+    --disable-debug
   make
 }
 
diff --git a/rt-base-cppunit-pkgconfig.patch b/rt-base-cppunit-pkgconfig.patch
new file mode 100644
index 000000000000..f23c5e0ada79
--- /dev/null
+++ b/rt-base-cppunit-pkgconfig.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,6 @@ 
+ AC_DEFINE(API_VERSION, 9, api version)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+@@ -38,15 +38,11 @@
+ fi
+ 
+-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS"
++PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG])
++PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
++PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.6])
+ 
+-PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
+-	          CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
+-		  LIBS="$LIBS $libcurl_LIBS")
+-
+-PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.6,
+-	          CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS";
+-		  LIBS="$LIBS $libtorrent_LIBS")
++LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
++CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
+ 
+ AC_LANG_PUSH(C++)
diff --git a/skip-cppunit.patch b/skip-cppunit.patch
deleted file mode 100644
index 06289565083c..000000000000
--- a/skip-cppunit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2017-05-20 15:51:21.532208995 +0000
-+++ b/configure.ac	2017-05-20 15:52:28.892065489 +0000
-@@ -4,7 +4,6 @@
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- AC_PROG_LIBTOOL