new version scheme, update

2 files changed, 16 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 536093a9b551..db42f99d86d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
 
 _pkgname=rtorrent
 pkgname=rtorrent-ps
-pkgver=0.9.6
-pkgrel=4
+_pkgver=0.9.6
+pkgver=1.0.r26.gcb78fc3
+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=('cppunit' 'curl>=7.15.4' 'libtorrent-ps=0.13.6' 'ncurses' 'xmlrpc-c')
+depends=('cppunit' 'curl>=7.15.4' 'libtorrent-ps>=1.0' 'ncurses' 'xmlrpc-c')
 provides=('rtorrent')
 conflicts=('rtorrent' 'rtorrent-cdl' 'rtorrent-color' 'rtorrent-git' 'rtorrent-ipv6' 'rtorrent-ps-git' 'rtorrent-pyro-git' 'rtorrent-vi-color')
-source=("https://github.com/rakshasa/$_pkgname/archive/$pkgver.tar.gz"
+source=("https://github.com/rakshasa/$_pkgname/archive/$_pkgver.tar.gz"
         "command_pyroscope.cc"
         "ps-fix-sort-started-stopped-views_all.patch"
         "ps-info-pane-xb-sizes_all.patch"
@@ -24,7 +25,7 @@ source=("https://github.com/rakshasa/$_pkgname/archive/$pkgver.tar.gz"
         "ui_pyroscope.h"
         "ui_pyroscope.patch")
 md5sums=('b8b4009f95f8543244ae1d23b1810d7c'
-         'd44e605a784ec45b0bfafce3676842c4'
+         '1422a6fc123d03bd0606f6d85738ec35'
          '3fd739c0d5a9442f0cdec9ed5a720eaa'
          'f1539d70c74e5c74d8a15d51675aa26c'
          '2d34e8c86c1c6ed1354b55ca21819886'
@@ -37,17 +38,16 @@ md5sums=('b8b4009f95f8543244ae1d23b1810d7c'
          '0a2bbaf74c7160ba33876dcc2f050f14')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   # Version handling
-  RT_HEX_VERSION=$(printf "0x%02X%02X%02X" ${pkgver//./ })
+  RT_HEX_VERSION=$(printf "0x%02X%02X%02X" ${_pkgver//./ })
   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
 
   # Patch rTorrent
-  for patch in "$srcdir"/ps-*.patch; do
-    msg2 "$patch"
-    patch -uNlp1 -i "$patch"
+  for corepatch in $srcdir/ps-*_{${_pkgver},all}.patch; do
+    test ! -e "$corepatch" || { msg2 "$(basename $corepatch)"; patch -uNp1 -i "$corepatch"; }
   done
 
   msg2 "pyroscope.patch"
@@ -59,13 +59,13 @@ prepare() {
   msg2 "ui_pyroscope.patch"
   patch -uNp1 -i "$srcdir/ui_pyroscope.patch"
 
-  sed -i -e 's/rTorrent \" VERSION/rTorrent-PS " VERSION/' src/ui/download_list.cc
+  sed -i -e 's/rTorrent \" VERSION/rTorrent PS-'"$VERSION_EXTRAS"' " VERSION/' src/ui/download_list.cc
 
   ./autogen.sh
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -76,7 +76,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   make DESTDIR="$pkgdir" install
 
diff --git a/command_pyroscope.cc b/command_pyroscope.cc
index ceef0ee0026f..d7356b6d4127 100644
--- a/command_pyroscope.cc
+++ b/command_pyroscope.cc
@@ -322,6 +322,7 @@ torrent::Object apply_ui_bind_key(rpc::target_type target, const torrent::Object
     const std::string& element  = (itr++)->as_string();
     const std::string& keydef   = (itr++)->as_string();
     const std::string& commands = (itr++)->as_string();
+    const bool verbose = rpc::call_command_value("ui.bind_key.verbose");
 
     // Get key index from definition
     if (keydef.empty() || keydef.size() > (keydef[0] == '0' ? 4 : keydef[0] == '^' ? 2 : 1))
@@ -365,7 +366,7 @@ torrent::Object apply_ui_bind_key(rpc::target_type target, const torrent::Object
             return torrent::Object();
     }
 
-    if (!new_binding) {
+    if (!new_binding && verbose) {
         std::string msg = "Replaced key binding";
         msg += " for " + keydef + " in " + element + " with " + commands.substr(0, 30);
         if (commands.size() > 30) msg += "...";
@@ -546,6 +547,7 @@ void initialize_command_pyroscope() {
 
     CMD2_ANY_LIST("compare", &apply_compare);
     CMD2_ANY("ui.bind_key", &apply_ui_bind_key);
+    CMD2_VAR_VALUE("ui.bind_key.verbose", 1);
     CMD2_DL("d.tracker_domain", _cxxstd_::bind(&cmd_d_tracker_domain, _cxxstd_::placeholders::_1));
     CMD2_ANY_STRING("log.messages", _cxxstd_::bind(&cmd_log_messages, _cxxstd_::placeholders::_2));
     CMD2_ANY("ui.focus.home", _cxxstd_::bind(&cmd_ui_focus_home));