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

Collapse All | Expand All

(-)a/firefox-24.1.1.ebuild (-3 / +39 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2013 Gentoo Foundation
1
# Copyright 1999-2013 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/firefox/firefox-24.1.1.ebuild,v 1.7 2013/12/07 19:52:41 ago Exp $
3
# $Header: $
4
4
5
EAPI="3"
5
EAPI="3"
6
VIRTUALX_REQUIRED="pgo"
6
VIRTUALX_REQUIRED="pgo"
Lines 39-45 Link Here
39
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
39
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
40
SLOT="0"
40
SLOT="0"
41
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
41
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
42
IUSE="bindist gstreamer +jit +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
42
IUSE="bindist gstreamer +jit kde +minimal pgo pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
43
43
44
# More URIs appended below...
44
# More URIs appended below...
45
SRC_URI="${SRC_URI}
45
SRC_URI="${SRC_URI}
Lines 74-80 Link Here
74
	amd64? ( ${ASM_DEPEND}
74
	amd64? ( ${ASM_DEPEND}
75
		virtual/opengl )
75
		virtual/opengl )
76
	x86? ( ${ASM_DEPEND}
76
	x86? ( ${ASM_DEPEND}
77
		virtual/opengl )"
77
		virtual/opengl )
78
	kde? (
79
		kde-misc/kmozillahelper )"
78
80
79
# No source releases for alpha|beta
81
# No source releases for alpha|beta
80
if [[ ${PV} =~ alpha ]]; then
82
if [[ ${PV} =~ alpha ]]; then
Lines 143-148 Link Here
143
}
145
}
144
146
145
src_prepare() {
147
src_prepare() {
148
	# Remove patches that where upstreamed between 24.1.1 and 24.2.0
149
	rm "${WORKDIR}/firefox/8001_ia64_support_bug_910845.patch" || die
150
	rm "${WORKDIR}/firefox/8002_fix_versioning_bug_927073.patch" || die
151
146
	# Apply our patches
152
	# Apply our patches
147
	EPATCH_SUFFIX="patch" \
153
	EPATCH_SUFFIX="patch" \
148
	EPATCH_FORCE="yes" \
154
	EPATCH_FORCE="yes" \
Lines 157-162 Link Here
157
			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
163
			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
158
	fi
164
	fi
159
165
166
	# Enable KDE integration
167
	if use kde; then
168
		rm -f browser/components/shell/src/nsKDEShellService.cpp \
169
			browser/components/shell/src/nsKDEShellService.h \
170
			browser/components/shell/src/nsUnixShellService.cpp \
171
			browser/components/shell/src/nsUnixShellService.h \
172
			browser/base/content/browser-kde.xul || die
173
		rm -f toolkit/xre/nsKDEUtils.cpp \
174
			toolkit/xre/nsKDEUtils.h \
175
			uriloader/exthandler/unix/nsCommonRegistry.cpp \
176
			uriloader/exthandler/unix/nsCommonRegistry.h \
177
			uriloader/exthandler/unix/nsKDERegistry.cpp \
178
			uriloader/exthandler/unix/nsKDERegistry.h \
179
			toolkit/content/widgets/dialog-kde.xml \
180
			toolkit/content/widgets/preferences-kde.xml || die
181
182
		install -m 644 "${FILESDIR}/kde.js" browser/app/profile/kde.js
183
184
		# patches taken from http://www.rosenauer.org/hg/mozilla
185
		epatch "${FILESDIR}"/mozilla-kde-24.1.1.patch
186
		epatch "${FILESDIR}"/firefox-kde-24.1.1.patch
187
#		epatch "${FILESDIR}"/mozilla-nongnome-proxies.patch
188
189
		# Replace wrong binary path from mozilla-kde.patch
190
		sed -i 's/usr\/lib\/mozilla\/kmozillahelper/usr\/bin\/kmozillahelper/' toolkit/xre/nsKDEUtils.cpp || die
191
192
		# Replace wrong desktop file name from firefox-kde.patch
193
		sed -i '/BrowserApplication/ s/MozillaFirefox/firefox/' browser/components/preferences/advanced.js || die
194
	fi
195
160
	# Ensure that our plugins dir is enabled as default
196
	# Ensure that our plugins dir is enabled as default
161
	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
197
	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
162
		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
198
		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"

Return to bug 493722