| 1 |
mrpouet 09/09/08 21:20:23 |
| 2 |
|
| 3 |
Modified: ChangeLog gnash-0.8.5.ebuild |
| 4 |
Log: |
| 5 |
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@××××××××××××.de> |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 www-plugins/gnash/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- ChangeLog 6 Sep 2009 14:55:35 -0000 1.5 |
| 22 |
+++ ChangeLog 8 Sep 2009 21:20:23 -0000 1.6 |
| 23 |
@@ -1,6 +1,13 @@ |
| 24 |
# ChangeLog for www-plugins/gnash |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.5 2009/09/06 14:55:35 mrpouet Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.6 2009/09/08 21:20:23 mrpouet Exp $ |
| 28 |
+ |
| 29 |
+ 08 Sep 2009; Romain Perier <mrpouet@g.o> |
| 30 |
+ gnash-0.8.5.ebuild, +files/gnash-0.8.5-klash.patch, |
| 31 |
+ +files/gnash-0.8.5-moc-qt4.patch: |
| 32 |
+ Fix kde4 headers detection, moc and uic checks, Import patch from Linux |
| 33 |
+ Alt to fix klash support, many thanks to Chi-Thanh Christopher Nguyen |
| 34 |
+ <chithanh@××××××××××××.de>. |
| 35 |
|
| 36 |
06 Sep 2009; Romain Perier (mrpouet) <mrpouet@g.o> |
| 37 |
gnash-0.8.5.ebuild, metadata.xml: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.3 www-plugins/gnash/gnash-0.8.5.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.3&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.3&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.2&r2=1.3 |
| 46 |
|
| 47 |
Index: gnash-0.8.5.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v |
| 50 |
retrieving revision 1.2 |
| 51 |
retrieving revision 1.3 |
| 52 |
diff -u -r1.2 -r1.3 |
| 53 |
--- gnash-0.8.5.ebuild 6 Sep 2009 14:55:35 -0000 1.2 |
| 54 |
+++ gnash-0.8.5.ebuild 8 Sep 2009 21:20:23 -0000 1.3 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.2 2009/09/06 14:55:35 mrpouet Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.3 2009/09/08 21:20:23 mrpouet Exp $ |
| 60 |
|
| 61 |
EAPI="2" |
| 62 |
KDE_REQUIRED="optional" |
| 63 |
@@ -98,6 +98,16 @@ |
| 64 |
# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc |
| 65 |
epatch "${FILESDIR}"/${P}-xpidl-sdkdir.patch |
| 66 |
|
| 67 |
+ # Resurect patch from bug #230287 |
| 68 |
+ epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch |
| 69 |
+ |
| 70 |
+ # Adapted from Alt Linux to fix klash support properly |
| 71 |
+ epatch "${FILESDIR}"/${P}-klash.patch |
| 72 |
+ |
| 73 |
+ # Make gnash find moc and uic properly, upstream bug #25758, |
| 74 |
+ # gentoo bug #283905 |
| 75 |
+ epatch "${FILESDIR}"/${P}-moc-qt4.patch |
| 76 |
+ |
| 77 |
# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header |
| 78 |
# in case where xpcom (implicitly added with gtk) is enabled, we use the system header |
| 79 |
if use gtk; then |
| 80 |
@@ -115,12 +125,10 @@ |
| 81 |
# Set kde and konqueror plugin directories. |
| 82 |
if use kde; then |
| 83 |
myconf="${myconf} |
| 84 |
- --with-qt4-incl=/usr/include/qt4 |
| 85 |
- --with-qt4-lib=/usr/$(get_libdir)/qt4 |
| 86 |
--with-kde4-incl=${KDEDIR}/include |
| 87 |
--with-kde4-configdir=${KDEDIR}/share/config |
| 88 |
--with-kde4-prefix=${KDEDIR} |
| 89 |
- --with-kde4-lib=${KDEDIR}/$(get_libdir)/kde4 |
| 90 |
+ --with-kde4-lib=${KDEDIR}/$(get_libdir) |
| 91 |
--with-kde-appsdatadir=${KDEDIR}/share/apps/klash |
| 92 |
--with-kde4-servicesdir=${KDEDIR}/share/services" |
| 93 |
fi |
| 94 |
@@ -177,8 +185,9 @@ |
| 95 |
|
| 96 |
# Install kde konqueror plugin. |
| 97 |
if use kde; then |
| 98 |
- cd "${S}/plugin/klash4" |
| 99 |
+ pushd "${S}/plugin/klash4" >& /dev/null |
| 100 |
emake DESTDIR="${D}" install-plugin || die "install kde plugins failed" |
| 101 |
+ popd >& /dev/null |
| 102 |
fi |
| 103 |
# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory. |
| 104 |
use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \ |
Archives