Date: Sunday, September 26, 2010 @ 02:04:21 Author: remy Revision: 91281
upgpkg: mythplugins 25574-2 Rebuild for python2 Added: mythplugins/trunk/qt-4.7-buildfixes.diff Modified: mythplugins/trunk/PKGBUILD ------------------------+ PKGBUILD | 37 ++++++++++++++++++++----------------- qt-4.7-buildfixes.diff | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-26 06:01:47 UTC (rev 91280) +++ PKGBUILD 2010-09-26 06:04:21 UTC (rev 91281) @@ -15,7 +15,7 @@ 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=25574 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -23,17 +23,20 @@ 'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'libvisual' 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601') source=(ftp://ftp.archlinux.org/other/mythtv/${pkgbase}-${pkgver}.tar.xz - mtd) + mtd qt-4.7-buildfixes.diff) md5sums=('933f0c8ac21652af1d83d502c0ca6516' - '476c12ba074794ad7f4ae092bdf949d6') + '476c12ba074794ad7f4ae092bdf949d6' + '65fad68e51c52bf5176a2ade35e71bc3') build() { cd "${srcdir}/${pkgbase}" + patch -Np4 -i "${srcdir}/qt-4.7-buildfixes.diff" + find . -name '*.py' -type f | xargs sed -i 's...@^#!.*python$@#!/usr/bin/python2@' ./configure --prefix=/usr \ --enable-all - qmake mythplugins.pro || return 1 - make || return 1 + qmake mythplugins.pro + make } package_mythplugins-mytharchive() { @@ -41,7 +44,7 @@ depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor') replaces=('mytharchive') cd "${srcdir}/${pkgbase}/mytharchive" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythbrowser() { @@ -49,7 +52,7 @@ depends=("mythtv>=${pkgver}") replaces=('mythbrowser') cd "${srcdir}/${pkgbase}/mythbrowser" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythgallery() { @@ -57,7 +60,7 @@ depends=("mythtv>=${pkgver}" 'libexif') replaces=('mythgallery') cd "${srcdir}/${pkgbase}/mythgallery" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythgame() { @@ -65,7 +68,7 @@ depends=("mythtv>=${pkgver}" 'zlib') replaces=('mythgame') cd "${srcdir}/${pkgbase}/mythgame" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythmovies() { @@ -73,7 +76,7 @@ depends=("mythtv>=${pkgver}") replaces=('mythmovies') cd "${srcdir}/${pkgbase}/mythmovies" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythmusic() { @@ -81,14 +84,14 @@ depends=("mythtv>=${pkgver}" 'flac' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual') replaces=('mythmusic') cd "${srcdir}/${pkgbase}/mythmusic" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" depends=("mythtv>=${pkgver}") cd "${srcdir}/${pkgbase}/mythnetvision" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythnews() { @@ -96,7 +99,7 @@ depends=("mythtv>=${pkgver}") replaces=('mythnews') cd "${srcdir}/${pkgbase}/mythnews" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythvideo() { @@ -104,8 +107,8 @@ depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple') replaces=('mythvideo') cd "${srcdir}/${pkgbase}/mythvideo" - make INSTALL_ROOT="${pkgdir}" install || return 1 - install -D -m755 ${srcdir}/mtd "${pkgdir}/etc/rc.d/mtd" || return 1 + make INSTALL_ROOT="${pkgdir}" install + install -D -m755 ${srcdir}/mtd "${pkgdir}/etc/rc.d/mtd" } package_mythplugins-mythweather() { @@ -113,7 +116,7 @@ depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601') replaces=('mythweather') cd "${srcdir}/${pkgbase}/mythweather" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } package_mythplugins-mythweb() { @@ -134,5 +137,5 @@ replaces=('mythzoneminder') install=mythplugins-mythzoneminder.install cd "${srcdir}/${pkgbase}/mythzoneminder" - make INSTALL_ROOT="${pkgdir}" install || return 1 + make INSTALL_ROOT="${pkgdir}" install } Added: qt-4.7-buildfixes.diff =================================================================== --- qt-4.7-buildfixes.diff (rev 0) +++ qt-4.7-buildfixes.diff 2010-09-26 06:04:21 UTC (rev 91281) @@ -0,0 +1,26 @@ +Index: /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp +=================================================================== +--- /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp (revision 24265) ++++ /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp (revision 26391) +@@ -45,7 +45,7 @@ + m_progress(NULL), m_busyPopup(NULL), + m_okPopup(NULL), m_popupStack(), +- m_netSearch(), m_currentSearch(NULL), +- m_currentGrabber(0), m_currentCmd(NULL), +- m_currentDownload(NULL), m_pagenum(0), ++ m_netSearch(), m_currentSearch(QString()), ++ m_currentGrabber(0), m_currentCmd(QString()), ++ m_currentDownload(QString()), m_pagenum(0), + m_lock(QMutex::Recursive) + { +Index: /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h +=================================================================== +--- /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h (revision 22916) ++++ /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h (revision 26391) +@@ -151,5 +151,5 @@ + QString GetCoverImage(MythGenericTree *node); + QString GetFirstImage(MythGenericTree *node, QString type, +- QString gpnode = NULL, int levels = 0); ++ QString gpnode = QString(), int levels = 0); + QString GetImageFromFolder(Metadata *metadata); + QString GetScreenshot(MythGenericTree *node);