skip cppunit dependency check

4 files changed, 23 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2b4e8fbf22f..e47759cf7193 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 # Generated by mksrcinfo v8
-# Fri May 12 02:03:36 UTC 2017
+# Sat May 20 15:59:32 UTC 2017
 pkgbase = rtorrent-ps
 	pkgdesc = Extended rTorrent distribution with UI enhancements, colorization, and some added features
-	pkgver = 1.0.r57.gb49dfe3
+	pkgver = 1.0.r59.gd21c734
 	pkgrel = 1
 	url = https://github.com/pyroscope/rtorrent-ps
 	arch = any
 	license = GPL
-	makedepends = cppunit
 	depends = curl>=7.15.4
 	depends = libtorrent-ps>=1.0
 	depends = ncurses
@@ -28,6 +27,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 = ui_pyroscope.cc
 	source = ui_pyroscope.h
 	source = ui_pyroscope.patch
@@ -45,6 +45,7 @@ pkgbase = rtorrent-ps
 	md5sums = 7a88f8ab5d41242fdf1428de0e2ca182
 	md5sums = 26faff00b306b6ef276a7d9e6d964994
 	md5sums = bd04a0699b80c8042e1cf63a7e0e4222
+	md5sums = f69c594c417103744619e29ea06f09aa
 	md5sums = 21fd4b912ddabe32356eef0a4e87c681
 	md5sums = 1258acfc82c50a8f452ace87fef0b416
 	md5sums = 0a2bbaf74c7160ba33876dcc2f050f14
diff --git a/.gitignore b/.gitignore
index dc1560e8973b..8766688f9756 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-# (release) archives
+# common
+src/
+pkg/
 *.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 2a1b88f30799..92770f144515 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,13 @@
 _pkgname=rtorrent
 pkgname=rtorrent-ps
 _pkgver=0.9.6
-pkgver=1.0.r57.gb49dfe3
+pkgver=1.0.r59.gd21c734
 pkgrel=1
 pkgdesc='Extended rTorrent distribution with UI enhancements, colorization, and some added features'
 url='https://github.com/pyroscope/rtorrent-ps'
 license=('GPL')
 arch=('any')
 depends=('curl>=7.15.4' 'libtorrent-ps>=1.0' 'ncurses' 'xmlrpc-c')
-makedepends=('cppunit')
 provides=('rtorrent')
 conflicts=('rtorrent')
 source=("https://github.com/rakshasa/$_pkgname/archive/$_pkgver.tar.gz"
@@ -27,6 +26,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'
         'ui_pyroscope.cc'
         'ui_pyroscope.h'
         'ui_pyroscope.patch')
@@ -44,6 +44,7 @@ md5sums=('b8b4009f95f8543244ae1d23b1810d7c'
          '7a88f8ab5d41242fdf1428de0e2ca182'
          '26faff00b306b6ef276a7d9e6d964994'
          'bd04a0699b80c8042e1cf63a7e0e4222'
+         'f69c594c417103744619e29ea06f09aa'
          '21fd4b912ddabe32356eef0a4e87c681'
          '1258acfc82c50a8f452ace87fef0b416'
          '0a2bbaf74c7160ba33876dcc2f050f14')
@@ -56,8 +57,10 @@ 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 )
+
   # Patch rTorrent
-  for corepatch in $srcdir/ps-*_{${_pkgver},all}.patch; do
+  for corepatch in $srcdir/ps-*_{${_pkgver},all}.patch "${RT_PATCHES[@]}"; do
     test ! -e "$corepatch" || { msg2 "$(basename $corepatch)"; patch -uNp1 -i "$corepatch"; }
   done
 
diff --git a/skip-cppunit.patch b/skip-cppunit.patch
new file mode 100644
index 000000000000..06289565083c
--- /dev/null
+++ b/skip-cppunit.patch
@@ -0,0 +1,10 @@
+--- 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