[arch-commits] Commit in thunderbird/trunk (3 files)
Ionut Biru
ibiru at archlinux.org
Tue Nov 8 14:45:04 UTC 2011
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
===================================================================
--- PKGBUILD 2011-11-08 12:37:04 UTC (rev 142319)
+++ PKGBUILD 2011-11-08 14:45:04 UTC (rev 142320)
@@ -2,55 +2,58 @@
# Contributor: Alexander Baldeck <alexander at archlinux.org>
# Contributor: Dale Blount <dale at archlinux.org>
# Contributor: Anders Bostrom <anders.bostrom at 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 --enable-system-ffi
ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --disable-xprint
-ac_add_options --disable-pedantic
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-xft
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
ac_add_options --enable-gio
+
ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
-export BUILD_OFFICIAL=1
+# Optimization
+ac_add_options --enable-optimize
+
export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
Added: thunderbird-install-dir.patch
===================================================================
--- thunderbird-install-dir.patch (rev 0)
+++ thunderbird-install-dir.patch 2011-11-08 14:45:04 UTC (rev 142320)
@@ -0,0 +1,42 @@
+diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
+--- comm-beta.orig/config/autoconf.mk.in 2011-11-06 14:39:51.064983780 +0000
++++ comm-beta/config/autoconf.mk.in 2011-11-06 14:42:57.216735333 +0000
+@@ -65,8 +65,8 @@
+ mandir = @mandir@
+ 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)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
+diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/config/autoconf.mk.in 2011-11-06 14:39:41.771562967 +0000
++++ comm-beta/mozilla/config/autoconf.mk.in 2011-11-06 14:44:18.404165515 +0000
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ 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)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:39:48.014955070 +0000
++++ comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:44:32.977635875 +0000
+@@ -61,8 +61,8 @@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
More information about the arch-commits
mailing list