* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-10 19:22 Romain Perier (mrpouet)
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier (mrpouet) @ 2009-09-10 19:22 UTC (permalink / raw
To: gentoo-commits
mrpouet 09/09/10 19:22:21
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix bug #284342, sdl was added into $gui local var from src_configure() even with USE=-sdl gtk -kde, which also introduiced a syntax error caused by the sed expression (which drops the first matched comma).
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.11 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 10 Sep 2009 17:12:23 -0000 1.10
+++ ChangeLog 10 Sep 2009 19:22:21 -0000 1.11
@@ -1,6 +1,12 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.10 2009/09/10 17:12:23 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.11 2009/09/10 19:22:21 mrpouet Exp $
+
+ 10 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+ gnash-0.8.5.ebuild:
+ Fix bug #284342, sdl was added into $gui local var from src_configure()
+ even with USE=-sdl gtk -kde, which also introduiced a syntax error caused
+ by the sed expression (which drops the first matched comma).
10 Sep 2009; Romain Perier <mrpouet@gentoo.org>
gnash-0.8.5.ebuild:
1.7 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.6&r2=1.7
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnash-0.8.5.ebuild 10 Sep 2009 17:12:23 -0000 1.6
+++ gnash-0.8.5.ebuild 10 Sep 2009 19:22:21 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.6 2009/09/10 17:12:23 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.7 2009/09/10 19:22:21 mrpouet Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -124,7 +124,7 @@
}
src_configure() {
local myconf
- local gui="sdl"
+ local gui
# Set nsplugin install directory.
use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
# Set kde and konqueror plugin directories.
@@ -157,6 +157,10 @@
use gtk && gui=",gtk"
use kde && gui="${gui},kde4"
use sdl && gui="${gui},sdl"
+
+ if [ -z "$gui" ]; then
+ gui="sdl"
+ fi
# Strip extra comma from gui.
gui=$( echo $gui|sed -e 's/,//' )
econf \
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-25 8:28 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-09-25 8:28 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/09/25 08:28:23
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix kde4-base inheritance to work without cmake.
(Portage version: 2.2_rc41/cvs/Linux x86_64)
Revision Changes Path
1.12 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 10 Sep 2009 19:22:21 -0000 1.11
+++ ChangeLog 25 Sep 2009 08:28:21 -0000 1.12
@@ -1,6 +1,9 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.11 2009/09/10 19:22:21 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.12 2009/09/25 08:28:21 scarabeus Exp $
+
+ 25 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> gnash-0.8.5.ebuild:
+ Fix kde4-base inheritance to work without cmake.
10 Sep 2009; Romain Perier <mrpouet@gentoo.org>
gnash-0.8.5.ebuild:
1.8 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.7&r2=1.8
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnash-0.8.5.ebuild 10 Sep 2009 19:22:21 -0000 1.7
+++ gnash-0.8.5.ebuild 25 Sep 2009 08:28:21 -0000 1.8
@@ -1,8 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.7 2009/09/10 19:22:21 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.8 2009/09/25 08:28:21 scarabeus Exp $
EAPI="2"
+WANT_CMAKE="false"
KDE_REQUIRED="optional"
AT_M4DIR="cygnal"
@@ -63,9 +64,6 @@
nls? ( sys-devel/gettext )
gnome? ( app-text/rarian )"
-# For the inherit of kde4-base
-CMAKE_IN_TREE_BUILD=1
-
pkg_setup() {
if ! ( use agg || use cairo || use opengl ); then
ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-10 17:12 Romain Perier (mrpouet)
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier (mrpouet) @ 2009-09-10 17:12 UTC (permalink / raw
To: gentoo-commits
mrpouet 09/09/10 17:12:23
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix bug #284355, testsuite failed due to inheritance from kde4-base.eclass which exported kde4-base_src_test which tried to find a CMakeLists.txt (does not exist), re-import src_test() from 0.8.4
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.10 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 9 Sep 2009 10:35:30 -0000 1.9
+++ ChangeLog 10 Sep 2009 17:12:23 -0000 1.10
@@ -1,6 +1,12 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.9 2009/09/09 10:35:30 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.10 2009/09/10 17:12:23 mrpouet Exp $
+
+ 10 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+ gnash-0.8.5.ebuild:
+ Fix bug #284355, testsuite failed due to inheritance from kde4-base.eclass
+ which exported kde4-base_src_test which tried to find a CMakeLists.txt
+ (does not exist), re-import src_test() from 0.8.4.
09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
gnash-0.8.5.ebuild, +files/gnash-0.8.5-xpcom-idldir.patch:
1.6 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.5&r2=1.6
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnash-0.8.5.ebuild 9 Sep 2009 10:35:30 -0000 1.5
+++ gnash-0.8.5.ebuild 10 Sep 2009 17:12:23 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.5 2009/09/09 10:35:30 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.6 2009/09/10 17:12:23 mrpouet Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -183,6 +183,13 @@
--enable-gui=${gui} \
${myconf}
}
+src_test() {
+ local log=testsuite-results.txt
+ cd testsuite
+ emake check || die "make check failed"
+ ./anaylse-results.sh > $log || die "results analyze failed"
+ cat $log
+}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-09 10:35 Romain Perier (mrpouet)
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier (mrpouet) @ 2009-09-09 10:35 UTC (permalink / raw
To: gentoo-commits
mrpouet 09/09/09 10:35:30
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix bug #284073, Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct which fix building against xulrunner-1.9.0, many thanks to Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>, Add >=sys-devel/libtool-2 in RDEPEND (not portable to libtool-1)
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.9 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 9 Sep 2009 10:17:48 -0000 1.8
+++ ChangeLog 9 Sep 2009 10:35:30 -0000 1.9
@@ -1,6 +1,13 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.8 2009/09/09 10:17:48 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.9 2009/09/09 10:35:30 mrpouet Exp $
+
+ 09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+ gnash-0.8.5.ebuild, +files/gnash-0.8.5-xpcom-idldir.patch:
+ Fix bug #284073, Use pkgconfig to determine XPCOM_IDL_DIR instead of
+ non-portable construct which fix building against xulrunner-1.9.0, many
+ thanks to Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>, Add
+ >=sys-devel/libtool-2 in RDEPEND (not portable to libtool-1).
09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
gnash-0.8.5.ebuild:
1.5 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.4&r2=1.5
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnash-0.8.5.ebuild 9 Sep 2009 10:17:48 -0000 1.4
+++ gnash-0.8.5.ebuild 9 Sep 2009 10:35:30 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.4 2009/09/09 10:17:48 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.5 2009/09/09 10:35:30 mrpouet Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -56,7 +56,8 @@
sdl? ( media-libs/libsdl[X] )
nsplugin? ( net-libs/xulrunner:1.9 )
speex? ( media-libs/speex[ogg] )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+ >=sys-devel/libtool-2.2"
DEPEND="${RDEPEND}
dev-util/pkgconfig
nls? ( sys-devel/gettext )
@@ -98,6 +99,10 @@
# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch
+ # Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
+ # Fixes building against xulrunner-1.9.0, bug #284073.
+ epatch "${FILESDIR}"/${P}-xpcom-idldir.patch
+
# Resurect patch from bug #230287
epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-09 10:17 Romain Perier (mrpouet)
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier (mrpouet) @ 2009-09-09 10:17 UTC (permalink / raw
To: gentoo-commits
mrpouet 09/09/09 10:17:48
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix bug #284244, src_install() always failed with USE=-nsplugin due to a stupid test line 184, replace it by an if
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.8 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 8 Sep 2009 21:22:34 -0000 1.7
+++ ChangeLog 9 Sep 2009 10:17:48 -0000 1.8
@@ -1,6 +1,11 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.7 2009/09/08 21:22:34 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.8 2009/09/09 10:17:48 mrpouet Exp $
+
+ 09 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+ gnash-0.8.5.ebuild:
+ Fix bug #284244, src_install() always failed with USE=-nsplugin due to
+ stupid test line 184, replace it by an if.
08 Sep 2009; Romain Perier <mrpouet@gentoo.org>
gnash-0.8.5.ebuild, +files/gnash-0.8.5-klash.patch,
1.4 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.3&r2=1.4
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnash-0.8.5.ebuild 8 Sep 2009 21:20:23 -0000 1.3
+++ gnash-0.8.5.ebuild 9 Sep 2009 10:17:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.3 2009/09/08 21:20:23 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.4 2009/09/09 10:17:48 mrpouet Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -118,7 +118,7 @@
eautoreconf
}
src_configure() {
- local myconf jobs
+ local myconf
local gui="sdl"
# Set nsplugin install directory.
use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
@@ -179,9 +179,12 @@
${myconf}
}
src_install() {
- emake ${jobs} DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install || die "emake install failed"
+
# Install nsplugin in directory set by --with-npapi-plugindir.
- use nsplugin && emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+ if use nsplugin; then
+ emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+ fi
# Install kde konqueror plugin.
if use kde; then
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild
@ 2009-09-08 21:20 Romain Perier (mrpouet)
0 siblings, 0 replies; 6+ messages in thread
From: Romain Perier (mrpouet) @ 2009-09-08 21:20 UTC (permalink / raw
To: gentoo-commits
mrpouet 09/09/08 21:20:23
Modified: ChangeLog gnash-0.8.5.ebuild
Log:
Fix kde4 headers detection, moc and uic checks, Import patch from Linux Alt to fix klash support, many thanks to Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Revision Changes Path
1.6 www-plugins/gnash/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 6 Sep 2009 14:55:35 -0000 1.5
+++ ChangeLog 8 Sep 2009 21:20:23 -0000 1.6
@@ -1,6 +1,13 @@
# ChangeLog for www-plugins/gnash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.5 2009/09/06 14:55:35 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.6 2009/09/08 21:20:23 mrpouet Exp $
+
+ 08 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+ gnash-0.8.5.ebuild, +files/gnash-0.8.5-klash.patch,
+ +files/gnash-0.8.5-moc-qt4.patch:
+ Fix kde4 headers detection, moc and uic checks, Import patch from Linux
+ Alt to fix klash support, many thanks to Chi-Thanh Christopher Nguyen
+ <chithanh@cs.tu-berlin.de>.
06 Sep 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
gnash-0.8.5.ebuild, metadata.xml:
1.3 www-plugins/gnash/gnash-0.8.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.2&r2=1.3
Index: gnash-0.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnash-0.8.5.ebuild 6 Sep 2009 14:55:35 -0000 1.2
+++ gnash-0.8.5.ebuild 8 Sep 2009 21:20:23 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.2 2009/09/06 14:55:35 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.3 2009/09/08 21:20:23 mrpouet Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -98,6 +98,16 @@
# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch
+ # Resurect patch from bug #230287
+ epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
+
+ # Adapted from Alt Linux to fix klash support properly
+ epatch "${FILESDIR}"/${P}-klash.patch
+
+ # Make gnash find moc and uic properly, upstream bug #25758,
+ # gentoo bug #283905
+ epatch "${FILESDIR}"/${P}-moc-qt4.patch
+
# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
if use gtk; then
@@ -115,12 +125,10 @@
# Set kde and konqueror plugin directories.
if use kde; then
myconf="${myconf}
- --with-qt4-incl=/usr/include/qt4
- --with-qt4-lib=/usr/$(get_libdir)/qt4
--with-kde4-incl=${KDEDIR}/include
--with-kde4-configdir=${KDEDIR}/share/config
--with-kde4-prefix=${KDEDIR}
- --with-kde4-lib=${KDEDIR}/$(get_libdir)/kde4
+ --with-kde4-lib=${KDEDIR}/$(get_libdir)
--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
--with-kde4-servicesdir=${KDEDIR}/share/services"
fi
@@ -177,8 +185,9 @@
# Install kde konqueror plugin.
if use kde; then
- cd "${S}/plugin/klash4"
+ pushd "${S}/plugin/klash4" >& /dev/null
emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
+ popd >& /dev/null
fi
# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-09-25 8:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-10 19:22 [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.5.ebuild Romain Perier (mrpouet)
-- strict thread matches above, loose matches on Subject: below --
2009-09-25 8:28 Tomas Chvatal (scarabeus)
2009-09-10 17:12 Romain Perier (mrpouet)
2009-09-09 10:35 Romain Perier (mrpouet)
2009-09-09 10:17 Romain Perier (mrpouet)
2009-09-08 21:20 Romain Perier (mrpouet)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox