[arch-commits] Commit in miro/repos (3 files)

[Ronald van Haren]

    Date: Wednesday, November 12, 2008 @ 03:11:02
  Author: ronald
Revision: 18951

Merged revisions 18950 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/miro/trunk

........
  r18950 | ronald | 2008-11-12 09:10:04 +0100 (Wed, 12 Nov 2008) | 1 line
  
  upgpkg: miro 1.2.8-2
........

Added:
  miro/repos/extra-x86_64/miro_python26.patch
    (from rev 18950, miro/trunk/miro_python26.patch)
Modified:
  miro/repos/extra-x86_64/	(properties)
  miro/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 miro_python26.patch |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)


Property changes on: miro/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /miro/trunk:1-18124
   + /miro/trunk:1-18950

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-12 08:10:04 UTC (rev 18950)
+++ extra-x86_64/PKGBUILD	2008-11-12 08:11:02 UTC (rev 18951)
@@ -3,7 +3,7 @@
 
 pkgname=miro
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -19,12 +19,14 @@
 source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz
         missing-headers.patch
 	Miro-xulrunner.patch
-	boost_1.36.0_fix.patch)
+	boost_1.36.0_fix.patch
+	miro_python26.patch)
 
 md5sums=('b468a953014272095171303ba3f0745d'
          'b5482eac565a26817af0105b061a8ad5'
          '3c06b40cd13c2fb202f58dcf64d4b524'
-         '3b4e1eac01155b9de381b0744ba9d725')
+         '3b4e1eac01155b9de381b0744ba9d725'
+         'a913b2340136ac0fbb9034523faf667a')
 
 build() {
   cd ${srcdir}/Miro-${pkgver}
@@ -33,5 +35,7 @@
   patch -Np1 -i ${srcdir}/boost_1.36.0_fix.patch || return 1
 
   cd platform/gtk-x11
+  patch -Np0 -i ${srcdir}/miro_python26.patch || return 1
+
   python setup.py install --root=${pkgdir} || return 1
 }

Copied: miro/repos/extra-x86_64/miro_python26.patch (from rev 18950, miro/trunk/miro_python26.patch)
===================================================================
--- extra-x86_64/miro_python26.patch	                        (rev 0)
+++ extra-x86_64/miro_python26.patch	2008-11-12 08:11:02 UTC (rev 18951)
@@ -0,0 +1,16 @@
+--- miro.real	2008-10-24 19:49:17.000000000 +0200
++++ miro.real.new	2008-11-12 08:51:17.649458321 +0100
+@@ -6,8 +6,12 @@
+ if xlibhelper.XInitThreads() == 0:
+     print "WARNING: XInitThreads() failed!"
+ 
+-import os.path
++import miro.feedparser
++import miro.storedatabase
+ import sys
++sys.modules['feedparser'] = miro.feedparser
++sys.modules['storedatabase'] = miro.storedatabase
++import os.path
+ import optparse
+ 
+ import pygtk