[arch-commits] Commit in gnash-kde/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Wed Jun 18 23:12:54 UTC 2008
Date: Wednesday, June 18, 2008 @ 19:12:54
Author: pierre
Revision: 3055
Merged revisions 2-3054 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/gnash-kde/trunk
........
r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r3044 | pierre | 2008-06-18 19:43:45 +0000 (Wed, 18 Jun 2008) | 1 line
upgpkg: gnash-kde 0.8.3-1
........
r3046 | pierre | 2008-06-18 19:46:05 +0000 (Wed, 18 Jun 2008) | 1 line
gc
........
r3051 | pierre | 2008-06-18 22:05:41 +0000 (Wed, 18 Jun 2008) | 1 line
upgpkg: gnash-kde 0.8.3-2
........
Modified:
gnash-kde/repos/extra-i686/ (properties)
gnash-kde/repos/extra-i686/PKGBUILD
Deleted:
gnash-kde/repos/extra-i686/gnash_kdepart.patch
---------------------+
PKGBUILD | 8 ++--
gnash_kdepart.patch | 95 --------------------------------------------------
2 files changed, 4 insertions(+), 99 deletions(-)
Property changes on: gnash-kde/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /gnash-kde/trunk:1
+ /gnash-kde/trunk:1-3054
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-06-18 22:24:15 UTC (rev 3054)
+++ extra-i686/PKGBUILD 2008-06-18 23:12:54 UTC (rev 3055)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=gnash-kde
-pkgver=0.8.2
-pkgrel=1
+pkgver=0.8.3
+pkgrel=2
pkgdesc="A GNU Flash movie player for Konqueror"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/gnash/"
@@ -10,7 +10,7 @@
depends=('kdebase' "gnash-common=${pkgver}" 'agg')
source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
options=('libtool')
-md5sums=('05cac831181be3fb40cbf3c00ab25c0f')
+md5sums=('5033ef2602ea1234a9ccb73000a0dedb')
build() {
cd $startdir/src/gnash-$pkgver
@@ -18,6 +18,7 @@
. /etc/profile.d/kde.sh
./configure --prefix=/usr \
+ --sysconfdir=/etc \
--enable-gui=KDE \
--enable-z \
--enable-jpeg \
@@ -35,4 +36,4 @@
install -D plugin/klash/klashpartui.rc $startdir/pkg/opt/kde/share/apps/klash/klashpartui.rc
install -D plugin/klash/pluginsinfo $startdir/pkg/opt/kde/share/apps/klash/pluginsinfo
install -D plugin/klash/klash_part.desktop $startdir/pkg/opt/kde/share/services/klash_part.desktop
-}
\ No newline at end of file
+}
Deleted: extra-i686/gnash_kdepart.patch
===================================================================
--- extra-i686/gnash_kdepart.patch 2008-06-18 22:24:15 UTC (rev 3054)
+++ extra-i686/gnash_kdepart.patch 2008-06-18 23:12:54 UTC (rev 3055)
@@ -1,95 +0,0 @@
-? 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;
More information about the arch-commits
mailing list