From 0c3bf935a80f3c299fbdb23bd88870390ad8549f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Fri, 23 Oct 2015 06:31:26 +0200
Subject: [PATCH] thunderbird: cleanup template

---
 srcpkgs/thunderbird/template | 56 +-----------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 05c8d58e7fb..e1f5783e34d 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -36,58 +36,6 @@ pre_configure() {
 	[ ! -d xbps-build ] && mkdir -p xbps-build
 }
 
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CFLAGS="${XBPS_CFLAGS}"
-		export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
-		export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr -I${XBPS_CROSS_BASE}/usr/include/nss"
-		export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr -I${XBPS_CROSS_BASE}/usr/include/nss"
-
-		cross_args+=" --target=$XBPS_CROSS_TRIPLET"
-	fi
-
-	export ac_cv_sqlite_secure_delete=yes
-	export ac_cv_sqlite_threadsafe=yes
-	export ac_cv_sqlite_enable_fts3=yes
-	export ac_cv_sqlite_enable_unlock_notify=yes
-	export ac_cv_prog_hostcxx_works=1
-
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols
-		# XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html
-		cross_args+=" --enable-gold=no"
-		;;
-	esac
-
-	mkdir -p /usr/lib/thunderbird
-	export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
-
-	cd xbps-build
-	# disable --with-system-libvpx for now
-	# disable --enable-gstreamer for now
-	SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \
-		--with-system-nspr --with-system-nss --with-system-bz2  \
-		--with-system-jpeg --with-system-zlib --without-system-png \
-		--with-system-libevent --enable-system-cairo  \
-		--enable-system-pixman --enable-system-hunspell --enable-system-sqlite \
-		--enable-system-ffi --enable-startup-notification --disable-gio \
-		--with-pthreads --enable-official-branding --enable-safe-browsing \
-		--disable-skia --disable-debug --disable-gnomevfs --disable-gconf \
-		--disable-crashreporter --disable-updater --disable-xprint --disable-tests \
-		--disable-mochitest --disable-installer --disable-elf-hack \
-		--with-system-icu --enable-pulseaudio --disable-gstreamer \
-		--disable-crashreporter --disable-cpp-exceptions --disable-javaxpcom \
-		--with-nspr-prefix=${XBPS_CROSS_BASE}/usr \
-		--with-nss-prefix=${XBPS_CROSS_BASE}/usr ${cross_args} \
-		--enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \
-		--disable-static --disable-jemalloc --enable-pie \
-		--disable-profiling --disable-profilelocking \
-		--enable-application=mail
-}
-do_build() {
-	cd xbps-build
-	SHELL=/bin/bash make ${makejobs}
-}
 do_configure() {
 	local cross_args
 
@@ -100,7 +48,6 @@ do_configure() {
 		;;
 	esac
 
-	# FIXME really needed ?
 	if [ "$CROSS_BUILD" ]; then
 		cross_args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc"
 
@@ -133,8 +80,7 @@ do_configure() {
 		--enable-application=mail \
 		--with-system-nspr --with-system-nss --with-system-bz2  \
 		--with-system-jpeg --with-system-zlib --without-system-png \
-		--with-system-libevent --with-system-libvpx \
-		--enable-system-cairo  \
+		--with-system-libevent --with-system-libvpx --enable-system-cairo  \
 		--enable-system-pixman --enable-system-hunspell --enable-system-sqlite \
 		--enable-system-ffi --enable-startup-notification --enable-gio \
 		--with-pthreads --enable-official-branding --enable-safe-browsing \