Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba4c97b9901674e5af2415f59f890a4b6c416a8f

commit ba4c97b9901674e5af2415f59f890a4b6c416a8f
Author: Michel Hermier <herm...@frugalware.org>
Date:   Tue Jul 5 20:12:10 2011 +0200

thunderbird-5.0-1-i686

* Bump version.
* Adress all the reclamation to devil505, I don't take the paternity for
this horrible FB.

diff --git a/source/xapps/thunderbird/0583d58b20a3.patch 
b/source/xapps/thunderbird/0583d58b20a3.patch
new file mode 100644
index 0000000..6775d1a
--- /dev/null
+++ b/source/xapps/thunderbird/0583d58b20a3.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozi...@glandium.org>
+# Date 1302680663 -7200
+# Node ID 0583d58b20a3a0789c46f19ed505cb6e96602ec9
+# Parent  0138798a072ad15edce15d614923a03256946218
+Bug 644692 - Fix bsdiff build failure with system bzip2. r=ted
+
+diff --git a/other-licenses/bsdiff/Makefile.in 
b/other-licenses/bsdiff/Makefile.in
+--- mozilla/other-licenses/bsdiff/Makefile.in
++++ mosilla/other-licenses/bsdiff/Makefile.in
+@@ -43,17 +43,21 @@ VPATH     = @srcdir@
+
+ include $(DEPTH)/config/autoconf.mk
+
+ # This program is output to dist/host/bin because it is only needed by the
+ # build system and is not intended to be included in Mozilla distributions.
+ HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
+ HOST_CSRCS = bsdiff.c
+
++ifdef MOZ_NATIVE_BZ2
++HOST_LIBS += $(BZ2_LIBS)
++else
+ HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
++endif
+
+ ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))
+ HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
+ endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/updater
+
+ include $(topsrcdir)/config/rules.mk
+
diff --git a/source/xapps/thunderbird/FrugalBuild 
b/source/xapps/thunderbird/FrugalBuild
index 9253688..ba944a1 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Krisztian VASAS <i...@frugalware.org>

pkgname=thunderbird
-pkgver=3.1.11
+pkgver=5.0
pkgrel=1
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/";
@@ -18,13 +18,14 @@ 
source=(http://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/so
$pkgname.desktop \
thunderbird-locale.patch \
thunderbird-appversion.patch \
+       0583d58b20a3.patch \
mozconfig)
-signatures=("${source[0]}.asc" '' '' '' '')
+signatures=("${source[0]}.asc" '' '' '' '' '')

build()
{
unset MAKEFLAGS
-       Fcd comm-1.9.*
+       Fcd comm-miramar

cp "$Fsrcdir/mozconfig" .mozconfig || Fdie

@@ -35,11 +36,10 @@ build()
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1

-       # Let jars get compressed.
-       Fsed '\-0' '\-9' mozilla/config/make-jars.pl
-
Fpatchall

+       Fsed '#include <curl/types.h>' '' 
mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || Fdie

make -j1 -f client.mk DESTDIR="$Fdestdir" install || Fdie
diff --git a/source/xapps/thunderbird/mozconfig 
b/source/xapps/thunderbird/mozconfig
index fb307cc..237c467 100644
--- a/source/xapps/thunderbird/mozconfig
+++ b/source/xapps/thunderbird/mozconfig
@@ -1,5 +1,9 @@
mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options         --disable-accessibility
+
+ac_add_options --with-default-mozilla-five-home=/usr
+ac_add_options --prefix=/usr
+
+ac_add_options --disable-accessibility
ac_add_options --disable-activex
ac_add_options --disable-activex-scripting
ac_add_options --disable-calendar
@@ -7,7 +11,6 @@ ac_add_options --disable-debug
ac_add_options --disable-dtd-debug
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
-ac_add_options --disable-jsd
ac_add_options --disable-logging
ac_add_options --disable-optimize
ac_add_options --disable-pedantic
@@ -26,6 +29,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --enable-image-decoders=all
ac_add_options --enable-image-encoders=all
ac_add_options --enable-ipv6
+ac_add_options --enable-jsd
ac_add_options --enable-necko-protocols=all
ac_add_options --enable-pango
ac_add_options --enable-reorder
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to