linhes-theme: update to pull in updates from upstream.

refs #940. change version number of theme to reflect pkgbuild pkgver and pkgrel. Pull git src in prepare instead of pkgbuild source git as it wasn't updating

5 files changed, 35 insertions, 59 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 6145f7e..1335945 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,20 +1,36 @@
 pkgname=linhes-theme
 pkgver=8.1
-pkgrel=21
+pkgrel=22
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://linhes.org/"
 
-patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'music-ui.xml.patch'
-         'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'qtlook.txt.patch')
+patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
+         'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
 
-#The LinHES theme is based on TintedGlass 4.39 by Harley Peters
-source=("git+https://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
-        `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
+#The LinHES theme is based on TintedGlass 4.41 by Harley Peters
+source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
         'background.png' 'preview.png' 'tux_thoughts.png'
-        'LHLogoAndText.png'
-        'game-ui.xml' 'mytharchive-ui.xml' 'mythburn-ui.xml' 'mythnative-ui.xml')
+        'LHLogoAndText.png')
+
+prepare() {
+    _gitroot="https://github.com/MythTV-Themes/TintedGlass.git"
+    _gitname="TintedGlass"
+    _gitbranch="fixes/0.27"
+
+    cd $srcdir
+    if [ -d $_gitname ]
+    then
+        cd $_gitname 
+        git checkout $_gitbranch
+        git pull
+        msg "TintedGlass local files updated."
+    else
+        git clone -b $_gitbranch $_gitroot
+        msg "TintedGlass git checkout done."
+    fi
+}
 
 package() {
     THEMEROOT=usr/share/mythtv/themes
@@ -54,22 +70,20 @@ package() {
     grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g"
     #blue
     grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+
+    msg "Updating themeinfo.xml version number"
+    IFS="." read -a array <<< "$pkgver"
+    sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
+    sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
-md5sums=('SKIP'
-         '95478bd9bab15e9e4365c1048757c225'
+md5sums=('95478bd9bab15e9e4365c1048757c225'
          'ed4f8baf431e20babc345e4e2602426f'
-         'f52ad93730ae53ea0e1ac5d3c599133c'
-         '90476c9d03c734a4177954b5b0a4e864'
+         'cb8c0d63392f6c8c2d8219243fbf47c6'
          'ec11d601d47cd4b2954e1609262a571b'
-         '4ad8bc893412eeeb890f0b1f1f1bd541'
          '9fe3371a8b964a7028126405cfaa330b'
-         '7d7bc458a8f4af408700609f3e1f412e'
+         '5a8fb2a5f0e657d52be6f0a6a006ce72'
          'a0201e0aa1608eeab27ee754e4d2c1de'
          '12d26a786fde397348653128a6d7676a'
          '4b1c27297bb5f8d9d7bbaf72b35130b5'
          '2bd09b8049aaf5ba21db5baf3a0ce077'
-         '09ad14842f828b7a8d24070ec8214fe5'
-         '8933e2c7c3569091bebc9d086e574ffe'
-         '8151dcda813a9a01b989d45f3d17eedd'
-         'a0f423ab4089a2e8d65def7777169cd4'
-         '8bd8e94068b03fea2138423acb170559')
+         '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index f2487c3..588ce42 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -9,12 +9,3 @@
      </shape>
  
      <!-- Base definition of a heading group -->
-@@ -2140,7 +2140,7 @@
- 
-         <button name="ok" from="base_button">
-             <position>252,634</position>
--            <value>Ok</value>
-+            <value>OK</value>
-         </button>
- 
-         <textarea name="info_label" from="basetextarea">
diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch
deleted file mode 100644
index 61fe4be..0000000
--- a/abs/core/linhes-theme/music-ui.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- music-ui.xml.orig	2014-01-13 21:56:30.959750358 +0000
-+++ music-ui.xml	2014-01-13 21:56:47.534325378 +0000
-@@ -1972,7 +1972,7 @@
-         <group name="heading-backdrop" from="base_heading_group" />
- 
-         <textarea name="heading" from="base_heading">
--            <value>Edit Track  Information</value>
-+            <value>Edit Track Information</value>
-         </textarea>
- 
-         <shape name="edit-metadata-backdrop" from="base_backdrop">
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
deleted file mode 100644
index 0f97dbc..0000000
--- a/abs/core/linhes-theme/recordings-ui.xml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- recordings-ui.xml.orig	2014-01-02 22:23:26.659072294 +0000
-+++ recordings-ui.xml	2014-01-02 22:32:08.212500575 +0000
-@@ -579,13 +579,13 @@
-                         <align>allcenter</align>
-                     </textarea>
-                     <textarea name="s00e00" from="base_text_font_state_extrasmall">
--                        <area>510,42,60,20</area>
-+                        <area>500,42,70,20</area>
-                         <font state="normal">baseextrasmall</font>
-                         <cutdown>no</cutdown>
-                         <align>allcenter</align>
-                     </textarea>
-                     <textarea name="syndicatedepisode" from="base_text_font_state_extrasmall" depends="!s00e00">
--                        <area>510,42,60,20</area>
-+                        <area>500,42,70,20</area>
-                         <font state="normal">baseextrasmall</font>
-                         <cutdown>no</cutdown>
-                         <align>allcenter</align>
diff --git a/abs/core/linhes-theme/themeinfo.xml b/abs/core/linhes-theme/themeinfo.xml
index 3deae2c..dbd0e16 100644
--- a/abs/core/linhes-theme/themeinfo.xml
+++ b/abs/core/linhes-theme/themeinfo.xml
@@ -33,10 +33,10 @@
     <version>
         <!-- Major version changes mean the theme is no longer
              compatible with earlier versions of mythtv -->
-        <major>8</major>
+        <major>MAJ_VER</major>
 
         <!-- Minor version changes are backwards compatible -->
-        <minor>1</minor>
+        <minor>MIN_VER</minor>
     </version>
 
     <!-- Theme Details (Required) -->