From 4b1ddc57a2f4cbf390f88f5b16d13bb92c8e9b43 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Feb 2017 20:36:32 +0000
Subject: LinHES-system: create_media_dirs.sh: make media/tmp r/w for all and
temp
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/create_media_dirs.sh | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 2ae0063..6e45a57 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.4
-pkgrel=19
+pkgrel=20
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -107,7 +107,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
'2c005d95312018bef80092136f80f254'
'c8db6a83ecc089ea37ab7fcb0f7a01cf'
'ca63946920ba33de1f15abda83e74e40'
- 'bc9a01dfed47d3f9d7599cf9c08b1066'
+ 'ce80e41338a5e446f0a75d12caa1a53d'
'3e60b17892e5b8214d47dcfddf5215a4'
'57ec994cc3964a10c00580e89ebcae35'
'00330dab3979f34b07b23b20ea06d37e'
diff --git a/abs/core/LinHES-system/create_media_dirs.sh b/abs/core/LinHES-system/create_media_dirs.sh
index 7c4ff2f..bd3d0fe 100644
--- a/abs/core/LinHES-system/create_media_dirs.sh
+++ b/abs/core/LinHES-system/create_media_dirs.sh
@@ -72,3 +72,4 @@ EOF
chown -R mythtv:users ${topdir}
chmod -R 775 ${topdir}
+chmod 1777 "${topdir}/media/tmp"
--
cgit v0.12
From 2696b694cc3a290dd4879cd874265c5315e0796a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Feb 2017 20:42:13 +0000
Subject: lighttpd: lighttpd.conf: add server.upload-dirs
---
abs/core/lighttpd/PKGBUILD | 4 ++--
abs/core/lighttpd/lighttpd.conf | 6 +++++-
abs/core/lighttpd/lighttpd.install | 3 +++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index d7405ab..4801dab 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=lighttpd
pkgver=1.4.45
-pkgrel=1
+pkgrel=2
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -64,7 +64,7 @@ package() {
}
md5sums=('98b97852441fc6b1942dfa9cf5c0beba'
'42d106b101d21ffd76ed9f3f1621e164'
- '1ff60252037689b0419e4c11af34b1ef'
+ 'fd4afd737fd16a82ba99b9a99533d34b'
'62779511e3f1127c3cc9b94c49f99c29'
'ef64c496602b182a551416a8ba6b3d43'
'1aeda5526e2cf1ca99d6e1571a6d9cf5')
diff --git a/abs/core/lighttpd/lighttpd.conf b/abs/core/lighttpd/lighttpd.conf
index 4d84dba..9831c5d 100644
--- a/abs/core/lighttpd/lighttpd.conf
+++ b/abs/core/lighttpd/lighttpd.conf
@@ -42,10 +42,14 @@ server.document-root = "/data/srv/httpd/htdocs"
#### accesslog module
#accesslog.filename = "/var/log/lighttpd/access.log"
-#send errors to syslog
+##send errors to syslog
server.errorlog-use-syslog = "enable"
$HTTP["url"] !~ "\.(jpe?g|png|gif|css)" { accesslog.use-syslog = "enable" }
+## File uploads
+# Make sure this folder exists and is writable to server.username
+# Add /data/storage/disk0/media/tmp/ for large file downloads in MythWeb
+server.upload-dirs = ( "/var/tmp/", "/data/storage/disk0/media/tmp/" )
# files to check for if .../ is requested
index-file.names = ( "index.php", "index.html",
diff --git a/abs/core/lighttpd/lighttpd.install b/abs/core/lighttpd/lighttpd.install
index 3526b71..9bd0c3a 100755
--- a/abs/core/lighttpd/lighttpd.install
+++ b/abs/core/lighttpd/lighttpd.install
@@ -3,6 +3,9 @@ post_install() {
usr/bin/systemd-tmpfiles --create lighttpd.conf
fi
+ #adjust permissions of /data/storage/disk0/media/tmp/
+ chmod 1777 /data/storage/disk0/media/tmp/
+
echo "Generate lighttpd include..."
gen_light_include.py
echo "Forcing a re-read of lighttpd's configuration file..."
--
cgit v0.12
From 999956633b9eb363f00aa4fe478a8d144a4c951c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Mar 2017 17:20:03 +0000
Subject: LinHES-system: add_storage.py: if can't find last disk num falback to
/data/storage/disk# links
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/add_storage.py | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 6e45a57..c6280b4 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.4
-pkgrel=20
+pkgrel=21
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -101,7 +101,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
'bc69a520add58ede9b060c73e67ace13'
'74e17d6f7453c52d56fecaed5c3f6ad5'
'47e093e8cfe4b5b96602358e1f540832'
- 'df3d5af03954168852b7e5c66fd174c6'
+ 'dbd51b9146f843acb582bb5722adbe37'
'0c81e5cad656f6260e39cd7585b1421a'
'e5bb027c54a2727d0bcf8d6fb357ba32'
'2c005d95312018bef80092136f80f254'
diff --git a/abs/core/LinHES-system/add_storage.py b/abs/core/LinHES-system/add_storage.py
index 82de56e..c172f6f 100755
--- a/abs/core/LinHES-system/add_storage.py
+++ b/abs/core/LinHES-system/add_storage.py
@@ -564,7 +564,20 @@ def last_disk_num():
disk_num = parser.get('storage', 'disk_num')
num_list.append(int(disk_num))
num_list.sort()
- return num_list[-1]
+ try:
+ return num_list[-1]
+ except:
+ # conf file or disk_num is missing so fallback to /data/storage/disk# links
+ for disk_name in glob.glob('/data/storage/disk*'):
+ disk_num = disk_name.strip('/data/storage/disk')
+ num_list.append(int(disk_num))
+ num_list.sort()
+ try:
+ return num_list[-1]
+ except:
+ print "Couldn't find last disk number."
+ sys.exit(1)
+
#--------------------------------------------
def main(scan_only, destruction, no_mount, install_call, dir_sg):
--
cgit v0.12
From 749098a1aa979853b4a7bb6c0495abc143e98e9a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Mar 2017 18:52:42 +0000
Subject: LinHES-config: mv_vnc.py: add xhost for root so sudo cmds run
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_vnc.py | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index b49c6b9..6019c82 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.4.3
-pkgrel=3
+pkgrel=4
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -177,7 +177,7 @@ md5sums=('fe70208a7c11f7e2115655ad0004ddaf'
'68ca2af6fb9dba32ed668b9ae1564a01'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
- 'b79fe6ef82b0b5e71d62806e773ed556'
+ '0e1c98392887b6efcb3f8b04ead7c4f9'
'3cb673adb83b6afa52cffaa621b9d96b'
'781f161a79c3188a31c8615b8258b241'
'dc56af9523253917c9feee0f083b4781'
diff --git a/abs/core/LinHES-config/mv_vnc.py b/abs/core/LinHES-config/mv_vnc.py
index 1a028d2..36e263c 100755
--- a/abs/core/LinHES-config/mv_vnc.py
+++ b/abs/core/LinHES-config/mv_vnc.py
@@ -19,6 +19,7 @@ def setupvnc_system(systemconfig,data_config):
#!/bin/bash
xhost + localhost
xhost + 127.0.0.1
+xhost + si:localuser:root
vncconfig -iconic &
if [ ! -e ~GNUstep ]
then
--
cgit v0.12
From aa51de14e24f00cb4a5481e20823f7aa491ced27 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Mar 2017 18:56:27 +0000
Subject: runit-scripts: vnc/run: change geometry to 1920x1080
mythinstall service menu items don't respect the -geometry switch and don't show correctly in vnc when host has large screen sizes
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/vnc/run | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index f31881e..96959be 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.4
-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/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run
index b67d174..c168251 100755
--- a/abs/core/runit-scripts/runitscripts/services/vnc/run
+++ b/abs/core/runit-scripts/runitscripts/services/vnc/run
@@ -7,7 +7,7 @@ MYTH_RUN_STATUS="1"
. /etc/rc.d/functions
. /etc/profile
stat_runit "Starting vnc service"
-geometry=1024x768
+geometry=1920x1080
#. /etc/conf.d/vncserver 2>/dev/null
cp -f $MV_ROOT/templates/vnc.service /etc/avahi/services/vnc.service 2>/dev/null
cd ~vncsvc
--
cgit v0.12
From 6872f58e91980db8ece16adb22eb5afbfd550b4d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Mar 2017 19:22:09 +0000
Subject: wmaker_settings: update Service Menu item names to match mythfrontend
menu ui
---
.../wmaker_settings/GNUstep/Defaults/WMState.vnc | 6 ++---
.../wmaker_settings/GNUstep/Defaults/myth_menu | 2 +-
.../wmaker_settings/GNUstep/Defaults/system_menu | 28 +++++++++++-----------
abs/core/wmaker_settings/PKGBUILD | 6 ++---
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc b/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc
index dbd9373..06da6be 100644
--- a/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/WMState.vnc
@@ -26,7 +26,7 @@
AutoLaunch = No;
Position = "0,2";
Lock = No;
- Command = "mythtv-setup --geometry 800x600";
+ Command = "mythtv-setup";
}
);
Applications = (
@@ -55,7 +55,7 @@
AutoLaunch = No;
Position = "0,2";
Lock = No;
- Command = "mythtv-setup --geometry 800x600";
+ Command = "mythtv-setup";
}
);
Lowered = No;
@@ -66,7 +66,7 @@
Name = Logo.WMClip;
BuggyApplication = No;
AutoLaunch = No;
- Position = "960,704";
+ Position = "1856,1016";
Lock = No;
Command = "-";
};
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu b/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu
index e626aea..0a40863 100644
--- a/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/myth_menu
@@ -1,4 +1,4 @@
"Applications" MENU
"MythFrontend" EXEC mythfrontend
- "MythTV setup" EXEC mythtv-setup
+ "MythTV Setup" EXEC mythtv-setup
"Applications" END
diff --git a/abs/core/wmaker_settings/GNUstep/Defaults/system_menu b/abs/core/wmaker_settings/GNUstep/Defaults/system_menu
index fb2750c..3646a67 100644
--- a/abs/core/wmaker_settings/GNUstep/Defaults/system_menu
+++ b/abs/core/wmaker_settings/GNUstep/Defaults/system_menu
@@ -1,18 +1,18 @@
"Service Menu" MENU
- "Access " EXEC sudo mythinstall -s accesscontrol
- "Add/Remove software " EXEC sudo mythinstall -s plugins,software
+ "Access" EXEC sudo mythinstall -s accesscontrol
"Advanced" EXEC sudo mythinstall -s advanced
- "Audio Settings" EXEC sudo mythinstall -s sound
- "Display " EXEC sudo mythinstall -s advancedX
+ "Audio" EXEC sudo mythinstall -s sound
+ "Display" EXEC sudo mythinstall -s advancedX
"Dynamic DNS" EXEC sudo mythinstall -s ddns
- "File shares" EXEC sudo mythinstall -s fileshare
- "Miscellanouse settings" EXEC sudo mythinstall -s misc
- "Network " EXEC sudo mythinstall -s network
- "Remotes " EXEC sudo mythinstall -s ir
- "Screensaver " EXEC sudo mythinstall -s screensaver
- "Shutdown settings " EXEC sudo mythinstall -s sleep
- "System Type " EXEC sudo mythinstall -s hostype
- "User accounts" EXEC sudo mythinstall -s user
- "VNC service " EXEC sudo mythinstall -s vnc
- "Web security" EXEC sudo mythinstall -s webuser
+ "File Sharing" EXEC sudo mythinstall -s fileshare
+ "Host" EXEC sudo mythinstall -s hostype
+ "Miscellaneous" EXEC sudo mythinstall -s misc
+ "Network" EXEC sudo mythinstall -s network
+ "Programs" EXEC sudo mythinstall -s plugins,software
+ "Remotes" EXEC sudo mythinstall -s ir
+ "Screensaver" EXEC sudo mythinstall -s screensaver
+ "Screen Sharing" EXEC sudo mythinstall -s vnc
+ "Shutdown" EXEC sudo mythinstall -s sleep
+ "User Accounts" EXEC sudo mythinstall -s user
+ "Web Security" EXEC sudo mythinstall -s webuser
"Service Menu" END
diff --git a/abs/core/wmaker_settings/PKGBUILD b/abs/core/wmaker_settings/PKGBUILD
index 0ad0dfd..af378d8 100644
--- a/abs/core/wmaker_settings/PKGBUILD
+++ b/abs/core/wmaker_settings/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=wmaker_settings
pkgver=1.0
-pkgrel=19
+pkgrel=20
pkgdesc="Default settings for windowmaker+ theme"
depends=('windowmaker')
source=()
@@ -10,8 +10,8 @@ install=wmaker_settings.install
configdir=/usr/share/wm_data
package() {
echo $startdir
- mkdir -p $pkgdir/$configdir
- rsync -arp --exclude=.svn $startdir/GNUstep $pkgdir/$configdir
+ mkdir -p $pkgdir/$configdir
+ rsync -arp --exclude=.svn $startdir/GNUstep $pkgdir/$configdir
mkdir -p $pkgdir/usr/share/WindowMaker/Themes/
rsync -arp $startdir/linhes.themed $pkgdir/usr/share/WindowMaker/Themes/
}
--
cgit v0.12
From 90d2d0a5437b2c5d2eabcd02e90d241a069753ca Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Mar 2017 19:52:37 +0000
Subject: LinHES-system: remove_storage.py: initial inclusion
add_storage.py: in reconstruct and reconstruct_sg add some checks for removed in .conf files
---
abs/core/LinHES-system/PKGBUILD | 7 +-
abs/core/LinHES-system/add_storage.py | 45 +++++---
abs/core/LinHES-system/remove_storage.py | 184 +++++++++++++++++++++++++++++++
3 files changed, 219 insertions(+), 17 deletions(-)
create mode 100755 abs/core/LinHES-system/remove_storage.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index c6280b4..aed479d 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.4
-pkgrel=21
+pkgrel=22
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -18,7 +18,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
lh_system_backup lh_system_backup_job lh_system_restore lh_system_restore_job
lh_system_host_update lh_system_all_host_update
add_storage.py balance_storage_groups.py empty_storage_groups.py
- diskspace.sh cacheclean lh_backend_control.sh
+ remove_storage.py diskspace.sh cacheclean lh_backend_control.sh
create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.py
gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
@@ -101,9 +101,10 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
'bc69a520add58ede9b060c73e67ace13'
'74e17d6f7453c52d56fecaed5c3f6ad5'
'47e093e8cfe4b5b96602358e1f540832'
- 'dbd51b9146f843acb582bb5722adbe37'
+ '727a886a1ba237906f48cda2e4e7844b'
'0c81e5cad656f6260e39cd7585b1421a'
'e5bb027c54a2727d0bcf8d6fb357ba32'
+ '17c75e02632ed83c2f73ca94ef701210'
'2c005d95312018bef80092136f80f254'
'c8db6a83ecc089ea37ab7fcb0f7a01cf'
'ca63946920ba33de1f15abda83e74e40'
diff --git a/abs/core/LinHES-system/add_storage.py b/abs/core/LinHES-system/add_storage.py
index c172f6f..29eecde 100755
--- a/abs/core/LinHES-system/add_storage.py
+++ b/abs/core/LinHES-system/add_storage.py
@@ -518,16 +518,16 @@ def prompt_sg(dir_sg):
if dir_sg != True:
loop = True
prompt_string='''
- MythTV Storage Groups are used for artwork, database backups,
+ MythTV storage groups are used for artwork, database backups,
photos, music, streaming, TV recordings, and videos.
The content on these storage groups will
only be available while the system is online.
- Enabling MythTV Storage Groups will create the directories
+ Enabling MythTV storage groups will create the directories
on the disk(s) and add the paths to the MythTV database.
- Enable MythTV Storage Groups (Y/N)?:'''
+ Enable MythTV storage groups (Y/N)?:'''
while loop:
str1 = raw_input(prompt_string)
@@ -538,14 +538,14 @@ def prompt_sg(dir_sg):
if str1 == 'Y' or str1 == 'y':
dir_sg = True
- print " ** Will add MythTV Storage Groups!"
+ print " ** Will add MythTV storage groups!"
else:
- print " ** Will NOT add MythTV Storage Groups!"
+ print " ** Will NOT add MythTV storage groups!"
dir_sg = False
else:
dir_sg = True
print "\n --add_sg option used"
- print " ** Will add MythTV Storage Groups!"
+ print " ** Will add MythTV storage groups!"
return dir_sg
@@ -774,7 +774,7 @@ def myth_main(no_mount,install_call,dir_sg):
runcmd(cmd)
def reconstruct_storagegroups():
- print "\nRecreating Storage Groups from contents of /etc/storage.d/\n"
+ print "\nRecreating storage groups from contents of /etc/storage.d/\n"
DB = MythDB()
host=gethostname()
@@ -784,15 +784,22 @@ def reconstruct_storagegroups():
parser.read(conf_file)
mount_point = parser.get('storage', 'mountpoint')
mmount = parser.getboolean('storage', 'mmount')
+ try:
+ removed = parser.getboolean('storage', 'removed')
+ except:
+ removed = False
+ if removed:
+ print "Skipping: " + mount_point + " - removed"
+ continue
if not os.path.ismount(mount_point):
- print "Skipping: " + mount_point + " not mounted"
+ print "Skipping: " + mount_point + " - not mounted"
continue
try:
dir_sg = parser.getboolean('storage', 'storage_groups')
except ConfigParser.NoOptionError, err:
print "SG not found in conf, get setting from DB"
dir_sg = False
- # Get Storage Group directories from DB
+ # Get storage sroup directories from DB
recs = DB.getStorageGroup(groupname="Default")
for record in recs:
if record.dirname.startswith(mount_point):
@@ -875,6 +882,10 @@ class reconstruct_path:
self.fstype = parser.get('storage', 'fstype')
except:
self.fstype = self.get_fstype()
+ try:
+ self.removed = parser.get('storage', 'removed')
+ except:
+ self.removed = False
def get_fstype(self):
cmd = "fsck -N UUID=%s" %self.uuid
@@ -903,6 +914,9 @@ class reconstruct_path:
def get_disk_num(self):
return self.disk_num
+ def get_removed(self):
+ return self.removed
+
def create_mount_point(self):
try:
os.stat(self.mount_point)
@@ -1035,6 +1049,9 @@ def reconstruct_mounts(no_mount):
print "\n"
cf = reconstruct_path(conf_file)
+ # skip if the disk was removed
+ if cf.get_removed():
+ continue
#print cf.get_conf()
#print cf.get_uuid()
print " Recreating %s" %cf.get_mount_point()
@@ -1070,15 +1087,15 @@ def usage():
Add disk to /etc/fstab
Mount the disk
Create the directories
- (if user enables MythTV Storage Groups)
+ (if user enables MythTV storage groups)
Write out the disk config file to /etc/storage.d/
Create disk# symlink at /data/storage/
Create /myth symlink (if applicable)
- Create MythTV Storage Group paths in MythTV database
- (if user enables MythTV Storage Groups)
+ Create MythTV storage group paths in MythTV database
+ (if user enables MythTV storage groups)
Options:
- --add_sg: Create the MythTV Storage Group directories and
+ --add_sg: Create the MythTV storage group directories and
database entries for database backups, TV
recordings, photos, music, streaming, videos
and artwork.
@@ -1095,7 +1112,7 @@ def usage():
/data/storage/disk# symlink, and mount the disk.
--no_mount is the only option that works with
--reconstruct.
- --reconstruct_sg: Recreate the MythTV Storage Group directories and
+ --reconstruct_sg: Recreate the MythTV storage group directories and
database entries if they don't exist.
No other options work with --reconstruct_sg.
--report: Scan disks and print new found disks.
diff --git a/abs/core/LinHES-system/remove_storage.py b/abs/core/LinHES-system/remove_storage.py
new file mode 100755
index 0000000..fd4c0b4
--- /dev/null
+++ b/abs/core/LinHES-system/remove_storage.py
@@ -0,0 +1,184 @@
+#!/usr/bin/python2
+#remove_storage.py removes disks that were added using add_storage.py
+#
+#Only disks that have a conf file in /etc/storage.d/ are presented
+#as choices to remove.
+
+
+import os,sys,commands
+import ConfigParser
+from ConfigParser import SafeConfigParser
+import glob
+from socket import gethostname
+from MythTV import MythDB
+
+storage_dir = "/etc/storage.d"
+
+def runcmd(cmd):
+ if True :
+ pass
+ else:
+ cmd = "echo "+cmd
+ #print cmd
+ cmdout = commands.getstatusoutput(cmd)
+ #logging.debug(" %s", cmdout)
+ return cmdout
+
+def read_fstab():
+ f = open('/etc/fstab', 'r')
+ fstab=f.readlines()
+ f.close()
+ return fstab
+
+def unmount_disk(conf):
+ if os.path.ismount(conf[1]):
+ print "Unmounting " + conf[1] + "."
+ cmd = "umount %s" %conf[1]
+ runcmd(cmd)
+
+def remove_fstab_entry(conf):
+ fstab=read_fstab()
+ f = open('/etc/fstab', 'w')
+ for line in fstab:
+ if not line.startswith("#"):
+ if line.find(conf[1]) > -1 and line.find(conf[2]) > -1 :
+ print "Removing " + conf[1] + " from fstab."
+ else:
+ f.write(line)
+ else:
+ f.write(line)
+ f.close()
+
+def remove_SG_entries(conf):
+ DB = MythDB()
+ host=gethostname()
+ with DB as c:
+ print "Removing " + conf[1] + " storage group\n paths from MythTV database."
+ c.execute("""delete from storagegroup where hostname = %s and dirname like %s""", (host,conf[1] + '%'))
+ c.execute("""delete from settings where hostname = %s and value like %s""", (host,'SGweightPerDir:' + host + ':' + conf[1] + '%'))
+
+def remove_disk_link(conf):
+ if os.path.islink("/data/storage/disk" + str(conf[0])):
+ print "Removing link /data/storage/disk%s." %(conf[0])
+ cmd = "rm -f /data/storage/disk%s" %(conf[0])
+ runcmd(cmd)
+
+def remove_disk_mount(conf):
+ print "Removing mountpoint %s." %(conf[1])
+ cmd = "rm -rf %s" %(conf[1])
+ runcmd(cmd)
+
+def update_conf_file(conf):
+ print "Updating %s file\n and running systemconfig." %(conf[4])
+ parser = SafeConfigParser()
+ parser.read(conf[4])
+ parser.set('storage','shareable',"False")
+ parser.set('storage','removed',"True")
+ with open(conf[4], 'wb') as conf[4]:
+ parser.write(conf[4])
+ cmd = "systemconfig.py -m fileshare"
+ runcmd(cmd)
+
+def usage():
+ help='''
+ remove_storage.py removes disks that were added using add_storage.py.
+ Only disks that have a conf file in /etc/storage.d/ are presented
+ as choices to remove.
+
+ Disks removed from the system are not erased or formatted.
+
+ Normal operations include (in this order):
+ Ask which disk to remove
+ Unmount the disk if mounted
+ Remove disk from /etc/fstab
+ Remove MythTV storage group paths in MythTV database
+ Remove disk# symlink at /data/storage/
+ Remove disk name mountpoint at /data/storage/
+ Make shareable = False in /etc/storage.d/DISKNAME.conf
+ Add removed = True in /etc/stoarge.d/DISKNAME.conf
+ Run systemconfig.py -m fileshare to update File Shares
+
+ Options:
+ -h, --help: Show this help message.
+ '''
+ print help
+ sys.exit(0)
+
+#--------------------------------------------
+
+def main():
+ all_confs = []
+
+ # get conf files that are not disk0 or not removed
+ for conf_file in glob.glob('%s/*.conf' %storage_dir):
+ this_conf = []
+ parser = SafeConfigParser()
+ parser.read(conf_file)
+ mounted = ""
+ disk_num = parser.get('storage', 'disk_num')
+ try:
+ removed = parser.get('storage', 'removed')
+ except:
+ removed = False
+ if disk_num == "0" or removed:
+ continue
+ this_conf.append(int(disk_num)) #0
+ this_conf.append(parser.get('storage', 'mountpoint')) #1
+ this_conf.append(parser.get('storage', 'uuid')) #2
+ if os.path.ismount(this_conf[1]):
+ this_conf.append("(mounted)") #3
+ else:
+ this_conf.append("") #3
+ this_conf.append(conf_file) #4
+ all_confs.append(this_conf)
+
+ # sort confs on disk num
+ all_confs.sort(key=lambda x: x[0])
+
+ # exit if no disks found
+ if len(all_confs) == 0:
+ print "\nThere are no disks to remove. Exiting."
+ sys.exit(0)
+
+ print "\nDisks found in /etc/storage.d/:\n"
+
+ # print list of disks to remove
+ for i,conf in enumerate(all_confs):
+ print str(i+1) + ": " + conf[1] + " (disk" + str(conf[0]) + ") " + conf[3]
+
+ # get user input of disk to remove
+ try:
+ conf_select=raw_input("\nEnter the number of the disk to remove: ")
+ conf_select=int(conf_select)
+ if conf_select > len(all_confs) or conf_select < 1:
+ conf_select=int("e")
+ except ValueError:
+ print "You must enter a number between 1 and " + str(len(all_confs)) + ". Exiting."
+ sys.exit(0)
+
+ selected_conf = all_confs[conf_select-1]
+
+ # confirm selection
+ confirm_select=raw_input("\nDisk " + selected_conf[1] + " (disk" + str(selected_conf[0]) + ") will be removed.\nAre you sure you want to remove it (yes/no)? ")
+ if confirm_select != "yes":
+ print "Exiting."
+ sys.exit(0)
+
+ print ""
+ unmount_disk(selected_conf)
+ remove_fstab_entry(selected_conf)
+ remove_SG_entries(selected_conf)
+ remove_disk_link(selected_conf)
+ remove_disk_mount(selected_conf)
+ update_conf_file(selected_conf)
+
+ print "\nDisk " + selected_conf[1] + " has been removed."
+
+if __name__ == "__main__":
+ if not os.geteuid()==0:
+ sys.exit("\nRoot access is required to run this program.\n")
+
+ if "--help" in sys.argv or "-h" in sys.argv:
+ usage()
+ else:
+ main()
--
cgit v0.12
From 390cbf1170ddc80564de91673ddf83fc1737210e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 15 Mar 2017 18:01:01 +0000
Subject: LinHES-system: mythwelcome-config.py: disable timeout if not running
mythwelcome and check if Master_backend
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/mythwelcome-config.py | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index aed479d..81b72a3 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.4
-pkgrel=22
+pkgrel=23
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -135,7 +135,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
'28f29578e5b3ba84fdf2aa57cf475bcf'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
- '6e95aa86413abdb568ed157cf11dd69f'
+ 'de3028ed75b53bd2f85ffbfdf64c44c2'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
'eb879fee9603a05d5420d4ce8ed9e450'
diff --git a/abs/core/LinHES-system/mythwelcome-config.py b/abs/core/LinHES-system/mythwelcome-config.py
index 01638a2..204a6e9 100755
--- a/abs/core/LinHES-system/mythwelcome-config.py
+++ b/abs/core/LinHES-system/mythwelcome-config.py
@@ -17,8 +17,12 @@ mythdb.settings[localhostname].MythShutdownXTermCmd = u'xterm'
mythdb.settings[localhostname].MythWelcomeStartFECmd = u'/usr/LH/bin/mythfrontend-start'
# mythtv-setup Shutdown/Wakeup options
-if mythdb.settings.NULL.idleTimeoutSecs == u'0' or mythdb.settings.NULL.idleTimeoutSecs == None:
- mythdb.settings.NULL.idleTimeoutSecs = u'40'
+if mythdb.settings[localhostname].HostSystemType == u'Master_backend':
+ if mythdb.settings[localhostname].HostUseMythWelcome == u'1':
+ if mythdb.settings.NULL.idleTimeoutSecs == u'0' or mythdb.settings.NULL.idleTimeoutSecs == None:
+ mythdb.settings.NULL.idleTimeoutSecs = u'60'
+ else:
+ mythdb.settings.NULL.idleTimeoutSecs = u'0'
mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'
--
cgit v0.12
From 81cf4710b9ea364fe00a20acabd5a7a3821067cd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 15 Mar 2017 18:06:36 +0000
Subject: LinHES-config: mv_hostype.py: always run mythwelcome-config.py
mythwelcome-config.py now checks if mythwelcome is enabled.
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_hostype.py | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 6019c82..2032b7d 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.4.3
-pkgrel=4
+pkgrel=5
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -175,7 +175,7 @@ md5sums=('fe70208a7c11f7e2115655ad0004ddaf'
'fe5e31b833cc6707209e9d656b6eb53c'
'336f08aed2e3c0b9fd09563933d54735'
'68ca2af6fb9dba32ed668b9ae1564a01'
- '38665330aeb3a8bdf7be24857fe035bb'
+ '8be8ce5f1d8522b1cde12d34840865c2'
'80685e047993b00161be29e3580f3a40'
'0e1c98392887b6efcb3f8b04ead7c4f9'
'3cb673adb83b6afa52cffaa621b9d96b'
diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index 880c0b9..2d4644d 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -351,10 +351,9 @@ def hostypeprint(systemconfig):
if data_config.SYSTEMTYPE == "MythVantage":
mv_common.remove_service("ghosd")
- if systemconfig.get("UseMythWelcome") == "1":
- logging.debug(" Running mythwelcome-config.py")
- cmd="/usr/LH/bin/mythwelcome-config.py"
- mv_common.runcmd(cmd)
+ logging.debug(" Running mythwelcome-config.py")
+ cmd="/usr/LH/bin/mythwelcome-config.py"
+ mv_common.runcmd(cmd)
if restart_mbe == True :
setup_mysql_connection(systemconfig)
--
cgit v0.12
From e72be4a2132baf7ae7ef3116a0ab2247a93bd0d0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 16 Mar 2017 13:26:10 +0000
Subject: mythtv & mythplugins: update to latest fixes
mythtv: move string changes to en_us translation so as not to affect other languages
---
abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 17 +-
.../mythtv/autoskip_reduce_commskip_jumpback.patch | 58 +---
.../stable-0.28/mythtv/change_msg_types.patch | 59 +---
.../mythtv/mythfrontend_en_us.ts_Title_Case.patch | 374 +++++++++++++++++++++
.../stable-0.28/mythtv/tv.cpp_fix_caps.patch | 13 -
7 files changed, 396 insertions(+), 129 deletions(-)
create mode 100644 abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
delete mode 100644 abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch
diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash
index d5f2f62..a6dbc61 100644
--- a/abs/core/mythtv/stable-0.28/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.28/git_src/git_hash
@@ -1 +1 @@
-299dbaee22795d09503f028670f8bbc891c42c5b
+044b22b95734ee607806ff8cea04e84c5112438d
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index f6d8e73..226088a 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.28.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index 77ce196..d98a045 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.28.1
-pkgrel=2
+pkgrel=3
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('avahi' 'exiv2' 'faad2' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'lib
'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python2-pycurl'
'python2-lxml' 'qt5-script' 'qt5-webkit' 'sdl' 'taglib' 'urlgrabber' 'wget'
'xmltv')
-makedepends=('mesa' 'mesa-libgl' 'yasm' 'x264' 'git' 'rsync')
+makedepends=('mesa' 'mesa-libgl' 'yasm' 'x264' 'git' 'rsync' 'qt5-tools')
replaces=()
groups=('pvr')
backup=()
@@ -28,10 +28,10 @@ patches=(
'change_msg_types.patch'
'disable_mythnotification_tuner_failure.patch'
'disable_subtitle_cutdown_in_recording_options.patch'
- 'tv.cpp_fix_caps.patch'
'searchMetatdataSelectedGrabber.patch'
'addDamagedToProgDetails.patch'
'defaultThemeLinHES.patch'
+ 'mythfrontend_en_us.ts_Title_Case.patch'
)
optdepends=()
@@ -59,6 +59,11 @@ build() {
done
msg "--------------------------done applying patches-------------------------"
+ msg "Updating translations"
+ cd ${srcdir}/$pkgname/i18n
+ lrelease -removeidentical translate.pro
+ cd ${srcdir}/$pkgname
+
msg "Configuring mythtv"
ARCH=${CARCH/_/-}
#disable mythlogserver due to http://code.mythtv.org/trac/ticket/11230
@@ -110,12 +115,12 @@ package() {
md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
'41098e898361a5a3cde3eaae358482a8'
- '0bf5e92c0609a7eda8f253bf2e032590'
- 'f8a56ac814722b110dc9859169b9bda9'
+ '2f983590a8a3cf81f386cc65b9628e13'
+ 'f764758832f8e9068ffda1ac0c8aacba'
'1cd668136deea20efb79cf3e6310effc'
'3420d15014274b5bf8083355af71304b'
- '62c42b1043ebf65959fa9eced9ca3ed8'
'0f674b9cad031ba1e03aaf6b5ee1499f'
'6add9c16bbb988067e82029327e567b2'
'6f916ebc2b1d0ca75c9aa6cec62c6fbb'
+ '1ea2f3bb6805ae733a6d8a36f7f7c860'
'e73bb7c5036e44a68b6f6aa2f1bac077')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
index b1c90ed..b6815ef 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
+++ b/abs/core/mythtv/stable-0.28/mythtv/autoskip_reduce_commskip_jumpback.patch
@@ -1,61 +1,13 @@
---- src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-08 13:35:22.657983969 +0000
-+++ src/mythtv/libs/libmythtv/commbreakmap.cpp 2016-04-13 21:42:51.461959071 +0000
-@@ -233,7 +233,7 @@
- if (kCommSkipOn == autocommercialskip)
+--- src/mythtv/libs/libmythtv/commbreakmap.cpp.orig 2017-03-15 20:34:21.722746111 +0000
++++ src/mythtv/libs/libmythtv/commbreakmap.cpp 2017-03-15 20:35:21.531732684 +0000
+@@ -271,8 +271,8 @@
{
- //: %1 is the skip time
-- comm_msg = tr("Skip %1").arg(skipTime);
-+ comm_msg = tr("Skip Commercial: %1").arg(skipTime);
- }
- else
- {
-@@ -269,10 +269,9 @@
- if ((skipcommercials == (0 - lastCommSkipDirection)) &&
- ((time(NULL) - lastCommSkipTime) <= 5))
- {
-- comm_msg = tr("Skipping Back.");
--
+ comm_msg = tr("Skipping Back.");
+
- if (lastCommSkipStart > (2.0 * video_frame_rate))
- lastCommSkipStart -= (long long) (2.0 * video_frame_rate);
-+ comm_msg = tr("Skipping Back");
+ if (lastCommSkipStart > (video_frame_rate))
+ lastCommSkipStart -= (long) (video_frame_rate);
lastCommSkipDirection = 0;
lastCommSkipTime = time(NULL);
jumpToFrame = lastCommSkipStart;
-@@ -287,7 +286,7 @@
- if ((commBreakIter == commBreakMap.begin()) &&
- (skipcommercials < 0))
- {
-- comm_msg = tr("Start of program.");
-+ comm_msg = tr("Start of Program");
- jumpToFrame = 0;
- return true;
- }
-@@ -297,7 +296,7 @@
- ((totalFrames) &&
- ((commBreakIter.key() + (10 * video_frame_rate)) > totalFrames))))
- {
-- comm_msg = tr("At End, cannot Skip.");
-+ comm_msg = tr("At End, Cannot Skip");
- return false;
- }
-
-@@ -313,7 +312,7 @@
- {
- if (commBreakIter == commBreakMap.begin())
- {
-- comm_msg = tr("Start of program.");
-+ comm_msg = tr("Start of Program");
- jumpToFrame = 0;
- return true;
- }
-@@ -341,7 +340,7 @@
- ((commBreakIter.key() + (10 * video_frame_rate)) >
- totalFrames)))
- {
-- comm_msg = tr("At End, cannot Skip.");
-+ comm_msg = tr("At End, Cannot Skip");
- return false;
- }
- }
diff --git a/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch b/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
index 5db23c9..029dd9a 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
+++ b/abs/core/mythtv/stable-0.28/mythtv/change_msg_types.patch
@@ -1,37 +1,6 @@
---- src/mythtv/libs/libmythtv/tv_play.cpp.orig 2016-04-12 21:18:14.577336824 +0000
-+++ src/mythtv/libs/libmythtv/tv_play.cpp 2016-04-14 20:18:44.680018060 +0000
-@@ -10905,7 +10905,7 @@
- else if (action == ACTION_TOGGLEOSDDEBUG)
- ToggleOSDDebug(actx);
- else if (action == "TOGGLEMANUALZOOM")
-- SetManualZoom(actx, true, tr("Zoom Mode ON"));
-+ SetManualZoom(actx, true, tr("Zoom Mode On"));
- else if (action == "TOGGLESTRETCH")
- ToggleTimeStretch(actx);
- else if (action == ACTION_ENABLEUPMIX)
-@@ -12228,7 +12228,7 @@
- {
- active = m_tvm_is_on;
- BUTTON2(actionName,
-- tr("Turn Auto-Expire OFF"), tr("Turn Auto-Expire ON"));
-+ tr("Turn Auto-Expire Off"), tr("Turn Auto-Expire On"));
- }
- }
- else if (actionName == "QUEUETRANSCODE")
-@@ -12705,18 +12705,18 @@
- if (ctx->playingInfo->QueryAutoExpire() != kDisableAutoExpire)
- {
- ctx->playingInfo->SaveAutoExpire(kDisableAutoExpire);
-- desc = tr("Auto-Expire OFF");
-+ desc = tr("Auto-Expire Off");
- }
- else
- {
- ctx->playingInfo->SaveAutoExpire(kNormalAutoExpire);
-- desc = tr("Auto-Expire ON");
-+ desc = tr("Auto-Expire On");
- }
-
+--- src/mythtv/libs/libmythtv/tv_play.cpp.orig 2017-03-15 20:27:51.672833870 +0000
++++ src/mythtv/libs/libmythtv/tv_play.cpp 2017-03-15 20:29:10.646025774 +0000
+@@ -12714,7 +12714,7 @@
ctx->UnlockPlayingInfo(__FILE__, __LINE__);
if (!desc.isEmpty())
@@ -40,7 +9,7 @@
}
void TV::SetAutoCommercialSkip(const PlayerContext *ctx,
-@@ -12733,7 +12733,7 @@
+@@ -12731,7 +12731,7 @@
ctx->UnlockDeletePlayer(__FILE__, __LINE__);
if (!desc.isEmpty())
@@ -49,23 +18,3 @@
}
void TV::SetManualZoom(const PlayerContext *ctx, bool zoomON, QString desc)
---- ../git_src/mythtv/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-12 21:18:14.574003917 +0000
-+++ src/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-14 20:05:49.146211278 +0000
-@@ -4267,7 +4267,7 @@
- else if (action == ACTION_SELECT)
- {
- deleteMap.NewCut(frame);
-- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short);
-+ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short);
- refresh = true;
- }
- else if (action == "DELETE")
-@@ -4303,7 +4303,7 @@
- if (handled && (action == "CUTTOBEGINNING" ||
- action == "CUTTOEND" || action == "NEWCUT"))
- {
-- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short);
-+ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short);
- }
- else if (handled && action == "UNDO")
- {
diff --git a/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
new file mode 100644
index 0000000..0c92b5a
--- /dev/null
+++ b/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -0,0 +1,374 @@
+--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-03-15 19:27:04.165403020 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-03-15 21:02:58.588551407 +0000
+@@ -3349,12 +3349,12 @@
+ <message>
+ <location filename="../programs/mythfrontend/main.cpp" line="206"/>
+ <source>Play from bookmark</source>
+- <translation>Play from bookmark</translation>
++ <translation>Play from Bookmark</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/main.cpp" line="207"/>
+ <source>Play from beginning</source>
+- <translation>Play from beginning</translation>
++ <translation>Play from Beginning</translation>
+ </message>
+ </context>
+ <context>
+@@ -3388,14 +3388,14 @@
+ <location filename="../libs/libmythtv/videosource.cpp" line="3817"/>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3852"/>
+ <source>Yes, delete capture cards</source>
+- <translation>Yes, delete capture cards</translation>
++ <translation>Yes, Delete Capture Cards</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3818"/>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3853"/>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3876"/>
+ <source>No, don't</source>
+- <translation>No, don't</translation>
++ <translation>No, Keep</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3834"/>
+@@ -3420,7 +3420,7 @@
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3875"/>
+ <source>Yes, delete capture card</source>
+- <translation>Yes, delete capture card</translation>
++ <translation>Yes, Delete Capture Card</translation>
+ </message>
+ </context>
+ <context>
+@@ -3674,12 +3674,12 @@
+ <message>
+ <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="186"/>
+ <source>Yes, delete group</source>
+- <translation>Yes, delete group</translation>
++ <translation>Yes, Delete Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="187"/>
+ <source>No, Don't delete group</source>
+- <translation>No, Don't delete group</translation>
++ <translation>No, Keep Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="239"/>
+@@ -4116,7 +4116,7 @@
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="368"/>
+ <source>Skip %1</source>
+ <extracomment>%1 is the skip time</extracomment>
+- <translation>Skip %1</translation>
++ <translation>Skip Commercial %1</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="241"/>
+@@ -4127,19 +4127,19 @@
+ <message>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="272"/>
+ <source>Skipping Back.</source>
+- <translation>Skipping Back.</translation>
++ <translation>Skipping Back</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="290"/>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="316"/>
+ <source>Start of program.</source>
+- <translation>Start of program.</translation>
++ <translation>Start of Program</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="300"/>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="344"/>
+ <source>At End, cannot Skip.</source>
+- <translation>At End, cannot Skip.</translation>
++ <translation>At End, Cannot Skip</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/commbreakmap.cpp" line="362"/>
+@@ -5611,7 +5611,7 @@
+ <message>
+ <location filename="../programs/mythfrontend/exitprompt.cpp" line="227"/>
+ <source>Yes, Exit now</source>
+- <translation>Yes, Exit now</translation>
++ <translation>Yes, Exit</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/exitprompt.cpp" line="229"/>
+@@ -11873,7 +11873,7 @@
+ <location filename="../libs/libmythtv/mythplayer.cpp" line="4270"/>
+ <location filename="../libs/libmythtv/mythplayer.cpp" line="4306"/>
+ <source>New cut added.</source>
+- <translation>New cut added.</translation>
++ <translation>New Cut Added</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/mythplayer.cpp" line="4275"/>
+@@ -12303,12 +12303,12 @@
+ <message>
+ <location filename="../libs/libmythui/myththemedmenu.cpp" line="322"/>
+ <source>Enter standby mode</source>
+- <translation>Enter standby mode</translation>
++ <translation>Standby</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythui/myththemedmenu.cpp" line="326"/>
+ <source>Exit application</source>
+- <translation>Exit application</translation>
++ <translation>Exit</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythui/myththemedmenu.cpp" line="333"/>
+@@ -12896,12 +12896,12 @@
+ <message>
+ <location filename="../libs/libmythtv/playgroup.cpp" line="288"/>
+ <source>Yes, delete group</source>
+- <translation>Yes, delete group</translation>
++ <translation>Yes, Delete Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/playgroup.cpp" line="289"/>
+ <source>No, Don't delete group</source>
+- <translation>No, Don't delete group</translation>
++ <translation>No, Keep Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/playgroup.cpp" line="312"/>
+@@ -13022,38 +13022,38 @@
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2623"/>
+ <source>Yes, and allow re-record</source>
+- <translation>Yes, and allow re-record</translation>
++ <translation>Yes, Delete and Allow Re-record</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2631"/>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2635"/>
+ <source>Yes, delete it</source>
+- <translation>Yes, delete it</translation>
++ <translation>Yes, Delete</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2639"/>
+ <source>Yes, stop recording</source>
+- <translation>Yes, stop recording</translation>
++ <translation>Yes, Stop Recording</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2653"/>
+ <source>Yes, delete it and the remaining %1 list items</source>
+- <translation>Yes, delete it and the remaining %1 list items</translation>
++ <translation>Yes, Delete Recording and the Remaining %1 List Items</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2663"/>
+ <source>No, keep it</source>
+- <translation>No, keep it</translation>
++ <translation>No, Keep</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2667"/>
+ <source>No, continue recording</source>
+- <translation>No, continue recording</translation>
++ <translation>No, Continue Recording</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2675"/>
+ <source>No, and keep the remaining %1 list items</source>
+- <translation>No, and keep the remaining %1 list items</translation>
++ <translation>No, Keep the Remaining %1 List Items</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/playbackbox.cpp" line="2695"/>
+@@ -14340,12 +14340,12 @@
+ <message>
+ <location filename="../libs/libmythtv/profilegroup.cpp" line="360"/>
+ <source>Yes, delete group</source>
+- <translation>Yes, delete group</translation>
++ <translation>Yes, Delete Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/profilegroup.cpp" line="361"/>
+ <source>No, Don't delete group</source>
+- <translation>No, Don't delete group</translation>
++ <translation>No, Keep Group</translation>
+ </message>
+ </context>
+ <context>
+@@ -14576,7 +14576,7 @@
+ <message>
+ <location filename="../programs/mythfrontend/progdetails.cpp" line="633"/>
+ <source>Auto-expire off</source>
+- <translation>Auto-expire off</translation>
++ <translation>Auto-Expire Off</translation>
+ </message>
+ <message>
+ <location filename="../programs/mythfrontend/progdetails.cpp" line="636"/>
+@@ -17786,12 +17786,12 @@
+ <message>
+ <location filename="../libs/libmythtv/tv.cpp" line="85"/>
+ <source>Auto-Skip OFF</source>
+- <translation>Auto-Skip OFF</translation>
++ <translation>Auto-Skip Off</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv.cpp" line="86"/>
+ <source>Auto-Skip ON</source>
+- <translation>Auto-Skip ON</translation>
++ <translation>Auto-Skip On</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv.cpp" line="87"/>
+@@ -21988,12 +21988,12 @@
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="165"/>
+ <source>Yes, remove directory</source>
+- <translation>Yes, remove directory</translation>
++ <translation>Yes, Remove Directory</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="166"/>
+ <source>No, Don't remove directory</source>
+- <translation>No, Don't remove directory</translation>
++ <translation>No, Keep Directory</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="223"/>
+@@ -22052,12 +22052,12 @@
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="323"/>
+ <source>Yes, delete group</source>
+- <translation>Yes, delete group</translation>
++ <translation>Yes, Delete Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="324"/>
+ <source>No, Don't delete group</source>
+- <translation>No, Don't delete group</translation>
++ <translation>No, Keep Group</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/>
+@@ -22733,7 +22733,7 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="10903"/>
+ <source>Zoom Mode ON</source>
+- <translation>Zoom Mode ON</translation>
++ <translation>Zoom Mode On</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="11500"/>
+@@ -23030,12 +23030,12 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/>
+ <source>Turn Auto-Expire OFF</source>
+- <translation>Turn Auto-Expire OFF</translation>
++ <translation>Turn Auto-Expire Off</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/>
+ <source>Turn Auto-Expire ON</source>
+- <translation>Turn Auto-Expire ON</translation>
++ <translation>Turn Auto-Expire On</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12185"/>
+@@ -23436,12 +23436,12 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12703"/>
+ <source>Auto-Expire OFF</source>
+- <translation>Auto-Expire OFF</translation>
++ <translation>Auto-Expire Off</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12708"/>
+ <source>Auto-Expire ON</source>
+- <translation>Auto-Expire ON</translation>
++ <translation>Auto-Expire On</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12951"/>
+@@ -23491,7 +23491,7 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13245"/>
+ <source>this recording</source>
+- <translation>this recording</translation>
++ <translation>this Recording</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13251"/>
+@@ -23541,27 +23541,27 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13373"/>
+ <source>Delete it, but allow it to re-record</source>
+- <translation>Delete it, but allow it to re-record</translation>
++ <translation>Delete Recording, and Allow Re-record</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13375"/>
+ <source>Delete it</source>
+- <translation>Delete it</translation>
++ <translation>Delete Recording</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13377"/>
+ <source>Save it so I can watch it again</source>
+- <translation>Save it so I can watch it again</translation>
++ <translation>Keep Recording</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13382"/>
+ <source>Yes, and allow re-record</source>
+- <translation>Yes, and allow re-record</translation>
++ <translation>Yes, Delete and Allow Re-record</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13384"/>
+ <source>Yes, delete it</source>
+- <translation>Yes, delete it</translation>
++ <translation>Yes, Delete Recording</translation>
+ </message>
+ </context>
+ <context>
+@@ -30107,12 +30107,12 @@
+ <message>
+ <location filename="../libs/libmythtv/transporteditor.cpp" line="325"/>
+ <source>Yes, delete the transport</source>
+- <translation>Yes, delete the transport</translation>
++ <translation>Yes, Delete Transport</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/transporteditor.cpp" line="326"/>
+ <source>No, don't</source>
+- <translation>No, don't</translation>
++ <translation>No, Keep Transport</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/transporteditor.cpp" line="360"/>
+@@ -31302,13 +31302,13 @@
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3950"/>
+ <source>Yes, delete video sources</source>
+- <translation>Yes, delete video sources</translation>
++ <translation>Yes, Delete Video Sources</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3951"/>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3975"/>
+ <source>No, don't</source>
+- <translation>No, don't</translation>
++ <translation>No, Keep</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3972"/>
+@@ -31318,7 +31318,7 @@
+ <message>
+ <location filename="../libs/libmythtv/videosource.cpp" line="3974"/>
+ <source>Yes, delete video source</source>
+- <translation>Yes, delete video source</translation>
++ <translation>Yes, Delete Video Source</translation>
+ </message>
+ </context>
+ <context>
diff --git a/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch b/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch
deleted file mode 100644
index dbe9553..0000000
--- a/abs/core/mythtv/stable-0.28/mythtv/tv.cpp_fix_caps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/mythtv/libs/libmythtv/tv.cpp.orig 2016-04-15 16:11:21.498478075 +0000
-+++ src/mythtv/libs/libmythtv/tv.cpp 2016-04-15 16:11:49.338228155 +0000
-@@ -82,8 +82,8 @@
- {
- const QString kCommSkipTitles[] =
- {
-- QObject::tr("Auto-Skip OFF"),
-- QObject::tr("Auto-Skip ON"),
-+ QObject::tr("Auto-Skip Off"),
-+ QObject::tr("Auto-Skip On"),
- QObject::tr("Auto-Skip Notify"),
- };
-
--
cgit v0.12
From dd062fa23ef63401fdd543c30ebdab5765d5e7a8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 16 Mar 2017 14:01:16 +0000
Subject: google-chrome: update to 57.0.2987.98
---
abs/extra/google-chrome/PKGBUILD | 18 +++++++++---------
abs/extra/google-chrome/google-chrome.install | 10 ----------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 732d627..dd9330f 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,23 +5,26 @@
# 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=56.0.2924.87
+pkgver=57.0.2987.98
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('x86_64')
url="https://www.google.com/chrome"
license=('custom:chrome')
-depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme'
- 'icu' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
-optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
- 'ttf-liberation: fix fonts for some PDFs')
-provides=('google-chrome' 'pepper-flash')
+depends=('alsa-lib' 'gconf' 'gtk2' 'libxss' 'libxtst' 'nss')
+optdepends=('kdialog: needed for file dialogs in KDE'
+ 'gnome-keyring: for storing passwords in GNOME keyring'
+ 'kwallet: for storing passwords in KWallet'
+ 'ttf-liberation: fix fonts for some PDFs (CRBug #369991)')
options=('!emptydirs' '!strip')
install=$pkgname.install
_channel=stable
source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb"
"$url/browser/privacy/eula_text.html"
'google-chrome-stable.sh')
+md5sums=('94fca0b7e96f2cce5d421ecebad04cbf'
+ 'SKIP'
+ '99fa93d5e7fb5d622cef0f9621f3ffa3')
package() {
msg2 "Extracting the data.tar.xz..."
@@ -53,6 +56,3 @@ package() {
msg2 "Rename google-chrome-stable to google-chrome..."
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
-md5sums=('c0143f6d5b5ffd291def19d2763c41fe'
- 'da54da9383ddffa44c5db45513239da2'
- '99fa93d5e7fb5d622cef0f9621f3ffa3')
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index 541b400..dfcc259 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -12,16 +12,7 @@ bold="${all_off}$(tput bold)"
blue="${bold}$(tput setaf 4)"
yellow="${bold}$(tput setaf 3)"
-_update() {
- msg_blue "Updating desktop MIME database..."
- update-desktop-database -q
-
- msg_blue "Updating icon cache.."
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-}
-
post_install() {
- _update
if [ ! -e /usr/bin/chromium ]; then
ln -s /usr/bin/google-chrome /usr/bin/chromium
fi
@@ -33,7 +24,6 @@ post_upgrade() {
}
post_remove() {
- _update
if [ -h /usr/bin/chromium ]; then
rm /usr/bin/chromium
fi
--
cgit v0.12
From d800300a8f72232ae1e3c4b4a60573db81f4aa3e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Mar 2017 16:44:51 +0000
Subject: mythtv & mythplugins: update some translation changes
---
abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 4 ++--
.../mythtv/mythfrontend_en_us.ts_Title_Case.patch | 15 ++++++++++++---
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index 226088a..c3c4631 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.28.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index d98a045..3b75471 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.28.1
-pkgrel=3
+pkgrel=4
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -122,5 +122,5 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
'0f674b9cad031ba1e03aaf6b5ee1499f'
'6add9c16bbb988067e82029327e567b2'
'6f916ebc2b1d0ca75c9aa6cec62c6fbb'
- '1ea2f3bb6805ae733a6d8a36f7f7c860'
+ 'decae343fa612feb6609c65d1fc2ad14'
'e73bb7c5036e44a68b6f6aa2f1bac077')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index 0c92b5a..3e7a738 100644
--- a/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/abs/core/mythtv/stable-0.28/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,5 +1,5 @@
---- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-03-15 19:27:04.165403020 +0000
-+++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-03-15 21:02:58.588551407 +0000
+--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2017-03-17 14:20:37.088541193 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts 2017-03-17 14:20:03.206227232 +0000
@@ -3349,12 +3349,12 @@
<message>
<location filename="../programs/mythfrontend/main.cpp" line="206"/>
@@ -275,6 +275,15 @@
</message>
<message>
<location filename="../libs/libmythtv/tv_play.cpp" line="12185"/>
+@@ -23233,7 +23233,7 @@
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="13386"/>
+ <source>No, keep it</source>
+- <translation>No, keep it</translation>
++ <translation>No, Keep</translation>
+ </message>
+ <message>
+ <location filename="../libs/libmythtv/tv_play.cpp" line="12527"/>
@@ -23436,12 +23436,12 @@
<message>
<location filename="../libs/libmythtv/tv_play.cpp" line="12703"/>
@@ -328,7 +337,7 @@
<location filename="../libs/libmythtv/tv_play.cpp" line="13384"/>
<source>Yes, delete it</source>
- <translation>Yes, delete it</translation>
-+ <translation>Yes, Delete Recording</translation>
++ <translation>Yes, Delete</translation>
</message>
</context>
<context>
--
cgit v0.12
From 3b506b542d0bc7c38dc242ed7ed387e829bf6bfb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Mar 2017 17:18:29 +0000
Subject: google-chrome: update to 57.0.2987.110
---
abs/extra/google-chrome/PKGBUILD | 10 ++++------
abs/extra/google-chrome/__changelog | 3 ++-
abs/extra/google-chrome/google-chrome-stable.sh | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index dd9330f..0c3a393 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=57.0.2987.98
+pkgver=57.0.2987.110
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('x86_64')
@@ -22,9 +22,9 @@ _channel=stable
source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb"
"$url/browser/privacy/eula_text.html"
'google-chrome-stable.sh')
-md5sums=('94fca0b7e96f2cce5d421ecebad04cbf'
+md5sums=('ba137093ddd19e643988e66d5821eb3d'
'SKIP'
- '99fa93d5e7fb5d622cef0f9621f3ffa3')
+ 'ed4cf73982461af7d0d944c1cbf9f4e8')
package() {
msg2 "Extracting the data.tar.xz..."
@@ -33,6 +33,7 @@ package() {
msg2 "Moving stuff in place..."
# Launcher
install -m755 google-chrome-$_channel.sh "$pkgdir"/usr/bin/google-chrome-$_channel
+ mv "$pkgdir"/usr/bin/google-chrome-$_channel "$pkgdir"/usr/bin/google-chrome
# Icons
for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
@@ -52,7 +53,4 @@ package() {
msg2 "Removing Debian Cron job and duplicate product logos..."
rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
rm "$pkgdir"/opt/google/chrome/product_logo_*.png
-
- msg2 "Rename google-chrome-stable to google-chrome..."
- mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
index 672914a..cdc2677 100644
--- a/abs/extra/google-chrome/__changelog
+++ b/abs/extra/google-chrome/__changelog
@@ -1,3 +1,4 @@
Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
-- PKGBUILD: Rename google-chrome-stable to google-chrome"
+- PKGBUILD: Rename google-chrome-stable to google-chrome
+- google-chrome-stable.sh: add --no-first-run
diff --git a/abs/extra/google-chrome/google-chrome-stable.sh b/abs/extra/google-chrome/google-chrome-stable.sh
index e55c822..51c4220 100644
--- a/abs/extra/google-chrome/google-chrome-stable.sh
+++ b/abs/extra/google-chrome/google-chrome-stable.sh
@@ -6,4 +6,4 @@ if [[ -f ~/.config/chrome-flags.conf ]]; then
fi
# Launch
-exec /opt/google/chrome/google-chrome $CHROME_USER_FLAGS "$@"
\ No newline at end of file
+exec /opt/google/chrome/google-chrome --no-first-run $CHROME_USER_FLAGS "$@"
--
cgit v0.12
From 2ebece31ee1ef9b693dbd3bcb0f76e87766ef577 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Mar 2017 18:53:50 +0000
Subject: plex-media-server: update to 1.4.4.3495
---
abs/extra/plex-media-server/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 158c5f8..d16cf65 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.3.4.3285
-_pkgsum=b46e0ea
+pkgver=1.4.4.3495
+_pkgsum=edef59192
pkgrel=1
pkgdesc='Plex Media Server'
arch=('armv7h' 'i686' 'x86_64')
@@ -57,6 +57,6 @@ md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
'97241861f2c0b7c82d1945a6c5de8e35'
'506ec15815bba749a743780edd2323c8'
'bd703bc750b989a27edd590eb8c8e9d7')
-md5sums_armv7h=('1f5359e970a9e6741668c4d713d44c25')
-md5sums_i686=('181350dcd403b2b59c635f50dc1d5ae4')
-md5sums_x86_64=('630650011eba73d01ae341b93ada0aea')
+md5sums_armv7h=('82b879522ce1227958593d502800ee20')
+md5sums_i686=('e18d15d12fcb2b55a77c2e5667d48b4e')
+md5sums_x86_64=('948530557edd831ea86d0557b58f8eeb')
--
cgit v0.12