From ceadc4984709885231d241bd210a61cb4e97935e Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 19 Feb 2009 13:08:27 -0600 Subject: Change pkgbuild to error out if patching the xml doesn't work. Fixed patch for libary.xml --- abs/core-testing/mythtv/stable/mythtv/PKGBUILD | 10 +++++----- .../mythtv/stable/mythtv/menu-xml/library.xml.patch | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD index 7b9c2a4..ae95780 100644 --- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.21 -pkgrel=40 +pkgrel=41 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \ @@ -77,10 +77,10 @@ build() { #Patch the xml LinHES style cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv cd $startdir/pkg/usr/share/mythtv - patch -p0 < $startdir/menu-xml/mainmenu.xml.patch - patch -p0 < $startdir/menu-xml/optical_menu.xml.patch - patch -p0 < $startdir/menu-xml/library.xml.patch - patch -p0 < $startdir/menu-xml/util_menu.xml.patch + patch -Np0 < $startdir/menu-xml/mainmenu.xml.patch || return 1 + patch -Np0 < $startdir/menu-xml/optical_menu.xml.patch || return 1 + patch -Np0 < $startdir/menu-xml/library.xml.patch || return 1 + patch -Np0 < $startdir/menu-xml/util_menu.xml.patch || return 1 #Make log dir mkdir -p $startdir/pkg/var/log/mythtv diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch index efc8623..c811970 100644 --- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch +++ b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch @@ -1,15 +1,14 @@ ---- library.xml.orig 2009-02-09 04:30:04.000000000 +0000 -+++ library.xml 2009-02-09 04:31:50.000000000 +0000 -@@ -119,10 +119,9 @@ +--- library.xml.orig 2008-08-31 03:27:59.000000000 +0000 ++++ library.xml 2009-02-19 18:55:23.000000000 +0000 +@@ -119,9 +119,9 @@ -