From 7a02c4a15cd6679ba6b8b2f8a9f61ae0e5bff5a5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 10 Sep 2018 19:11:09 +0000
Subject: runit-scripts: add transmissiond run

---
 abs/core/runit-scripts/PKGBUILD                               |  2 +-
 .../runit-scripts/runitscripts/services/transmissiond/run     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 abs/core/runit-scripts/runitscripts/services/transmissiond/run

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 777d89f..253a6a1 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.5
-pkgrel=2
+pkgrel=3
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license=('BSD')
diff --git a/abs/core/runit-scripts/runitscripts/services/transmissiond/run b/abs/core/runit-scripts/runitscripts/services/transmissiond/run
new file mode 100644
index 0000000..20e115e
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/transmissiond/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting transmission daemon"
+
+#touch /var/log/transmission.log
+#chown mythtv:mythtv /var/log/transmission.log
+#exec chpst -umythtv transmission-daemon -f --logfile /var/log/transmission.log
+exec chpst -umythtv transmission-daemon -f
-- 
cgit v0.12


From ecb67efc2ecf7671447d3eb22d94b4b5d817208d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 21 Sep 2018 20:55:17 +0000
Subject: mythtv mythplugins mythweb: update to latest fixes

mythweb: add Channel.php_remove_small_icons.patch to remove icons that are less than 100 bytes so that they will be pulled from the backend
---
 abs/core/mythtv/stable-29/git_src/git_hash                 |  2 +-
 abs/core/mythtv/stable-29/mythplugins/PKGBUILD             |  2 +-
 abs/core/mythtv/stable-29/mythtv/PKGBUILD                  |  2 +-
 .../stable-29/mythweb/Channel.php_remove_small_icons.patch | 14 ++++++++++++++
 abs/core/mythtv/stable-29/mythweb/PKGBUILD                 |  6 ++++--
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch

diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash
index 524ff49..01dcaa0 100644
--- a/abs/core/mythtv/stable-29/git_src/git_hash
+++ b/abs/core/mythtv/stable-29/git_src/git_hash
@@ -1 +1 @@
-e5fc66e822072037aeaf8c54c4292f17f65cef56
+b9c5f8b2ff983343d2545ec87022d18fcf65fe1f
diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
index 7dcae9e..d7da4fe 100644
--- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=29.1
-pkgrel=9
+pkgrel=10
 arch=('x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
index a850229..1d54b46 100644
--- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=29.1
-pkgrel=9
+pkgrel=10
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
diff --git a/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch
new file mode 100644
index 0000000..f786d15
--- /dev/null
+++ b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch
@@ -0,0 +1,14 @@
+diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
+index a4350283..be45b6ff 100644
+--- ./modules/tv/classes/Channel.php
++++ ./modules/tv/classes/Channel.php
+@@ -113,6 +113,9 @@ class Channel extends MythBase {
+         foreach ($channel_data AS $key => $value)
+             $this->$key = $value;
+         $this->icon = 'data/tv_icons/'.basename($channel_data['icon']);
++        // Remove icons smaller than 100 bytes
++        if (file_exists($this->icon) && filesize($this->icon) < 100)
++            unlink($this->icon);
+     // Try to copy over any missing channel icons
+         if ($channel_data['icon'] && !file_exists($this->icon)) {
+         // Local file?
diff --git a/abs/core/mythtv/stable-29/mythweb/PKGBUILD b/abs/core/mythtv/stable-29/mythweb/PKGBUILD
index f83912e..7057f25 100644
--- a/abs/core/mythtv/stable-29/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=29
-pkgrel=5
+pkgrel=6
 commit_hash=`cat ../git_src/git_hash_web`
 pkgdesc="Web interface for MythTV's backend, $commit_hash"
 arch=('x86_64')
@@ -10,7 +10,8 @@ depends=('lighttpd' "mythtv>=${pkgver}" 'php' 'supplemental-web')
 groups=('mythtv-extras')
 install=mythweb.install
 
-patches=('video.css.patch')
+patches=('video.css.patch'
+         'Channel.php_remove_small_icons.patch')
 source=(`echo ${patches[@]:0}` 
         'mythweb.include'
         'mythweb_gen_light.conf')
@@ -54,5 +55,6 @@ package() {
     install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf
 }
 md5sums=('668a36e404c8254f56e7a7304e655332'
+         '333d145899a1b48a7648d933344ee9ed'
          '7645a6399434cbba35639713ac5d88e0'
          'df190116b3aba35720fb6631885f973f')
-- 
cgit v0.12


From 2f368f5ae69df19304148f84fcd1c4ae85f0929d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 29 Sep 2018 14:09:12 +0000
Subject: ell: initial inclusion; dep of bluez

---
 abs/extra/ell/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 abs/extra/ell/PKGBUILD

diff --git a/abs/extra/ell/PKGBUILD b/abs/extra/ell/PKGBUILD
new file mode 100644
index 0000000..53d7b71
--- /dev/null
+++ b/abs/extra/ell/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Jameson Pugh <imntreal@gmail.com>
+
+pkgname=ell
+_commit=726ca36c2a494d7b22222f35a0cedf04114cdabf  # tags/0.5
+pkgver=0.5
+pkgrel=1
+pkgdesc="Embedded Linux library"
+arch=(x86_64)
+url="https://git.kernel.org/pub/scm/libs/ell/ell.git/"
+license=('LGPL2.1')
+depends=('glibc')
+makedepends=('git')
+source=("git+https://git.kernel.org/pub/scm/libs/ell/ell.git/#commit=$_commit")
+sha256sums=('SKIP')
+
+prepare() {
+  cd "$pkgname"
+  ./bootstrap
+}
+
+build() {
+  cd "$pkgname"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$pkgname"
+  make -k check
+}
+
+package() {
+  cd "$pkgname"
+  make DESTDIR="$pkgdir/" install
+}
-- 
cgit v0.12


From 3ddd164524d33b31d02e2f41c86d6e4652182e70 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 29 Sep 2018 14:38:14 +0000
Subject: bluez: update to 5.50

---
 abs/extra/bluez/PKGBUILD                           | 40 +++++++++++------
 .../refresh_adv_manager_for_non-LE_devices.diff    | 52 ++++++++++++++++++++++
 2 files changed, 78 insertions(+), 14 deletions(-)
 create mode 100644 abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff

diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index db1044c..5b50f6b 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id$
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.39
-pkgrel=1
+pkgver=5.50
+pkgrel=3
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd')
-source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe)
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'ell')
+source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+        bluetooth.modprobe
+        refresh_adv_manager_for_non-LE_devices.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b'
+sha512sums=('64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+            '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650'
+            'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \
@@ -27,7 +33,10 @@ build() {
           --sysconfdir=/etc \
           --localstatedir=/var \
           --libexecdir=/usr/lib \
+          --enable-btpclient \
+          --enable-midi \
           --enable-sixaxis \
+          --enable-mesh \
           --enable-experimental \
           --enable-library # this is deprecated
   make
@@ -35,13 +44,13 @@ build() {
 
 check() {
   cd $pkgname-$pkgver
-  make check
+  make check || /bin/true # https://bugzilla.kernel.org/show_bug.cgi?id=196621
 }
 
 
 package_bluez() {
   pkgdesc="Daemons for the bluetooth protocol stack"
-  depends=('libical' 'dbus' 'glib2')
+  depends=('libical' 'dbus' 'glib2' 'alsa-lib')
   backup=('etc/dbus-1/system.d/bluetooth.conf'
           'etc/bluetooth/main.conf')
   conflicts=('obexd-client' 'obexd-server')
@@ -65,7 +74,11 @@ package_bluez() {
   cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
   # fix module loading errors
   install -dm755 ${pkgdir}/usr/lib/modprobe.d
-  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf	
+  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
+  # load module at system start required by some functions
+  # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+  install -dm755 $pkgdir/usr/lib/modules-load.d
+  echo "crypto_user" > $pkgdir/usr/lib/modules-load.d/bluez.conf
   
   # fix obex file transfer - https://bugs.archlinux.org/task/45816
   ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
@@ -74,6 +87,7 @@ package_bluez() {
 package_bluez-utils() {
   pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
   depends=('dbus' 'systemd' 'glib2')
+  optdepends=('ell: for btpclient')
   conflicts=('bluez-hcidump')
   provides=('bluez-hcidump')
   replaces=('bluez-hcidump' 'bluez<=4.101')
@@ -88,8 +102,6 @@ package_bluez-utils() {
     filename=$(basename $files)
     install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
   done
-  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
-  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
   
   # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
   #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
diff --git a/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff b/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff
new file mode 100644
index 0000000..922d9d3
--- /dev/null
+++ b/abs/extra/bluez/refresh_adv_manager_for_non-LE_devices.diff
@@ -0,0 +1,52 @@
+From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
+From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0  btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1  0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
+    adapter=0x556fe53f7c70) at src/adapter.c:543
+2  new_settings_callback (index=<optimized out>, length=<optimized out>,
+    param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
+3  0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
+    status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
+    length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4  0x0000556fe462cd9d in can_read_data (io=<optimized out>,
+    user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5  0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
+    cond=<optimized out>, user_data=<optimized out>)
+    at src/shared/io-glib.c:170
+6  0x00007fe351c980e5 in g_main_context_dispatch ()
+   from /usr/lib64/libglib-2.0.so.0
+7  0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8  0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9  0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
+    at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 6b9222b..daccfdc 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ 		g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ 					ADAPTER_INTERFACE, "Discoverable");
+ 		store_adapter_info(adapter);
+-		btd_adv_manager_refresh(adapter->adv_manager);
++		if (adapter->supported_settings & MGMT_SETTING_LE)
++			btd_adv_manager_refresh(adapter->adv_manager);
+ 	}
+ 
+ 	if (changed_mask & MGMT_SETTING_BONDABLE) {
+-- 
+cgit v1.1
+
+
-- 
cgit v0.12


From 93ccbe2d5add497ced90b64b96cdd2e0b93d63a5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 15:17:25 +0000
Subject: runit-scripts: bluetoothd/run: start bluetoothd instead of
 bluetoothctl

---
 abs/core/runit-scripts/PKGBUILD                             | 2 +-
 abs/core/runit-scripts/runitscripts/services/bluetoothd/run | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 253a6a1..11aee66 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.5
-pkgrel=3
+pkgrel=4
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license=('BSD')
diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
index 9b25f0b..bc5a564 100755
--- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
+++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
@@ -9,4 +9,4 @@
 /usr/bin/svwaitup -s 15 /service/dbus || exit 1
 stat_runit "Starting bluetooth"
 
-exec /usr/bin/bluetoothctl
+exec /usr/lib/bluetooth/bluetoothd
-- 
cgit v0.12


From f908aafc640049e09128336d6806916c2e72890c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 18:33:05 +0000
Subject: mythtv & mythplugins: update to latest fixes

---
 abs/core/mythtv/stable-29/git_src/git_hash                  |  2 +-
 abs/core/mythtv/stable-29/mythplugins/PKGBUILD              |  2 +-
 abs/core/mythtv/stable-29/mythtv/PKGBUILD                   |  4 ++--
 .../stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch | 13 +++++++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash
index 01dcaa0..3fed727 100644
--- a/abs/core/mythtv/stable-29/git_src/git_hash
+++ b/abs/core/mythtv/stable-29/git_src/git_hash
@@ -1 +1 @@
-b9c5f8b2ff983343d2545ec87022d18fcf65fe1f
+951f1fe7ea0bd54a8bb5ef08f3b55feee5169340
diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
index d7da4fe..69128c3 100644
--- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=29.1
-pkgrel=10
+pkgrel=11
 arch=('x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
index 1d54b46..1e3d14c 100644
--- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=29.1
-pkgrel=10
+pkgrel=11
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
@@ -138,7 +138,7 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45'
          '6add9c16bbb988067e82029327e567b2'
          'b0b238320fa78a4928dce2cea7c85071'
          '8e4492d1777234a021f368bd6ee964ee'
-         'f2cb8dc8c4bff42102563a9e80011e19'
+         'e6f5c4f7ed0410fa07da6057d2631520'
          'a1c7fb6a3bd11b7b21f2ea8327a843e1'
          'd05eaf66c434a131c8efb4d87e99b402'
          '5f2bd4065b145b7b7ff09dfd6f08276c'
diff --git a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index 59024b7..2b57dc1 100644
--- a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,5 +1,5 @@
---- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2018-05-23 18:35:11.221352872 +0000
-+++ src/mythtv/i18n/mythfrontend_en_us.ts	2018-06-19 04:42:01.650264282 +0000
+--- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2018-10-12 15:14:32.718932846 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts	2018-10-12 15:15:18.343034045 +0000
 @@ -573,7 +573,7 @@
      <message>
          <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/>
@@ -23809,7 +23809,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/>
-@@ -30706,7 +31489,7 @@
+@@ -30706,19 +31489,19 @@
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/>
          <source>Fetching details for %1</source>
@@ -23818,7 +23818,12 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/>
-@@ -30718,7 +31501,7 @@
+         <source>Are you sure you want to permanently delete:
+ %1</source>
+-        <translation>Are you sure you want to permanently delete:
++        <translation>Are you sure you want to delete:
+ %1</translation>
+     </message>
      <message>
          <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/>
          <source>Failed to delete file</source>
-- 
cgit v0.12


From 401d16a21ac9c9840ab10f523e635a1424694045 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 18:36:31 +0000
Subject: python-psutil: initial inclusion

---
 abs/core/python_modules/python-psutil/PKGBUILD | 61 ++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 abs/core/python_modules/python-psutil/PKGBUILD

diff --git a/abs/core/python_modules/python-psutil/PKGBUILD b/abs/core/python_modules/python-psutil/PKGBUILD
new file mode 100644
index 0000000..1d05b76
--- /dev/null
+++ b/abs/core/python_modules/python-psutil/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Sébastien Luttringer
+
+pkgbase=python-psutil
+pkgname=('python-psutil' 'python2-psutil')
+pkgver=5.4.7
+pkgrel=1
+arch=('x86_64')
+url='https://github.com/giampaolo/psutil'
+license=('custom: BSD')
+makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
+checkdepends=('net-tools' 'procps-ng' 'python2-nose' 'python-nose')
+source=("https://github.com/giampaolo/psutil/archive/release-$pkgver.tar.gz")
+md5sums=('e8d6259eafe5925e7c522868aedd2caa')
+
+build() {
+  cd psutil-release-$pkgver
+
+  msg python
+  python setup.py build --build-lib=build/python
+
+  msg python2
+  python2 setup.py build --build-lib=build/python2
+  find build/python2 -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+check() {
+  cd psutil-release-$pkgver
+
+  msg python
+  export PYTHONPATH="$PWD/build/python"
+  cd psutil/tests/
+  # FIXME: dynamic loading so
+
+
+  msg python2
+  export PYTHONPATH="$PWD/build/python2"
+  #python2 psutil/tests/runner.py
+}
+
+package_python-psutil() {
+  pkgdesc='A cross-platform process and system utilities module for Python'
+  depends=('python')
+
+  cd psutil-release-$pkgver
+  python setup.py build --build-lib=build/python \
+                  install --root="$pkgdir" --optimize=1
+  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-psutil() {
+  pkgdesc='A cross-platform process and system utilities module for Python2'
+  depends=('python2')
+
+  cd psutil-release-$pkgver
+  python2 setup.py build --build-lib=build/python2 \
+                   install --root="$pkgdir" --optimize=1
+  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v0.12


From 493d80e618d8e685707be3425719933ba3f9146c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 19:10:51 +0000
Subject: python-bottle: initial inclusion

---
 abs/core/python_modules/python-bottle/PKGBUILD | 54 ++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 abs/core/python_modules/python-bottle/PKGBUILD

diff --git a/abs/core/python_modules/python-bottle/PKGBUILD b/abs/core/python_modules/python-bottle/PKGBUILD
new file mode 100644
index 0000000..ffc7340
--- /dev/null
+++ b/abs/core/python_modules/python-bottle/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Richard Murri <admin@richardmurri.com>
+# Contributor: Farhad Shahbazi <farhad@enthusiasm.cc>
+# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
+
+pkgbase=python-bottle
+pkgname=("python-bottle" "python2-bottle")
+pkgver=0.12.13
+pkgrel=2
+pkgdesc="A fast and simple micro-framework for small web-applications"
+arch=(any)
+url="http://bottlepy.org"
+license=('MIT')
+options=(!emptydirs)
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
+checkdepends=('python-mako' 'python2-mako' 'python-jinja' 'python2-jinja' 'python-cherrypy'
+              'python2-cherrypy' 'python-twisted' 'python2-twisted' 'python-tornado'
+              'python2-tornado' 'python-paste' 'python2-paste' 'python-gevent' 'python2-gevent'
+              'python-eventlet' 'python2-eventlet')
+source=("git+https://github.com/defnull/bottle.git#tag=${pkgver}")
+sha512sums=('SKIP')
+
+prepare() {
+  cp -a bottle{,-py2}
+  sed -i "1s/python/python2/" bottle-py2/bottle.py
+}
+
+check() {
+  cd "$srcdir/"bottle
+  # https://github.com/bottlepy/bottle/issues/791
+  python test/testall.py || warning 'Tests failed'
+
+  cd "$srcdir/"bottle-py2
+  python2 test/testall.py
+}
+
+package_python-bottle() {
+  depends=('python')
+
+  cd bottle
+  python setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-bottle() {
+  depends=('python2')
+
+  cd bottle-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  # deal with conflict with python-bottle's /usr/bin/bottle.py
+  mv "$pkgdir"/usr/bin/bottle.py{,2}
+}
-- 
cgit v0.12


From 0a79f54c23c924f2736452e45d1490132dc0649e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 19:11:12 +0000
Subject: python-ifaddr: initial inclusion

---
 abs/core/python_modules/python-ifaddr/PKGBUILD | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 abs/core/python_modules/python-ifaddr/PKGBUILD

diff --git a/abs/core/python_modules/python-ifaddr/PKGBUILD b/abs/core/python_modules/python-ifaddr/PKGBUILD
new file mode 100644
index 0000000..4e06e8e
--- /dev/null
+++ b/abs/core/python_modules/python-ifaddr/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Jelle van der Waa <jelle@archlinux.org>
+
+_name=ifaddr
+pkgname=python-ifaddr
+pkgver=0.1.4
+pkgrel=1
+pkgdesc="Enumerates all IP addresses on all network adapters of the system"
+arch=('any')
+url="https://github.com/pydron/ifaddr"
+license=('MIT')
+depends=('python')
+makedepends=('python-setuptools')
+checkdepends=('python-nose')
+source=(https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.zip)
+sha512sums=('5b080d8f328f7a974644e15929850ba93b9232cee545740d89e4d63e982e351287504befef365834bfb3f4c5f25dc99f4a4d76753405658ae197590e2ce94929')
+
+build() {
+  cd "${_name}-${pkgver}"
+  python3 setup.py build
+}
+
+package() {
+  cd "${_name}-${pkgver}"
+
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+}
+
+check() {
+  cd "${_name}-${pkgver}"
+  nosetests ${_name}/test_ifaddr.py
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v0.12


From e7404ba5f42677eefe496069cbeab89fbec1d5e2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 19:11:50 +0000
Subject: python-zeroconf: initial inclusion

---
 abs/core/python_modules/python-zeroconf/PKGBUILD | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 abs/core/python_modules/python-zeroconf/PKGBUILD

diff --git a/abs/core/python_modules/python-zeroconf/PKGBUILD b/abs/core/python_modules/python-zeroconf/PKGBUILD
new file mode 100644
index 0000000..1b2e286
--- /dev/null
+++ b/abs/core/python_modules/python-zeroconf/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Jelle van der Waa <jelle@archlinux.org>
+# Contributor: Maxim Andersson <thesilentboatman@gmail.com>
+
+pkgname=python-zeroconf
+pkgver=0.21.3
+pkgrel=1
+pkgdesc="A pure python implementation of multicast DNS service discovery"
+arch=('any')
+url="https://github.com/jstasiak/python-zeroconf"
+license=('LGPL')
+depends=('python' 'python-netifaces' 'python-six' 'python-ifaddr')
+makedepends=('python-setuptools')
+checkdepends=('python-pytest')
+source=("https://github.com/jstasiak/${pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('8c3aaed98f950b56c6e1aa440b56e0d48af49565cb4d7830a82cb3b01088aad8')
+
+build() {
+  cd "${pkgbase}-${pkgver}"
+  python3 setup.py build
+}
+
+package() {
+  cd "${pkgbase}-${pkgver}"
+
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+}
+
+check() {
+  cd "${pkgbase}-${pkgver}"
+  py.test .
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v0.12


From 1bd638098ff6108b05ef220d79b178efe170a7bf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 12 Oct 2018 19:12:49 +0000
Subject: glances: initial inclusion

---
 abs/extra/glances/PKGBUILD        | 32 ++++++++++++++++++++++++++++++++
 abs/extra/glances/glances.service |  8 ++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 abs/extra/glances/PKGBUILD
 create mode 100644 abs/extra/glances/glances.service

diff --git a/abs/extra/glances/PKGBUILD b/abs/extra/glances/PKGBUILD
new file mode 100644
index 0000000..16562fa
--- /dev/null
+++ b/abs/extra/glances/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+
+pkgname=glances
+pkgver=3.0.2
+pkgrel=1
+pkgdesc='CLI curses-based monitoring tool'
+arch=('any')
+url='https://github.com/nicolargo/glances'
+license=('LGPL')
+makedepends=('git')
+depends=('python' 'python-psutil' 'python-setuptools')
+optdepends=('hddtemp: HDD temperature monitoring support'
+            'python-bottle: web server support'
+            'python-docker: for the Docker monitoring support'
+            'python-matplotlib: for graphical/chart support'
+            'python-netifaces: for the IP plugin'
+            'python-zeroconf: for the autodiscover mode')
+source=("https://github.com/nicolargo/glances/archive/v${pkgver}.tar.gz"
+        'glances.service')
+sha512sums=('f86aa285e803c38a852eca6782642c0a854fdb14ae938e22482288d39045d2e6b42040409f5ba323784d3bd9a32386b90964b074d5a65cd03d904bde0ec941d3'
+            '49f0d185a37a5c5837e5beb463770c943ede40b2f1b8405e338129e897e97d9fc58373a8586fabc506266e6343cfea3c91b9787ac6832cc97a1ab63d6ad058d4')
+
+package() {
+  cd "glances-${pkgver}"
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+  install -Dm644 "${srcdir}"/glances.service \
+    "${pkgdir}"/usr/lib/systemd/system/glances.service
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/glances/glances.service b/abs/extra/glances/glances.service
new file mode 100644
index 0000000..4e8429d
--- /dev/null
+++ b/abs/extra/glances/glances.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Glances Server
+
+[Service]
+ExecStart=/usr/bin/glances -s
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v0.12


From 1e9a4cb5ef1594db04186fbf166c0c298ff4de1e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 15 Oct 2018 21:05:02 +0000
Subject: plex-media-server: update to 1.13.8.5395

---
 abs/extra/plex-media-server/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 76377a0..f305dd3 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Praekon <praekon@googlemail.com>
 
 pkgname=plex-media-server
-pkgver=1.13.5.5291
-_pkgsum=6fa5e50a8
+pkgver=1.13.8.5395
+_pkgsum=10d48da0d
 pkgrel=1
 pkgdesc='Plex Media Server'
 arch=('x86_64')
@@ -45,4 +45,4 @@ md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
          '97241861f2c0b7c82d1945a6c5de8e35'
          '506ec15815bba749a743780edd2323c8'
          'af6d0a81c7821b2eddb1bc137310ca1b'
-         'b0f64d2edd27a4849c6274382509130d')
+         'f47d1da2bd2150bccdb283cea21d4e9a')
-- 
cgit v0.12


From 099672c7dcf309a8ad100b2932a8d4470d08c7e1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 22 Oct 2018 17:39:46 +0000
Subject: find_orphans.py: fix encodings

---
 abs/core/LinHES-system/PKGBUILD        | 4 ++--
 abs/core/LinHES-system/find_orphans.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index c83c19a..348996b 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=8.5.2
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 install=system.install
 pkgdesc="Everything that makes LinHES an automated system"
@@ -128,7 +128,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
          'dedd3fcb1abec6361f4060d8149c7d6d'
          '8b0298f70f97cc1dc2a58b9a73c64bd3'
          'd2f1bec810a740885d9c0a2893186587'
-         'e30bf8ec8b9dcc2ceb7127375a91d8d1'
+         'c7b9435ae87d72f1179778c373dc43f9'
          'a8bbc553cd784ebed2197b96b60addc8'
          'a94fe6d980f4b810f2e2ae5352084b39'
          '0d1632ea63d8145c173c6aecf0b007f0'
diff --git a/abs/core/LinHES-system/find_orphans.py b/abs/core/LinHES-system/find_orphans.py
index b1d78de..3c6cc46 100644
--- a/abs/core/LinHES-system/find_orphans.py
+++ b/abs/core/LinHES-system/find_orphans.py
@@ -24,7 +24,7 @@ class File( str ):
         self.size = int(size)
     def pprint(self):
         name = u'%s: %s' % (self.host, os.path.join(self.path, self))
-        print u'  {0:<90}{1:>8}'.format(name, human_size(self.size))
+        print u'  {0:<90}{1:>8}'.format(name, human_size(self.size)).encode('utf-8')
     def delete(self):
         be = MythBE(self.host, db=DB)
         be.deleteFile(self, self.group)
@@ -35,20 +35,20 @@ class MyRecorded( Recorded ):
         name = u'{0.hostname}: {0.title}'.format(self)
         if self.subtitle:
             name += u' - '+self.subtitle
-        print u'  {0:<70}{1:>28}'.format(name,self.basename)
+        print u'  {0:<70}{1:>28}'.format(name,self.basename).encode('utf-8')
 
 def printrecs(title, recs):
     print title
     for rec in sorted(recs, key=lambda x: x.title):
         rec.pprint()
-    print u'{0:>88}{1:>12}'.format('Count:',len(recs))
+    print u'{0:>87}{1:>12}'.format('Count:',len(recs)).encode('utf-8')
 
 def printfiles(title, files):
     print title
     for f in sorted(files, key=lambda x: x.path):
         f.pprint()
     size = sum([f.size for f in files])
-    print u'{0:>88}{1:>12}'.format('Total:',human_size(size))
+    print u'{0:>87}{1:>12}'.format('Total:',human_size(size)).encode('utf-8')
 
 def populate(host=None):
     unfiltered = []
-- 
cgit v0.12


From 07f3a91be8f10dafa5fd24407fcae87cd2f3cad9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 22 Oct 2018 18:02:33 +0000
Subject: google-chrome: update to 70.0.3538.67. closes #1027

---
 abs/extra/google-chrome/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 603a73c..222c16a 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
 # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
 
 pkgname=google-chrome
-pkgver=66.0.3359.181
+pkgver=70.0.3538.67
 pkgrel=1
 pkgdesc="The popular and trusted web browser by Google (Stable Channel)"
 arch=('x86_64')
@@ -55,6 +55,6 @@ package() {
   rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
   rm "$pkgdir"/opt/google/chrome/product_logo_*.png
 }
-md5sums=('7623fe70625e3b53b280a9a966445f23'
+md5sums=('297579a04aadce6ea9502e536e44edd3'
          'd50d8f0a6940791eabc41c4f64e6a3cf'
          'ed4cf73982461af7d0d944c1cbf9f4e8')
-- 
cgit v0.12


From 0a4d5cece8f6b3148a61c6358026fdf2eb81cdb2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 25 Oct 2018 17:04:12 +0000
Subject: system-templates: wol remotes: update close keypress for chrome
 depreciating ctrl-shift-q. closes #1028

---
 abs/core/system-templates/PKGBUILD                                      | 2 +-
 abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc  | 2 +-
 .../system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb  | 2 +-
 .../system-templates/templates/remotes/favorites/streamzap/wol-lircrc   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 8bf61d1..a6286d8 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=8.5
-pkgrel=4
+pkgrel=5
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc
index 3600132..8c4ffe0 100644
--- a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc
@@ -6,7 +6,7 @@ end
 begin
     prog = irxevent
     button = stop
-    config = Key ctrl-shift-q CurrentWindow
+    config = Key ctrl-shift-w CurrentWindow
 end
 begin
     prog = irxevent
diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb
index 8a1f191..7acf7ac 100644
--- a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb
@@ -6,7 +6,7 @@ end
 begin
     prog = irxevent
     button = Stop
-    config = Key ctrl-shift-q CurrentWindow
+    config = Key ctrl-shift-w CurrentWindow
 end
 begin
     prog = irxevent
diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc
index 46c8eb2..bd3e26e 100644
--- a/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc
@@ -2,7 +2,7 @@
 begin
     prog = irxevent
     button = STOP
-    config = Key ctrl-shift-q CurrentWindow
+    config = Key ctrl-shift-w CurrentWindow
 end
 begin
 # Exit Chrome back to Myth
-- 
cgit v0.12

