Bump to 1.7.3 for security bug 63996. This ebuild uses the libart_lgpl distribution from the 1.7.2 tarball for mozsvg support.

4 files changed, 352 insertions, 40 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index a2d7e95e2567..5d36fb1c139e 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.197 2004/09/09 17:31:32 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.198 2004/09/15 12:07:41 agriffis Exp $
+
+*mozilla-1.7.3 (15 Sep 2004)
+
+  15 Sep 2004; <agriffis@gentoo.org> +mozilla-1.7.3.ebuild:
+  Bump to 1.7.3 for security bug 63996. This ebuild uses the libart_lgpl
+  distribution from the 1.7.2 tarball for mozsvg support.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> mozilla-1.6-r1.ebuild:
   Switch to use epause and ebeep, bug #62950
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 3774d9971d52..0e2a5ecf8e96 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,55 +1,47 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 baa134bede50138e28948993fbeb2624 mozilla-1.7-r1.ebuild 16621
-MD5 97f84c7168c47ee8c805612c5a251a01 ChangeLog 34082
-MD5 b21a98f72ae26996e2ddf64d38d42de5 mozilla-1.6-r1.ebuild 16982
-MD5 d6835f4202cbb8aaff05ca8e28063adb mozilla-1.7.2-r1.ebuild 8878
-MD5 fc2a1870cb1140a500a9608fe5720d20 mozilla-1.7.ebuild 16478
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 7c90e1ccb807e874f4bfa5796d3c513d mozilla-1.6-r1.ebuild 16979
+MD5 f47c59f1354a6113c4de6e45e44ba30f mozilla-1.7-r1.ebuild 16620
+MD5 02d2b00677bf0387e3c81602246a433c ChangeLog 34305
+MD5 5eae32e695a14a47a70b88966b970073 mozilla-1.7.3.ebuild 8829
+MD5 a23d3e172001806e13e31eb4f2f1d16d mozilla-1.7.2-r1.ebuild 8874
+MD5 8bc779882c701cf85c17869d399a4886 mozilla-1.7.ebuild 16477
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
+MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7-r1 204
 MD5 01b356d7ff1afde7e091ed10b251b940 files/digest-mozilla-1.7.2-r1 204
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
-MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7-r1 204
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460
-MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
-MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
 MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
-MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
-MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
-MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
-MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
+MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445
+MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3 281
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
 MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
+MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBPMjULLFUmVNQ7rkRAqz6AJ9jdbjGcQ/qt5+IlW+frS3kMeJ5/QCggTsH
-zt908BoI5yc4238kUICE6qQ=
-=sNED
------END PGP SIGNATURE-----
diff --git a/net-www/mozilla/files/digest-mozilla-1.7.3 b/net-www/mozilla/files/digest-mozilla-1.7.3
new file mode 100644
index 000000000000..ee9991bbd682
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-1.7.3
@@ -0,0 +1,4 @@
+MD5 15cb68da1d58f055f871b77ff655df77 mozilla-source-1.7.3.tar.bz2 29716200
+MD5 47ed5962d3d18f5792f805eff706cfbd mozilla-1.7.2-libart_lgpl.tar.bz2 102117
+MD5 0109af0c56b20f8dfd7f3bb080b4a148 ipc-1.0.8.tar.gz 102374
+MD5 52bf78d1976478fb7bb485b7754d13ff enigmail-0.86.0.tar.gz 327816
diff --git a/net-www/mozilla/mozilla-1.7.3.ebuild b/net-www/mozilla/mozilla-1.7.3.ebuild
new file mode 100644
index 000000000000..d6b977a491e7
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.7.3.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3.ebuild,v 1.1 2004/09/15 12:07:41 agriffis Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozilla makeedit
+
+IUSE="java crypt gtk2 ssl"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} mozcalendar moznoirc moznomail moznocompose moznoxft"
+
+EMVER="0.86.0"
+IPCVER="1.0.8"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a} 	# handle alpha
+MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2
+	mirror://gentoo/mozilla-1.7.2-libart_lgpl.tar.bz2
+	crypt? ( !moznomail? (
+		http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz
+		http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+	) )"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="java? ( virtual/jre )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl"
+
+S="${WORKDIR}/mozilla"
+
+src_unpack() {
+	typeset x
+
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# Fix logic error when using RAW target
+	# <azarah@gentoo.org> (23 Feb 2003)
+	epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+	WANT_AUTOCONF_2_1=1 autoconf || die
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die
+			cd ${S}/extensions/${x} || die
+			makemake	# from mozilla.eclass
+		done
+
+		# Fix mozilla-specific ipc-1.0.7 compilation problem
+		# (07 Aug 2004 agriffis)
+		cd ${S}
+		epatch ${FILESDIR}/ipc-1.0.7-nsPipeChannel.patch || die
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	####################################
+	#
+	# myconf, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	# mozilla_conf comes from mozilla.eclass
+	mozilla_conf
+
+	myconf="${myconf} \
+		--prefix=/usr/lib/mozilla \
+		--with-default-mozilla-five-home=/usr/lib/mozilla"
+
+	####################################
+	#
+	#  Configure and build Mozilla
+	#
+	####################################
+
+	./configure ${myconf} || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build Mozilla NSS
+	#
+	####################################
+
+	# Build the NSS/SSL support
+	if use ssl; then
+		einfo "Building Mozilla NSS..."
+
+		# Fix #include problem
+		cd ${S}/security/coreconf || die "cd coreconf failed"
+		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+			>>headers.mk
+		emake -j1 || die "make security headers failed"
+
+		cd ${S}/security/nss || die "cd nss failed"
+		emake -j1 moz_import || die "make moz_import failed"
+		emake -j1 || die "make nss failed"
+	fi
+
+	####################################
+	#
+	#  Build Enigmail plugin
+	#
+	####################################
+
+	# Build the enigmail plugin
+	if use crypt && ! use moznomail; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		emake || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		emake || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	# Install, don't create tarball
+	dodir /usr/lib
+	cd ${S}/xpinstall/packager
+	einfo "Installing mozilla into build root..."
+	make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die
+	mv -f ${S}/dist/mozilla ${D}/usr/lib/mozilla
+
+	einfo "Installing includes and idl files..."
+	# Copy the include and idl files
+	dodir /usr/lib/mozilla/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}/usr/lib/mozilla/include
+	cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+	dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+	# Install the development tools in /usr
+	dodir /usr/bin
+	mv ${D}/usr/lib/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+	# Install the NSS/SSL libs, headers and tools
+	if use ssl; then
+		einfo "Installing Mozilla NSS..."
+		# Install the headers ('make install' do not work for headers ...)
+		insinto /usr/lib/mozilla/include/nss
+		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+		# These come with zlib ...
+		rm -f ${D}/usr/lib/mozilla/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die
+		# Gets installed as symbolic links ...
+		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/lib/mozilla
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	cd ${S}/build/unix
+	# Fix mozilla-config and install it
+	perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
+	perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
+	exeinto /usr/lib/mozilla
+	doexe mozilla-config
+	# Fix pkgconfig files and install them
+	insinto /usr/lib/pkgconfig
+	for x in *.pc; do
+		if [[ -f ${x} ]]; then
+			perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
+			perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
+			doins ${x}
+		fi
+	done
+	cd ${S}
+
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla
+	insinto /etc/env.d
+	doins ${FILESDIR}/10mozilla
+	dodoc LEGAL LICENSE README/mozilla/README*
+
+	# Install rebuild script
+	exeinto /usr/lib/mozilla/
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+	# Move plugins dir
+	src_mv_plugins /usr/lib/mozilla/plugins
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto /usr/lib/mozilla/searchplugins
+	doins ${FILESDIR}/google.src
+
+	if [[ -f "${WORKDIR}/.xft" ]]; then
+		# We are using Xft, so change the default font
+		insinto /usr/lib/mozilla/defaults/pref
+		doins ${FILESDIR}/xft.js
+	fi
+
+	# Fix icons to look the same everywhere
+	insinto /usr/lib/mozilla/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozilla-icon.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozilla.desktop
+
+	# Take care of non root execution
+	# (seems the problem is that not all files are readible by the user)
+	einfo "Fixing Permissions..."
+	chmod -R g+r,o+r ${D}/usr/lib/mozilla
+	find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+	# Move old plugins dir
+	pkg_mv_plugins /usr/lib/mozilla/plugins
+
+	if true; then
+		# Remove entire installed instance to solve various problems,
+		# for example see bug 27719
+		rm -rf ${ROOT}/usr/lib/mozilla
+	else
+		# Stale components and chrome files break when unmerging old
+		rm -rf ${ROOT}/usr/lib/mozilla/components
+		rm -rf ${ROOT}/usr/lib/mozilla/chrome
+
+		# Remove stale component registry.
+		rm -f ${ROOT}/usr/lib/mozilla/component.reg
+		rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+
+		# Make sure these are removed.
+		rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \;
+
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	# Regenerate component.reg in case some things changed
+	if [[ -e ${ROOT}/usr/lib/mozilla/regxpcom ]]; then
+		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
+
+		if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+			# Fix directory permissions
+			find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
+			# Fix permissions on chrome files
+			find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+		fi
+	fi
+
+	update_mozilla_launcher_symlinks
+}