[arch-commits] CVS update of extra/multimedia/gnash-kde (PKGBUILD gnash_kdepart.patch)

[Pierre Schmitz]

    Date: Monday, September 24, 2007 @ 03:06:41
  Author: pierre
    Path: /home/cvs-extra/extra/multimedia/gnash-kde

   Added: gnash_kdepart.patch (1.1)
Modified: PKGBUILD (1.8 -> 1.9)

upgpkg: gnash-kde 0.8.1-2
fix playback of youtube videos


---------------------+
 PKGBUILD            |   13 ++++--
 gnash_kdepart.patch |   95 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 5 deletions(-)


Index: extra/multimedia/gnash-kde/PKGBUILD
diff -u extra/multimedia/gnash-kde/PKGBUILD:1.8 extra/multimedia/gnash-kde/PKGBUILD:1.9
--- extra/multimedia/gnash-kde/PKGBUILD:1.8	Wed Aug 29 17:02:05 2007
+++ extra/multimedia/gnash-kde/PKGBUILD	Mon Sep 24 03:06:40 2007
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD,v 1.8 2007/08/29 21:02:05 pierre Exp $
+# $Id: PKGBUILD,v 1.9 2007/09/24 07:06:40 pierre Exp $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 pkgname=gnash-kde
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNU Flash movie player for Konqueror"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
 license=("GPL")
 depends=('kdebase' "gnash-common=$pkgver")
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
+source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2" 'gnash_kdepart.patch')
 options=('libtool')
-md5sums=('5f80a25cb7a37fb351d28fd2097d8f3e')
+md5sums=('5f80a25cb7a37fb351d28fd2097d8f3e' '0a09c74c421b21ce6d29ea7c42bdfc83')
 
 build() {
 	cd $startdir/src/gnash-$pkgver
 
+	# fix konqueror plugin
+	patch -p0 -i ../gnash_kdepart.patch
+
 	./configure --prefix=/opt/kde \
 		--enable-gui=KDE \
 		--enable-z \
@@ -37,4 +40,4 @@
 	install -D $startdir/src/pkg-temp/opt/kde/share/services/klash_part.desktop $startdir/pkg/opt/kde/share/services/klash_part.desktop
 
 	ln -sf /usr/lib/gnash/ $startdir/pkg/opt/kde/lib/
-}
+}
\ No newline at end of file
Index: extra/multimedia/gnash-kde/gnash_kdepart.patch
diff -u /dev/null extra/multimedia/gnash-kde/gnash_kdepart.patch:1.1
--- /dev/null	Mon Sep 24 03:06:40 2007
+++ extra/multimedia/gnash-kde/gnash_kdepart.patch	Mon Sep 24 03:06:40 2007
@@ -0,0 +1,95 @@
+? extensions/lirc/.deps
+? extensions/lirc/Makefile
+? extensions/lirc/Makefile.in
+? gui/Info.plist
+? libltdl/COPYING.LIB
+? libltdl/Makefile.am
+? libltdl/Makefile.in
+? libltdl/README
+? libltdl/acinclude.m4
+? libltdl/aclocal.m4
+? libltdl/config-h.in
+? libltdl/config.guess
+? libltdl/config.sub
+? libltdl/configure
+? libltdl/configure.ac
+? libltdl/configure.in
+? libltdl/install-sh
+? libltdl/ltdl.c
+? libltdl/ltdl.h
+? libltdl/ltmain.sh
+? libltdl/missing
+? libltdl/stamp-h.in
+? server/asobj/GradientGlowFilter_as.loT
+Index: plugin/klash/klash_part.cpp
+===================================================================
+RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
+retrieving revision 1.19
+diff -u -r1.19 klash_part.cpp
+--- plugin/klash/klash_part.cpp	24 Aug 2007 15:49:54 -0000	1.19
++++ plugin/klash/klash_part.cpp	14 Sep 2007 22:58:31 -0000
+@@ -134,7 +134,8 @@
+                 m_autostart = value.toInt (&ok);
+                 if (!ok)
+                     m_autostart = (value.lower () == "false");
+-	    }
++            }
++            m_args.push_back(name + QChar('=') + value);
+         }
+     }
+     KParts::Part::setWidget (new KlashView (wparent));
+@@ -173,21 +174,29 @@
+     m_process = new KProcess;
+     m_process->setUseShell (true);
+     m_process->setEnvironment (QString::fromLatin1 ("SESSION_MANAGER"), QString::fromLatin1 (""));
+-    QString dim;
++
++    QString cmd = procname + QString(" -x ") +
++                             QString::number(static_cast<KlashView*>(widget())->embedId());
++
+     if (m_width > 0 && m_height > 0)
+-        dim = QString ("-j ") + QString::number (m_width) +
+-            QString (" -k ") + QString::number (m_height);
++        cmd += QString(" -j ") + QString::number(m_width) +
++               QString(" -k ") + QString::number(m_height);
++
+     QString url = m_url.url();
+-    QString url_param;
+     if (!url.isEmpty())
+-        url_param = QString ("-u ") + KProcess::quote (url);
+-    QString cmd = procname + QString (" -x ") +
+-        QString::number (static_cast <KlashView *> (widget ())->embedId()) +
+-        QChar (' ') + dim +
+-        QChar (' ') + url_param +
+-        QChar (' ') + KProcess::quote (m_src_url);
++        cmd += QString(" -u ") + KProcess::quote(url);
++    url = m_docbase.url();
++    if (!url.isEmpty())
++        cmd += QString(" -U ") + KProcess::quote(url);
++
++    for (QStringList::const_iterator it=m_args.begin(), end=m_args.end();it != end; ++it)
++        cmd += QString(" -P ") + KProcess::quote(*it);
++
++    cmd += QString (" ") + KProcess::quote(m_src_url);
++
+     kdDebug () << cmd << endl;
+     *m_process << cmd;
++
+     connect (m_process, SIGNAL (processExited (KProcess *)),
+             this, SLOT (processStopped (KProcess *)));
+     m_process->start (KProcess::NotifyOnExit, KProcess::NoCommunication);
+Index: plugin/klash/klash_part.h
+===================================================================
+RCS file: /sources/gnash/gnash/plugin/klash/klash_part.h,v
+retrieving revision 1.7
+diff -u -r1.7 klash_part.h
+--- plugin/klash/klash_part.h	1 Jul 2007 10:54:15 -0000	1.7
++++ plugin/klash/klash_part.h	14 Sep 2007 22:58:31 -0000
+@@ -147,6 +147,7 @@
+ protected:
+     virtual bool openFile();
+ private:
++    QStringList m_args;
+     KlashBrowserExtension * m_browserextension;
+     KlashLiveConnectExtension * m_liveconnectextension;
+     KProcess * m_process;