Attachment #46102 for bug #73346

View | Details | Raw Unified | Return to bug 73346
Collapse All | Expand All

Lines 7-13 Link Here

(-)mozconfig.eclass.orig (-15 / +34 lines)
7	ECLASS=mozconfig	7	ECLASS=mozconfig
8	INHERITED="$INHERITED $ECLASS"	8	INHERITED="$INHERITED $ECLASS"
9	IUSE="java gnome ldap debug xinerama xprint moznoxft"	9	IUSE="java gnome gtk2 ldap debug xinerama xprint moznoxft"
10	case ${PN} in	10	case ${PN} in
11	mozilla) IUSE="${IUSE} mozdevelop mozxmlterm mozsvg" ;;	11	mozilla) IUSE="${IUSE} mozdevelop mozxmlterm mozsvg" ;;
12	*firefox) IUSE="${IUSE} mozdevelop mozxmlterm" ;;	12	*firefox) IUSE="${IUSE} mozdevelop mozxmlterm" ;;
Lines 25-35 Link Here
25	app-arch/zip	25	app-arch/zip
26	app-arch/unzip	26	app-arch/unzip
27	>=net-www/mozilla-launcher-1.22	27	>=net-www/mozilla-launcher-1.22
28	>=x11-libs/gtk+-2.2.0	28	gtk2? (
29	>=dev-libs/glib-2.2.0	29	>=x11-libs/gtk+-2.2.0
30	>=x11-libs/pango-1.2.1	30	>=dev-libs/glib-2.2.0
31	>=dev-libs/libIDL-0.8.0	31	>=x11-libs/pango-1.2.1
32	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"	32	>=dev-libs/libIDL-0.8.0
		33	gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) )
		34	!gtk2? (
		35	=x11-libs/gtk+-1.2*
		36	=dev-libs/glib-1.2*
		37	=gnome-base/orbit-0* )"
33	DEPEND="${RDEPEND}	38	DEPEND="${RDEPEND}
34	dev-util/pkgconfig"	39	dev-util/pkgconfig"
Lines 147-161 Link Here
147	#	152	#
148	####################################	153	####################################
149	mozconfig_annotate gentoo \	154	if use gtk2; then
150	--disable-installer \	155	mozconfig_annotate gentoo \
151	--disable-pedantic \	156	--disable-installer \
152	--enable-crypto \	157	--disable-pedantic \
153	--with-system-jpeg \	158	--enable-crypto \
154	--with-system-png \	159	--with-system-jpeg \
155	--with-system-zlib \	160	--with-system-png \
156	--without-system-nspr \	161	--with-system-zlib \
157	--enable-default-toolkit=gtk2	162	--without-system-nspr \
		163	--enable-default-toolkit=gtk2
		164	else
		165	mozconfig_annotate gentoo \
		166	--disable-installer \
		167	--disable-pedantic \
		168	--enable-crypto \
		169	--with-system-jpeg \
		170	--with-system-png \
		171	--with-system-zlib \
		172	--without-system-nspr \
		173	--enable-default-toolkit=gtk \
		174	--disable-gnomevfs
		175	fi
		176
158	mozconfig_use_enable ipv6	177	mozconfig_use_enable ipv6
159	mozconfig_use_enable xinerama	178	mozconfig_use_enable xinerama
160	mozconfig_use_enable xprint	179	mozconfig_use_enable xprint




LICENSE="MPL-1.1 NPL-1.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
IUSE="java mozsvg gtk2"
# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
# and is required to build with support for cairo.  #71504

	mozsvg? (
		>=x11-base/xorg-x11-6.7.0-r2
		x11-libs/cairo
	)
	"
DEPEND="${RDEPEND}
	java? ( >=dev-java/java-config-0.2.0 )"

	mozconfig_use_enable mozdevelop jsd
	mozconfig_use_enable mozdevelop xpctools
	mozconfig_use_extension mozdevelop venkman
	mozconfig_use_enable gtk2 gtk2
	mozconfig_use_enable gnome gnomevfs
	mozconfig_use_extension gnome gnomevfs
	mozconfig_use_enable mozsvg svg

Return to bug 73346

Lines 14-20 Link Here

(-)mozilla-firefox-1.0-r3.ebuild.orig (-2 / +4 lines)
14	LICENSE="MPL-1.1 NPL-1.1"	14	LICENSE="MPL-1.1 NPL-1.1"
15	SLOT="0"	15	SLOT="0"
16	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"	16	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
17	IUSE="java mozsvg"	17	IUSE="java mozsvg gtk2"
18	# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2	18	# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
19	# and is required to build with support for cairo. #71504	19	# and is required to build with support for cairo. #71504
Lines 23-29 Link Here
23	mozsvg? (	23	mozsvg? (
24	>=x11-base/xorg-x11-6.7.0-r2	24	>=x11-base/xorg-x11-6.7.0-r2
25	x11-libs/cairo	25	x11-libs/cairo
26	)"	26	)
		27	"
27	DEPEND="${RDEPEND}	28	DEPEND="${RDEPEND}
28	java? ( >=dev-java/java-config-0.2.0 )"	29	java? ( >=dev-java/java-config-0.2.0 )"
Lines 67-72 Link Here
67	mozconfig_use_enable mozdevelop jsd	68	mozconfig_use_enable mozdevelop jsd
68	mozconfig_use_enable mozdevelop xpctools	69	mozconfig_use_enable mozdevelop xpctools
69	mozconfig_use_extension mozdevelop venkman	70	mozconfig_use_extension mozdevelop venkman
		71	mozconfig_use_enable gtk2 gtk2
70	mozconfig_use_enable gnome gnomevfs	72	mozconfig_use_enable gnome gnomevfs
71	mozconfig_use_extension gnome gnomevfs	73	mozconfig_use_extension gnome gnomevfs
72	mozconfig_use_enable mozsvg svg	74	mozconfig_use_enable mozsvg svg