Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 305311 | Differences between
and this patch

Collapse All | Expand All

(-)/var/cache/portage/gentoo/www-plugins/gnash/gnash-0.8.6.ebuild (-13 / +7 lines)
Lines 49-55 Link Here
49
	)
49
	)
50
	gtk? (
50
	gtk? (
51
	x11-libs/gtk+:2
51
	x11-libs/gtk+:2
52
	net-libs/xulrunner:1.9
52
	>=net-libs/xulrunner-1.9.2:1.9
53
	python? ( dev-python/pygtk:2 )
53
	python? ( dev-python/pygtk:2 )
54
	)
54
	)
55
	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
55
	kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
Lines 116-143 Link Here
116
116
117
	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
117
	# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
118
	# Fixes building against xulrunner-1.9.0, bug #284073.
118
	# Fixes building against xulrunner-1.9.0, bug #284073.
119
	epatch "${FILESDIR}"/${PN}-0.8.5-xpcom-idldir.patch
119
	# Patch for 0.8.7 fixes building against xulrunner-1.9.2
120
	epatch "${FILESDIR}"/${PN}-0.8.7-xpcom-idldir.patch
120
121
121
	# Resurect patch from bug #230287
122
	# Resurect patch from bug #230287
122
	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
123
	epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
123
124
124
	# Adapted from Alt Linux to fix klash support properly
125
	epatch "${FILESDIR}"/${PN}-0.8.5-klash.patch
126
127
	# Patch to make gnash buildable with libssh-0.4
128
	epatch "${FILESDIR}"/${PN}-0.8.6-libssh-0.4.patch
129
130
	# Fix build failure due to missing headers sub-directory in libcore/asClass.h
131
	# when AS3 support is enabled (as default)
132
	epatch "${FILESDIR}"/${P}-libcore-as3-headers.patch
133
134
	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
125
	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
135
	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
126
	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
136
	if use gtk; then
127
	if use gtk; then
137
		rm -f ${mozsdk_incdir}/npapi.h
128
		rm -f ${mozsdk_incdir}/npapi.h
138
		ln -s $(pkg-config libxul-unstable --variable=includedir)/unstable/npapi.h \
129
		ln -s $(pkg-config libxul --variable=includedir)/npapi.h \
139
			${mozsdk_incdir}/npapi.h || die "symlink failed"
130
			${mozsdk_incdir}/npapi.h || die "symlink failed"
140
	fi
131
	fi
132
141
	eautoreconf
133
	eautoreconf
142
}
134
}
143
src_configure() {
135
src_configure() {
Lines 220-225 Link Here
220
		--enable-extensions=${myext} \
212
		--enable-extensions=${myext} \
221
		${myconf}
213
		${myconf}
222
}
214
}
215
223
src_test() {
216
src_test() {
224
	local log=testsuite-results.txt
217
	local log=testsuite-results.txt
225
	cd testsuite
218
	cd testsuite
Lines 246-251 Link Here
246
		|| rm -rf "${D}/opt"
239
		|| rm -rf "${D}/opt"
247
	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
240
	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
248
}
241
}
242
249
pkg_postinst() {
243
pkg_postinst() {
250
	if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
244
	if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
251
		ewarn ""
245
		ewarn ""

Return to bug 305311