Attachment #225451 for bug #311141

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





NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"

XUL_PV="1.9.2.2"
MAJ_XUL_PV="1.9.2"
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
DESKTOP_PV="3.6.2"
LANGPACK_PV="3.6"
MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
FIREFOX_PN="mozilla-firefox"
FIREFOX_P="${FIREFOX_PN}-${PV}"

LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="+alsa java libnotify system-sqlite wifi"

SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.xz
	mirror://gnu/gnuzilla/${MY_PV}/privacy_ext.xpi
	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"

for X in ${LANGS} ; do
	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
		SRC_URI="${SRC_URI}
			linguas_${X/-/_}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
	fi
	IUSE="${IUSE} linguas_${X/-/_}"
	# english is handled internally
	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
		if [ "${X}" != "en-US" ]; then
			SRC_URI="${SRC_URI}
				linguas_${X%%-*}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
		fi
		IUSE="${IUSE} linguas_${X%%-*}"
	fi

}

src_unpack() {
	xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - ||
	die "Unpacking icecat-${MY_PV}.tar.xz failed"

	xpi_unpack privacy_ext.xpi || die "Unpacking privacy_ext.xpi failed"

	linguas
	for X in ${linguas}; do

}

src_prepare() {
	# Integrate rebranding
	sed -i "s|/mozilla-firefox|/icecat|" \
		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch

	# Fix preferences location
	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"


	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"

	# Fix prefs
	#epatch "${DISTDIR}/icecat-3.6-prefs.patch"

	# Fix rebranding
	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in

}

src_compile() {
	mkdir -p dist/idl
	ln -s ../../xpcom/base/nsISupports.idl dist/idl
	ln -s ../../xpcom/base/nsrootidl.idl dist/idl
	ln -s ../../netwerk/mime/public/nsIMIMEInfo.idl dist/idl
	ln -s ../../dom/interfaces/sidebar/nsIWebContentHandlerRegistrar.idl dist/idl
	ln -s ../../editor/txmgr/idl/nsITransactionManager.idl dist/idl
	ln -s ../../editor/txmgr/idl/nsITransaction.idl dist/idl
	ln -s ../../editor/txmgr/idl/nsITransactionList.idl dist/idl
	ln -s ../../editor/txmgr/idl/nsITransactionListener.idl dist/idl
	ln -s ../.././toolkit/components/exthelper/extIApplication.idl dist/idl

	# Should the build use multiprocessing? Not enabled by default, as it tends to break
	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
	emake ${jobs} || die

	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}

	# Enable very specific settings not inherited from xulrunner
	#cp "${FILESDIR}"/firefox-default-prefs.js \
	#	"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
	#	die "failed to cp icecat-default-prefs.js"

	# Plugins dir
	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}-${DESKTOP_PV}"/plugins \
		|| die "failed to symlink"
}


Return to bug 311141

Lines 14-23 Link Here

(-)/usr/portage/www-client/icecat/icecat-3.6-r1.ebuild (-17 / +28 lines)
14		14
15	NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"	15	NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
16		16
17	XUL_PV="1.9.2"	17	XUL_PV="1.9.2.2"
18	MAJ_XUL_PV="1.9.2"	18	MAJ_XUL_PV="1.9.2"
19	MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff	19	MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
20	DESKTOP_PV="3.6"	20	DESKTOP_PV="3.6.2"
		21	LANGPACK_PV="3.6"
