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

Collapse All | Expand All

(-)/usr/portage/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r5.ebuild (-3 / +60 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2005 Gentoo Foundation
1
# Copyright 1999-2005 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r5.ebuild,v 1.3 2005/08/11 02:49:01 agriffis Exp $
3
# $Header: $
4
4
5
unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
5
unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
6
inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
6
inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
Lines 17-23 Link Here
17
KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~sparc ~x86"
17
KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~sparc ~x86"
18
SLOT="0"
18
SLOT="0"
19
LICENSE="MPL-1.1 NPL-1.1"
19
LICENSE="MPL-1.1 NPL-1.1"
20
IUSE="gnome java mozdevelop mozsvg mozcalendar"
20
IUSE="gnome java mozdevelop mozsvg mozcalendar ssl"
21
21
22
# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
22
# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
23
# and is required to build with support for cairo.  #71504
23
# and is required to build with support for cairo.  #71504
Lines 127-137 Link Here
127
	# patch to add border to tooltips
127
	# patch to add border to tooltips
128
	# https://bugzilla.mozilla.org/show_bug.cgi?id=238052
128
	# https://bugzilla.mozilla.org/show_bug.cgi?id=238052
129
	epatch ${FILESDIR}/gtk-tooltips.patch
129
	epatch ${FILESDIR}/gtk-tooltips.patch
130
131
	#rpath patch
132
	epatch ${FILESDIR}/mozilla-rpath-1.patch
130
}
133
}
131
134
132
src_compile() {
135
src_compile() {
133
	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
136
	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
134
137
138
	grep -Flr "#RPATH_FIXER" --include=*.mk . | xargs sed -i -e \
139
		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|'
140
135
	####################################
141
	####################################
136
	#
142
	#
137
	# mozconfig, CFLAGS and CXXFLAGS setup
143
	# mozconfig, CFLAGS and CXXFLAGS setup
Lines 183-188 Link Here
183
	edit_makefiles
189
	edit_makefiles
184
190
185
	emake || die
191
	emake || die
192
	####################################
193
	#
194
	#  Build Mozilla NSS
195
	#
196
	####################################
197
198
	# Build the NSS/SSL support
199
	if use ssl; then
200
		einfo "Building Mozilla-Firefox NSS..."
201
202
		# Fix #include problem
203
		cd ${S}/security/coreconf || die "cd coreconf failed"
204
		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
205
			>>headers.mk
206
		emake -j1 || die "make security headers failed"
207
208
		cd ${S}/security/nss || die "cd nss failed"
209
		emake -j1 moz_import || die "make moz_import failed"
210
		emake -j1 || die "make nss failed"
211
	fi
212
186
}
213
}
187
214
188
src_install() {
215
src_install() {
Lines 228-233 Link Here
228
	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
255
	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
229
	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
256
	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
230
257
258
	# Install the NSS/SSL libs, headers and tools
259
	if use ssl; then
260
		einfo "Installing Mozilla-Firefox NSS..."
261
		# Install the headers ('make install' do not work for headers ...)
262
		insinto ${MOZILLA_FIVE_HOME}/include/nss
263
		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
264
		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
265
		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
266
		# These come with zlib ...
267
		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
268
269
		cd ${S}/security/nss
270
271
		mkdir -p ${WORKDIR}/nss/{bin,lib}
272
		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
273
		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
274
275
		make install || die "make failed"
276
		# Gets installed as symbolic links ...
277
		# cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
278
		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
279
280
		# Need to unset these incase we want to rebuild, else the build
281
		# gets newked.
282
		unset SOURCE_LIB_DIR
283
		unset SOURCE_BIN_DIR
284
	fi
285
231
	# Dirty hack to get some applications using this header running
286
	# Dirty hack to get some applications using this header running
232
	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
287
	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
233
		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
288
		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
Lines 245-254 Link Here
245
	doexe ${S}/build/unix/firefox-config
300
	doexe ${S}/build/unix/firefox-config
246
301
247
	# Fix pkgconfig files and install them
302
	# Fix pkgconfig files and install them
303
	sed -i -e "s|-L/usr/lib/firefox-${PV}|-L\$\{libdir\}|" firefox-nspr.pc
248
	insinto /usr/$(get_libdir)/pkgconfig
304
	insinto /usr/$(get_libdir)/pkgconfig
249
	for x in ${S}/build/unix/*.pc; do
305
	for x in ${S}/build/unix/*.pc; do
250
		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
306
		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
251
			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
307
			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
308
			s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
252
		doins ${x}
309
		doins ${x}
253
	done
310
	done
254
311

Return to bug 100597