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

Collapse All | Expand All

(-)xulrunner-1.9.2.ebuild.old (-3 / +27 lines)
Lines 20-26 Link Here
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
21
SLOT="1.9"
21
SLOT="1.9"
22
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
22
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
23
IUSE="+alsa debug libnotify +networkmanager"
23
IUSE="+alsa oss debug libnotify +networkmanager"
24
24
25
RDEPEND="java? ( >=virtual/jre-1.4 )
25
RDEPEND="java? ( >=virtual/jre-1.4 )
26
	>=dev-lang/python-2.3[threads]
26
	>=dev-lang/python-2.3[threads]
Lines 67-72 Link Here
67
	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
67
	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
68
		|| die "${MAJ_PV} sed failed!"
68
		|| die "${MAJ_PV} sed failed!"
69
69
70
	# Disable ALSA and enable OSS (Arch)
71
	if use oss ; then
72
		sed -i -e "s/sydney_audio_alsa/sydney_audio_oss/" \
73
		"${S}"/media/libsydneyaudio/src/Makefile.in || die "sed OSS failed"
74
	#Remove the ALSA bits form the build system
75
		sed -i -e "/alsa\//d" "${S}"/config/system-headers || die "ALSA clean failed"
76
		sed -i -e "/alsa\//d" "${S}"/js/src/config/system-headers || die "ALSA clean failed"
77
		sed -i -e "/LIB(asound/d" "${S}"/configure.in || die "ALSA clean failed"
78
		if use alsa ; then
79
		die "ALSA support is removed with the oss use flag"
80
		fi
81
	fi
82
70
	# Enable gnomebreakpad
83
	# Enable gnomebreakpad
71
	if use debug ; then
84
	if use debug ; then
72
		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
85
		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
Lines 131-141 Link Here
131
	mozconfig_annotate '' --enable-system-lcms
144
	mozconfig_annotate '' --enable-system-lcms
132
	mozconfig_annotate '' --with-system-bz2
145
	mozconfig_annotate '' --with-system-bz2
133
146
147
	
148
	# Enable audio if ALSA or OSS is enabled
149
	if use alsa ; then
150
		mozconfig_annotate 'ALSA' --enable-wave
151
		mozconfig_annotate 'ALSA' --enable-ogg
152
	elif use oss ; then
153
		mozconfig_annotate 'OSS' --enable-wave
154
		mozconfig_annotate 'OSS' --enable-ogg
155
	else
156
		mozconfig_annotate 'nosound' --disable-wave
157
		mozconfig_annotate 'nosound' --disable-ogg
158
	fi
159
134
	mozconfig_use_enable libnotify
160
	mozconfig_use_enable libnotify
135
	mozconfig_use_enable java javaxpcom
161
	mozconfig_use_enable java javaxpcom
136
	mozconfig_use_enable networkmanager necko-wifi
162
	mozconfig_use_enable networkmanager necko-wifi
137
	mozconfig_use_enable alsa ogg
138
	mozconfig_use_enable alsa wave
139
163
140
	# Debug
164
	# Debug
141
	if use debug ; then
165
	if use debug ; then

Return to bug 301504