diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-17 02:17:04 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-17 02:17:04 (GMT) |
| commit | 9bbf643f5f91cc9ed681010043e0ead9dcb95c11 (patch) | |
| tree | eeafa4a5105297a82c41d64eca1772094039c6fe | |
| parent | 582f337f8d50d6720058a40707409f5382dbf971 (diff) | |
| download | linhes_pkgbuild-9bbf643f5f91cc9ed681010043e0ead9dcb95c11.zip linhes_pkgbuild-9bbf643f5f91cc9ed681010043e0ead9dcb95c11.tar.gz linhes_pkgbuild-9bbf643f5f91cc9ed681010043e0ead9dcb95c11.tar.bz2 | |
mythtv: added additional patch to ignore BackendServerip when importting syssettings
| -rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 13 | ||||
| -rwxr-xr-x | abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch | 37 |
2 files changed, 44 insertions, 6 deletions
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 8d77484..46ee3e6 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,13 +6,13 @@ pkgname=mythtv pkgver=0.25 -pkgrel=11 +pkgrel=12 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') -depends=('mysql-clients' +depends=('mysql-clients' 'qt' 'qtwebkit' 'lame' @@ -20,14 +20,14 @@ depends=('mysql-clients' 'ffmpeg' 'fribidi' 'perl-soap-lite' - 'perl-date-manip' + 'perl-date-manip' 'perl-xml-sax' 'perl-math-round' 'perl-net-upnp' 'perl-dbd-mysql' 'perl-time-hires' - 'libavc1394' - 'wget' + 'libavc1394' + 'wget' 'libiec61883' 'mysql-python' 'python2-lxml' @@ -61,7 +61,7 @@ groups=('pvr') #options=(!strip) #MAKEFLAGS="-j6" install='mythtv.install' -patchs=('myth_settings.patch') +patchs=('myth_settings.patch' 'myth_settings-2.patch') optdepends=('xmltv: to download tv listings') replaces=('mythvideo' 'myththemes') conflicts=('mythvideo' 'myththemes') @@ -141,6 +141,7 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' 'c4db7784c5107ae846fd795a4dabe0bc' + '3513b4ed3d316f603b394607116c85d0' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch new file mode 100755 index 0000000..5bf0105 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch @@ -0,0 +1,37 @@ +diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp +index ff7e509..fdb05d6 100644 +--- a/mythtv/programs/mythutil/settingsutils.cpp ++++ b/mythtv/programs/mythutil/settingsutils.cpp +@@ -382,6 +382,16 @@ static int ImportSettings(const MythUtilCommandLineParser &cmdline) + else + value_pair_map[record_element.nodeName()] = record_element.text(); + } ++ if (import_filename.endsWith("syssettings.xml")) ++ { ++ if ( value_pair_map["value"] == "BackendServerIP") ++ { ++ out_string = "*sysettings! ignoring backendserver ip record"; ++ cout << out_string.toLocal8Bit().constData() << endl; ++ continue; ++ } ++ } ++ else + //perform insert + gCoreContext->import_settings(value_pair_map,table_name); + } +@@ -454,7 +464,6 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline) + QDomElement tag = doc.createElement(y.key()); + record.appendChild(tag); + QDomText t; +- + if ( distro_default == TRUE ) + { // If exporting distro_default then change hostname + table + if ( y.key() == "hostname" ) +@@ -500,6 +509,7 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline) + } + } + QFile file( export_filename ); ++ + if( !file.open(QIODevice::WriteOnly) ) + return -1; + |