21	MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI	22	MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
22	FIREFOX_PN="mozilla-firefox"	23	FIREFOX_PN="mozilla-firefox"
23	FIREFOX_P="${FIREFOX_PN}-${PV}"	24	FIREFOX_P="${FIREFOX_PN}-${PV}"
Lines 31-52 Link Here
31	LICENSE="\|\| ( MPL-1.1 GPL-2 LGPL-2.1 )"	32	LICENSE="\|\| ( MPL-1.1 GPL-2 LGPL-2.1 )"
32	IUSE="+alsa java libnotify system-sqlite wifi"	33	IUSE="+alsa java libnotify system-sqlite wifi"
33		34
34	SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2	35	SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.xz
35	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2	36	mirror://gnu/gnuzilla/${MY_PV}/privacy_ext.xpi
36	http://svn.savannah.gnu.org/viewvc/trunk/icecat/browser/app/profile/firefox.js?root=gnuzilla&r1=86&r2=94&view=patch -> icecat-3.6-prefs.patch"	37	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
37	LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"	38	LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
38		39
39	for X in ${LANGS} ; do	40	for X in ${LANGS} ; do
40	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then	41	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
41	SRC_URI="${SRC_URI}	42	SRC_URI="${SRC_URI}
42	linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"	43	linguas_${X/-/_}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
43	fi	44	fi
44	IUSE="${IUSE} linguas_${X/-/_}"	45	IUSE="${IUSE} linguas_${X/-/_}"
45	# english is handled internally	46	# english is handled internally
46	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then	47	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
47	if [ "${X}" != "en-US" ]; then	48	if [ "${X}" != "en-US" ]; then
48	SRC_URI="${SRC_URI}	49	SRC_URI="${SRC_URI}
49	linguas_${X%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"	50	linguas_${X%%-*}? ( ${LANGPACK_URI}/${LANGPACK_PV}/${X}.xpi -> ${P}-${X}.xpi )"
50	fi	51	fi
51	IUSE="${IUSE} linguas_${X%%-*}"	52	IUSE="${IUSE} linguas_${X%%-*}"
52	fi	53	fi
Lines 96-102 Link Here
96	}	97	}
97		98
98	src_unpack() {	99	src_unpack() {
99	unpack icecat-${MY_PV}.tar.bz2 ${PATCH}.tar.bz2	100	xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" \| tar xof - \|\|
		101	die "Unpacking icecat-${MY_PV}.tar.xz failed"
		102
		103	xpi_unpack privacy_ext.xpi \|\| die "Unpacking privacy_ext.xpi failed"
100		104
101	linguas	105	linguas
102	for X in ${linguas}; do	106	for X in ${linguas}; do
Lines 106-115 Link Here
106	}	110	}
107		111
108	src_prepare() {	112	src_prepare() {
109	# Integrate rebranding
110	sed -i "s\|/mozilla-firefox\|/icecat\|" \
111	"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
112
113	# Fix preferences location	113	# Fix preferences location
114	sed -i 's\|defaults/pref/\|defaults/preferences/\|' browser/installer/packages-static \|\| die "sed failed"	114	sed -i 's\|defaults/pref/\|defaults/preferences/\|' browser/installer/packages-static \|\| die "sed failed"
115		115
Lines 122-128 Link Here
122	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"	122	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"
123		123
124	# Fix prefs	124	# Fix prefs
125	epatch "${DISTDIR}/icecat-3.6-prefs.patch"	125	#epatch "${DISTDIR}/icecat-3.6-prefs.patch"
126		126
127	# Fix rebranding	127	# Fix rebranding
128	sed -i 's\|\$(DIST)/bin/firefox\|\$(DIST)/bin/icecat\|' browser/app/Makefile.in	128	sed -i 's\|\$(DIST)/bin/firefox\|\$(DIST)/bin/icecat\|' browser/app/Makefile.in
Lines 221-226 Link Here
221	}	221	}
222		222
223	src_compile() {	223	src_compile() {
		224	mkdir -p dist/idl
		225	ln -s ../../xpcom/base/nsISupports.idl dist/idl
		226	ln -s ../../xpcom/base/nsrootidl.idl dist/idl
		227	ln -s ../../netwerk/mime/public/nsIMIMEInfo.idl dist/idl
		228	ln -s ../../dom/interfaces/sidebar/nsIWebContentHandlerRegistrar.idl dist/idl
		229	ln -s ../../editor/txmgr/idl/nsITransactionManager.idl dist/idl
		230	ln -s ../../editor/txmgr/idl/nsITransaction.idl dist/idl
		231	ln -s ../../editor/txmgr/idl/nsITransactionList.idl dist/idl
		232	ln -s ../../editor/txmgr/idl/nsITransactionListener.idl dist/idl
		233	ln -s ../.././toolkit/components/exthelper/extIApplication.idl dist/idl
		234
224	# Should the build use multiprocessing? Not enabled by default, as it tends to break	235	# Should the build use multiprocessing? Not enabled by default, as it tends to break
225	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} \|\| jobs="-j1"	236	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} \|\| jobs="-j1"
226	emake ${jobs} \|\| die	237	emake ${jobs} \|\| die
Lines 248-259 Link Here
248	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}	259	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
249		260
250	# Enable very specific settings not inherited from xulrunner	261	# Enable very specific settings not inherited from xulrunner
251	cp "${FILESDIR}"/firefox-default-prefs.js \	262	#cp "${FILESDIR}"/firefox-default-prefs.js \
252	"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" \|\| \	263	# "${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" \|\| \
253	die "failed to cp icecat-default-prefs.js"	264	# die "failed to cp icecat-default-prefs.js"
254		265
255	# Plugins dir	266	# Plugins dir
256	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \	267	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}-${DESKTOP_PV}"/plugins \
257	\|\| die "failed to symlink"	268	\|\| die "failed to symlink"
258	}	269	}
259		270