[Frugalware-git] frugalware-current: thunderbird-6.0-1-i686 * version bump * removed useless patches

[Devil505]

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

commit 70fd1586a11390cf3c81dd668b5dc1c8ee1cd769
Author: Devil505 <devil505linux at gmail.com>
Date:   Wed Aug 17 10:16:54 2011 +0200

thunderbird-6.0-1-i686
* version bump
* removed useless patches

diff --git a/source/xapps/thunderbird/0583d58b20a3.patch b/source/xapps/thunderbird/0583d58b20a3.patch
deleted file mode 100644
index 6775d1a..0000000
--- a/source/xapps/thunderbird/0583d58b20a3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla at 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 27e9b8a..e31cb3d 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Krisztian VASAS <iron at frugalware.org>

pkgname=thunderbird
-pkgver=5.0
+pkgver=6.0
pkgrel=1
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/"
@@ -17,15 +17,16 @@ up2date="Flastarchive http://releases.mozilla.org/pub/mozilla.org/thunderbird/re
source=(http://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 \
$pkgname.desktop \
thunderbird-locale.patch \
-	thunderbird-appversion.patch \
-	0583d58b20a3.patch \
mozconfig)
-signatures=("${source[0]}.asc" '' '' '' '' '')
+sha1sums=('7a9ea62aa11522230327574b245a2f793015b5f4' \
+          '1c10547ed6e098308358e4717e4fcbe9c3afc979' \
+          '84cc67671e9fa4dc660590eed21be54a2af06720' \
+          'b9cb47facbaa910fa83f003e6c02a45bdb7930df')

build()
{
unset MAKEFLAGS
-	Fcd comm-miramar
+	Fcd comm-release

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

diff --git a/source/xapps/thunderbird/thunderbird-appversion.patch b/source/xapps/thunderbird/thunderbird-appversion.patch
deleted file mode 100644
index 2824e32..0000000
--- a/source/xapps/thunderbird/thunderbird-appversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in
---- comm-1.9.2.orig/mail/installer/Makefile.in	2010-04-30 22:41:37.000000000 +0300
-+++ comm-1.9.2/mail/installer/Makefile.in	2010-05-05 20:20:29.551660469 +0300
-@@ -42,6 +42,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+MOZ_APP_VERSION="5.0"
-+
- include $(topsrcdir)/config/rules.mk
-
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in