jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

thunderbird: update to 31.0.

Browse source
This commit is contained in:
Enno Boland 2014-07-23 17:54:33 +02:00
parent f732e3aa93
commit 5c7a725b0e
2 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
srcpkgs/thunderbird/patches/thunderbird-install-dir.patch
View file

@ -1,8 +1,6 @@
--- config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 --- config/baseconfig.mk.orig 2014-07-23 17:41:26.898090299 +0200
+++ config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 +++ config/baseconfig.mk 2014-07-23 17:43:06.407093842 +0200
@@ -1,9 +1,9 @@ @@ -1,7 +1,7 @@
INCLUDED_AUTOCONF_MK = 1
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@ -14,11 +12,12 @@
MOZILLA_SRCDIR = $(topsrcdir)/mozilla MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZDEPTH = $(DEPTH)/mozilla MOZDEPTH = $(DEPTH)/mozilla
DIST = $(MOZDEPTH)/dist DIST = $(MOZDEPTH)/dist
--- mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 --- mozilla/config/baseconfig.mk.orig 2014-07-23 17:41:26.899090299 +0200
+++ mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 +++ mozilla/config/baseconfig.mk 2014-07-23 17:44:37.283097079 +0200
@@ -1,9 +1,9 @@ @@ -2,10 +2,10 @@
INCLUDED_AUTOCONF_MK = 1 # directly in python/mozbuild/mozbuild/base.py for gmake validation.
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
# whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@ -27,18 +26,6 @@
+idldir = $(datadir)/idl/$(MOZ_APP_NAME) +idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
DIST = $(DEPTH)/dist ifndef TOP_DIST
TOP_DIST = dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't endif
--- mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200
+++ mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200
@@ -1,7 +1,7 @@
INCLUDED_AUTOCONF_MK = 1
-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
ifneq (,$(filter /%,$(TOP_DIST)))
DIST = $(TOP_DIST)

20
srcpkgs/thunderbird/template
View file

@ -1,29 +1,29 @@
# Template build file for 'thunderbird'. # Template build file for 'thunderbird'.
pkgname=thunderbird pkgname=thunderbird
version=24.6.0 version=31.0
revision=1 revision=1
lib32disabled=yes lib32disabled=yes
wrksrc="comm-esr24" wrksrc="comm-esr${version/.*/}"
short_desc="Standalone Mail/News reader" short_desc="Standalone Mail/News reader"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.mozilla.org/thunderbird/" homepage="http://www.mozilla.org/thunderbird/"
license="MPL-1.1, GPL-2, LGPL-2.1" license="MPL-1.1, GPL-2, LGPL-2.1"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
checksum=ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea checksum=571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4
hostmakedepends="unzip zip perl python yasm pkg-config" hostmakedepends="unzip zip perl python yasm pkg-config"
makedepends="python-devel cairo-devel libjpeg-turbo-devel makedepends="python-devel cairo-devel libjpeg-turbo-devel pixman-devel
pixman-devel nss-devel>=3.15.4 sqlite-devel libXrender-devel nss-devel>=3.15.4 sqlite-devel libXrender-devel gtk+-devel libevent-devel
gtk+-devel libevent-devel libvpx-devel hunspell-devel>=1.3.2 libvpx-devel hunspell-devel>=1.3.2 startup-notification-devel dbus-glib-devel
startup-notification-devel dbus-glib-devel alsa-lib-devel alsa-lib-devel wireless_tools-devel libXScrnSaver-devel libSM-devel libXt-devel
wireless_tools-devel libXScrnSaver-devel libSM-devel libXt-devel" pulseaudio-devel"
depends="desktop-file-utils hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme"
do_build() { do_build() {
cp -f ${FILESDIR}/mozconfig .mozconfig cp -f ${FILESDIR}/mozconfig .mozconfig
export LDFLAGS="-Wl,-R/usr/lib/thunderbird" export LDFLAGS="-Wl,-R/usr/lib/thunderbird"
SHELL=/bin/bash make ${makejobs} -f client.mk MOZ_MAKE_FLAGS="${makejobs}" SHELL=/bin/bash make ${makejobs} -f client.mk build MOZ_MAKE_FLAGS="${makejobs}"
} }
do_install() { do_install() {