[arch-commits] Commit in thunderbird/trunk (3 files)
Date: Thursday, October 18, 2018 @ 06:38:18
Author: anthraxx
Revision: 336816
upgpkg: thunderbird 60.2.1-1
Added:
thunderbird/trunk/thunderbird-60.2.1-buildfix.patch
Modified:
thunderbird/trunk/PKGBUILD
Deleted:
thunderbird/trunk/bz1482248.patch
---+
PKGBUILD | 16 +
bz1482248.patch | 28
thunderbird-60.2.1-buildfix.patch | 42
3 files changed, 48 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-17 22:57:33 UTC (rev 336815)
+++ PKGBUILD2018-10-18 06:38:18 UTC (rev 336816)
@@ -5,8 +5,8 @@
# Contributor: Anders Bostrom
pkgname=thunderbird
-pkgver=60.0
-pkgrel=4
+pkgver=60.2.1
+pkgrel=1
pkgdesc="Standalone mail and news reader from mozilla.org"
arch=(x86_64)
license=(MPL GPL LGPL)
@@ -19,10 +19,10 @@
options=(!emptydirs !makeflags)
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
$pkgname.desktop
-bz1482248.patch)
-sha256sums=('bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056'
+thunderbird-60.2.1-buildfix.patch)
+sha256sums=('d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf'
'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
-'8d944e6f5b8935843da1acb3c7b2670b217cd7ce7501738e02354b8702857aaa')
+'884c5a6742677c83173812f7abb1e409a2b13371ba6079c4cb69b3e95010de05')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -81,11 +81,7 @@
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
END
-
- cd comm
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482248
- patch -p1 -i "$srcdir/bz1482248.patch"
-
+ patch -Np1 < ../thunderbird-60.2.1-buildfix.patch
}
build() {
Deleted: bz1482248.patch
===
--- bz1482248.patch 2018-10-17 22:57:33 UTC (rev 336815)
+++ bz1482248.patch 2018-10-18 06:38:18 UTC (rev 336816)
@@ -1,28 +0,0 @@
-
-diff --git a/mailnews/local/src/nsMsgLocalStoreUtils.cpp
b/mailnews/local/src/nsMsgLocalStoreUtils.cpp
a/mailnews/local/src/nsMsgLocalStoreUtils.cpp
-+++ b/mailnews/local/src/nsMsgLocalStoreUtils.cpp
-@@ -23,16 +23,19 @@ nsMsgLocalStoreUtils::AddDirectorySepara
- path->GetLeafName(leafName);
- leafName.AppendLiteral(FOLDER_SUFFIX);
- return path->SetLeafName(leafName);
- }
-
- bool
- nsMsgLocalStoreUtils::nsShouldIgnoreFile(nsAString& name)
- {
-+ if (name.IsEmpty())
-+return true;
-+
- char16_t firstChar = name.First();
- if (firstChar == '.' || firstChar == '#' ||
- name.CharAt(name.Length() - 1) == '~')
- return true;
-
- if (name.LowerCaseEqualsLiteral("msgfilterrules.dat") ||
- name.LowerCaseEqualsLiteral("rules.dat") ||
- name.LowerCaseEqualsLiteral("filterlog.html") ||
-
-
-
-
Added: thunderbird-60.2.1-buildfix.patch
===
--- thunderbird-60.2.1-buildfix.patch (rev 0)
+++ thunderbird-60.2.1-buildfix.patch 2018-10-18 06:38:18 UTC (rev 336816)
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User Chris Manchester
+# Date 1533063488 25200
+# Node ID bc651d3d910cbc0730d870c5436b29ddc01fef10
+# Parent e9dd9434ad9ac15284429d904a45e4daf567c03b
+Bug 1479540 - Accept "triplet" strings with only two parts in moz.configure.
r=froydnj, a=jcristau
+
+MozReview-Commit-ID: 7pFhoJgBMhQ
+
+diff --git a/build/moz.configure/init.configure
b/build/moz.configure/init.configure
+--- a/build/moz.configure/init.configure
b/build/moz.configure/init.configure
+@@ -586,17 +586,26 @@ option('--target', nargs=1,
+ @imports(_from='__builtin__', _import='KeyError')
+ @imports(_from='__builtin__', _import='ValueError')
+ def split_triplet(triplet, allow_unknown=False):
+ # The standard triplet is defined as
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+-cpu, manufacturer, os = triplet.split('-', 2)
++# Additionally, some may omit "unknown" when the manufacturer
++# is not specified and emit
++# CPU_TYPE-OPERATING_SYSTEM
++parts = triplet.split('-', 2)
++if len(parts) == 3:
++cpu, _, os = parts
++elif len(parts) == 2:
++cpu, os = parts
++else:
++die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
+ # use, so we've had our own, different,
[arch-commits] Commit in thunderbird/trunk (3 files)
Date: Saturday, April 18, 2015 @ 19:55:07
Author: foutrelis
Revision: 237402
upgpkg: thunderbird 31.6.0-2
- libvpx 1.4.0 rebuild.
- Drop patch that accepts p11-kit's trust stores; nss 3.18-3 uses the
same token label as libnssckbi.
Added:
thunderbird/trunk/thunderbird-31.6.0-libvpx-modern.patch
Modified:
thunderbird/trunk/PKGBUILD
Deleted:
thunderbird/trunk/rhbz-966424.patch
+
PKGBUILD | 18 +-
rhbz-966424.patch | 23 ---
thunderbird-31.6.0-libvpx-modern.patch | 25 +
3 files changed, 34 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-18 11:37:26 UTC (rev 237401)
+++ PKGBUILD2015-04-18 17:55:07 UTC (rev 237402)
@@ -6,7 +6,7 @@
pkgname=thunderbird
pkgver=31.6.0
-pkgrel=1
+pkgrel=2
pkgdesc=Standalone Mail/News reader
arch=('i686' 'x86_64')
license=('MPL' 'GPL')
@@ -19,8 +19,8 @@
mozconfig
thunderbird.desktop
thunderbird-install-dir.patch
-vendor.js
-rhbz-966424.patch)
+thunderbird-31.6.0-libvpx-modern.patch
+vendor.js)
options=(!emptydirs)
sha256sums=('ccbf8cbb740bc1b30ecf4fe39aab226607f9a41e23a07e994c508a90e8b70508'
'SKIP'
@@ -27,19 +27,19 @@
'7021a0907ebaffec7cad2928a773d8a0763a9790b9b97b58f72fad52e981296b'
'3fba13d88aeb003ab0811ef739463858172ce0662a1c7d62835df3d83ddbb8fb'
'9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
-'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed'
-'746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+'0e67b4d46f330b0306e01d4c6876ae5a58a4de6ac50f057e23aac41dec3554ef'
+'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
prepare() {
cd comm-esr31
- patch -Np1 -i $srcdir/thunderbird-install-dir.patch
+ patch -Np1 -i ../thunderbird-install-dir.patch
+ # Fix build with libvpx 1.4.0 (patch from Fedora)
+ patch -Np1 -i ../thunderbird-31.6.0-libvpx-modern.patch
+
cp $srcdir/mozconfig .mozconfig
- # https://bugs.archlinux.org/task/41689
- patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
sed -i '/ac_cpp=/s/$CPPFLAGS/ -O2/' mozilla/configure
Deleted: rhbz-966424.patch
===
--- rhbz-966424.patch 2015-04-18 11:37:26 UTC (rev 237401)
+++ rhbz-966424.patch 2015-04-18 17:55:07 UTC (rev 237402)
@@ -1,23 +0,0 @@
a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
- issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
- var tokenNames = issuerCert.getAllTokenNames({});
-
- if (!tokenNames || !tokenNames.some(isBuiltinToken))
- throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
-
- function isBuiltinToken(tokenName) {
-- return tokenName == Builtin Object Token;
-+ return tokenName == Builtin Object Token ||
-+ tokenName == Default Trust ||
-+ tokenName == System Trust;
- }
-
- /**
- * This class implements nsIBadCertListener. Its job is to prevent bad cert
- * security dialogs from being shown to the user. It is better to simply fail
- * if the certificate is bad. See bug 304286.
- *
- * @param aAllowNonBuiltInCerts (optional)
Added: thunderbird-31.6.0-libvpx-modern.patch
===
--- thunderbird-31.6.0-libvpx-modern.patch (rev 0)
+++ thunderbird-31.6.0-libvpx-modern.patch 2015-04-18 17:55:07 UTC (rev
237402)
@@ -0,0 +1,25 @@
+diff -up
comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern
comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+---
comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern
2015-04-07 14:30:05.525960513 -0400
comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
2015-04-07 14:32:22.478199058 -0400
+@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid
+ // Creating a wrapper to the image - setting image data to NULL. Actual
+ // pointer will be set in encode. Setting align to 1, as it is meaningless
+ // (actual memory is not allocated).
+- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+ 1, NULL);
+ // populate encoder configuration with default values
+ if
[arch-commits] Commit in thunderbird/trunk (3 files)
Date: Tuesday, July 22, 2014 @ 10:58:49
Author: foutrelis
Revision: 217724
upgpkg: thunderbird 31.0-1
New upstream release.
Modified:
thunderbird/trunk/PKGBUILD
thunderbird/trunk/mozconfig
thunderbird/trunk/thunderbird-install-dir.patch
---+
PKGBUILD | 18 ++--
mozconfig |1
thunderbird-install-dir.patch | 58 +++-
3 files changed, 27 insertions(+), 50 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-22 08:57:57 UTC (rev 217723)
+++ PKGBUILD2014-07-22 08:58:49 UTC (rev 217724)
@@ -5,7 +5,7 @@
# Contributor: Anders Bostrom anders.bost...@home.se
pkgname=thunderbird
-pkgver=24.6.0
+pkgver=31.0
pkgrel=1
pkgdesc=Standalone Mail/News reader
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
license=('MPL' 'GPL')
url=http://www.mozilla.org/thunderbird/;
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2'
'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types'
'mozilla-common' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13')
+makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse')
optdepends=('libcanberra: for sound support')
install=thunderbird.install
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2{,.asc}
@@ -21,15 +21,15 @@
thunderbird-install-dir.patch
vendor.js)
options=(!emptydirs)
-sha256sums=('ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea'
+sha256sums=('571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4'
'SKIP'
-'d8844a988b660d40732d4694104d38dd5e8924a987d79247f9651e52fe9e4516'
+'7af6c21413ff48b5b30ca6987781b639deac2c3ea3f4b9261c8e71132daecd29'
'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e'
-'929a7ceca0e90d0635a2099b7df24033e865fb5b5b8c5824468c4561c21c377d'
+'9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed')
prepare() {
- cd comm-esr24
+ cd comm-esr31
patch -Np1 -i $srcdir/thunderbird-install-dir.patch
cp $srcdir/mozconfig .mozconfig
@@ -40,7 +40,7 @@
}
build() {
- cd comm-esr24
+ cd comm-esr31
export LDFLAGS=$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird
export PYTHON=/usr/bin/python2
@@ -49,7 +49,7 @@
}
package() {
- cd comm-esr24
+ cd comm-esr31
make -j1 -f client.mk DESTDIR=$pkgdir install
install -Dm644 $srcdir/vendor.js
$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js
@@ -67,5 +67,5 @@
ln -sf /usr/share/hyphen $pkgdir/usr/lib/thunderbird/hyphenation
# We don't want the development stuff
- rm -r $pkgdir/usr/{include,lib/thunderbird-devel,share/idl}
+ rm -r $pkgdir/usr/{include,lib/thunderbird-devel-*,share/idl}
}
Modified: mozconfig
===
--- mozconfig 2014-07-22 08:57:57 UTC (rev 217723)
+++ mozconfig 2014-07-22 08:58:49 UTC (rev 217724)
@@ -33,6 +33,7 @@
ac_add_options --disable-tests
ac_add_options --disable-mochitest
ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
# Optimization
ac_add_options --enable-optimize
Modified: thunderbird-install-dir.patch
===
--- thunderbird-install-dir.patch 2014-07-22 08:57:57 UTC (rev 217723)
+++ thunderbird-install-dir.patch 2014-07-22 08:58:49 UTC (rev 217724)
@@ -1,47 +1,23 @@
-diff -upr comm-release.orig/config/baseconfig.mk
comm-release/config/baseconfig.mk
comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.0
+0200
-+++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.0 +0200
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
-
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk
+--- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.0
+0300
comm-esr31/config/baseconfig.mk2014-07-22 09:46:30.0 +0300
+@@ -1,6 +1,6 @@
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZDEPTH =
[arch-commits] Commit in thunderbird/trunk (3 files)
Date: Saturday, December 24, 2011 @ 07:00:02
Author: ibiru
Revision: 145619
update to 9.0.1
Added:
thunderbird/trunk/vendor.js
Modified:
thunderbird/trunk/PKGBUILD
Deleted:
thunderbird/trunk/thunderbird-3.0-lang.patch
+
PKGBUILD | 15 ---
thunderbird-3.0-lang.patch | 11 ---
vendor.js |9 +
3 files changed, 17 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-24 05:53:53 UTC (rev 145618)
+++ PKGBUILD2011-12-24 12:00:02 UTC (rev 145619)
@@ -4,7 +4,7 @@
# Contributor: Anders Bostrom anders.bost...@home.se
pkgname=thunderbird
-pkgver=9.0
+pkgver=9.0.1
pkgrel=1
pkgdesc=Standalone Mail/News reader
arch=('i686' 'x86_64')
@@ -17,17 +17,16 @@
source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
mozconfig
thunderbird.desktop
-thunderbird-3.0-lang.patch
-thunderbird-install-dir.patch)
-md5sums=('681bdf6362945b59b2bec23f8aecc7e7'
+thunderbird-install-dir.patch
+vendor.js)
+md5sums=('a5904751dbd33074682b438b732fdbab'
'ca98c2bf1017b33e19dae22fdcef2e73'
'af3e5b344d2edf1c7d61bb0a5a96de9a'
- '25b6fe16ac24cd5c852213e5c1adb272'
- 'aea906acf72c43dd82ead2fabcc1c6db')
+ 'aea906acf72c43dd82ead2fabcc1c6db'
+ '5a53179d14ae9631b7afe5e4d0fc0b25')
build() {
cd $srcdir/comm-release
- patch -Np1 -i $srcdir/thunderbird-3.0-lang.patch
patch -Np1 -i $srcdir/thunderbird-install-dir.patch
cp $srcdir/mozconfig .mozconfig
@@ -42,6 +41,8 @@
cd $srcdir/comm-release
make -j1 -f client.mk DESTDIR=$pkgdir install
+ install -m644 $srcdir/vendor.js
$pkgdir/usr/lib/thunderbird/defaults/pref/
+
for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png
Deleted: thunderbird-3.0-lang.patch
===
--- thunderbird-3.0-lang.patch 2011-12-24 05:53:53 UTC (rev 145618)
+++ thunderbird-3.0-lang.patch 2011-12-24 12:00:02 UTC (rev 145619)
@@ -1,11 +0,0 @@
comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11
02:12:44.0 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16
02:56:45.0 +0200
-@@ -890,7 +890,7 @@
- pref(intl.charset.detector,
chrome://global/locale/intl.properties);
- pref(intl.charset.default,
chrome://global-platform/locale/intl.properties);
- pref(intl.ellipsis,
chrome://global-platform/locale/intl.properties);
--pref(intl.locale.matchOS, false);
-+pref(intl.locale.matchOS, true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro,
trademark, smartquotes)
- // for ISO-8859-1
Added: vendor.js
===
--- vendor.js (rev 0)
+++ vendor.js 2011-12-24 12:00:02 UTC (rev 145619)
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref(intl.locale.matchOS, true);
+
+// Disable default mailer checking.
+pref(mail.shell.checkDefaultMail, false);
+
+// Don't disable our bundled extensions in the application directory
+pref(extensions.autoDisableScopes, 11);
+pref(extensions.shownSelectionUI, true);
[arch-commits] Commit in thunderbird/trunk (3 files)
Date: Tuesday, November 8, 2011 @ 09:45:04
Author: ibiru
Revision: 142320
update to 8.0
Added:
thunderbird/trunk/thunderbird-install-dir.patch
Modified:
thunderbird/trunk/PKGBUILD
thunderbird/trunk/mozconfig
---+
PKGBUILD | 43 +---
mozconfig | 41 +-
thunderbird-install-dir.patch | 42 +++
3 files changed, 84 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-08 12:37:04 UTC (rev 142319)
+++ PKGBUILD2011-11-08 14:45:04 UTC (rev 142320)
@@ -2,55 +2,58 @@
# Contributor: Alexander Baldeck alexan...@archlinux.org
# Contributor: Dale Blount d...@archlinux.org
# Contributor: Anders Bostrom anders.bost...@home.se
+
pkgname=thunderbird
-pkgver=7.0.1
+pkgver=8.0
pkgrel=1
pkgdesc=Standalone Mail/News reader
arch=('i686' 'x86_64')
license=('MPL' 'GPL')
url=http://www.mozilla.org/thunderbird/;
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib'
'dbus-glib' 'hunspell' 'sqlite3=3.7.4' 'desktop-file-utils' 'libnotify'
'libevent' 'hicolor-icon-theme')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2'
'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt'
'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools'
'yasm' 'mesa')
optdepends=('libcanberra: for sound support')
install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
mozconfig
thunderbird.desktop
-thunderbird-3.0-lang.patch)
-md5sums=('ad177fe5202deabda44882ff5c871f1b'
- 'a53394cfe721b5ff743ae2918fab2798'
+thunderbird-3.0-lang.patch
+thunderbird-install-dir.patch)
+md5sums=('332f60036aebdce7dec6ee2b1af4941d'
+ 'ca98c2bf1017b33e19dae22fdcef2e73'
'af3e5b344d2edf1c7d61bb0a5a96de9a'
- '25b6fe16ac24cd5c852213e5c1adb272')
+ '25b6fe16ac24cd5c852213e5c1adb272'
+ 'aea906acf72c43dd82ead2fabcc1c6db')
build() {
- cd ${srcdir}/comm-release
- patch -Np1 -i ${srcdir}/thunderbird-3.0-lang.patch
+ cd $srcdir/comm-release
+ patch -Np1 -i $srcdir/thunderbird-3.0-lang.patch
+ patch -Np1 -i $srcdir/thunderbird-install-dir.patch
- cp ${srcdir}/mozconfig .mozconfig
+ cp $srcdir/mozconfig .mozconfig
- export LDFLAGS=-Wl,-rpath,/usr/lib/thunderbird-${pkgver}
-Wl,-O1,--sort-common,--hash-style=gnu,--as-needed
+ export LDFLAGS=$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird
export PYTHON=/usr/bin/python2
make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
}
package() {
- cd ${srcdir}/comm-release
- make -j1 -f client.mk DESTDIR=${pkgdir} install
+ cd $srcdir/comm-release
+ make -j1 -f client.mk DESTDIR=$pkgdir install
for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png
done
- install -Dm644 ${srcdir}/thunderbird.desktop \
- ${pkgdir}/usr/share/applications/thunderbird.desktop
+ install -Dm644 $srcdir/thunderbird.desktop \
+ $pkgdir/usr/share/applications/thunderbird.desktop
- rm -rf ${pkgdir}/usr/lib/thunderbird-${pkgver}/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell
${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries
- ln -sf /usr/share/hyphen
${pkgdir}/usr/lib/thunderbird-${pkgver}/hyphenation
+ rm -rf $pkgdir/usr/lib/thunderbird/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell $pkgdir/usr/lib/thunderbird/dictionaries
+ ln -sf /usr/share/hyphen $pkgdir/usr/lib/thunderbird/hyphenation
# We don't want the development stuff
- rm -r ${pkgdir}/usr/{include,lib/thunderbird-devel-${pkgver},share/idl}
+ rm -r $pkgdir/usr/{include,lib/thunderbird-devel,share/idl}
}
-
Modified: mozconfig
===
--- mozconfig 2011-11-08 12:37:04 UTC (rev 142319)
+++ mozconfig 2011-11-08 14:45:04 UTC (rev 142320)
@@ -4,40 +4,37 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+# System libraries
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
ac_add_options --with-system-png
-ac_add_options --with-system-mng
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --with-system-libevent
+ac_add_options
