[arch-commits] Commit in thunderbird/trunk (4 files)

Ionut Biru ibiru at archlinux.org
Thu Jun 24 15:07:29 EDT 2010


    Date: Thursday, June 24, 2010 @ 15:07:29
  Author: ibiru
Revision: 83959

upgpkg: thunderbird 3.1-1
update to 3.1

Added:
  thunderbird/trunk/xulrunner-png14.patch
Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig
  thunderbird/trunk/thunderbird-appversion.patch

------------------------------+
 PKGBUILD                     |   42 +++++++++++++++++++++--------------------
 mozconfig                    |    7 +++---
 thunderbird-appversion.patch |   14 ++++++-------
 xulrunner-png14.patch        |   11 ++++++++++
 4 files changed, 44 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-24 13:42:52 UTC (rev 83958)
+++ PKGBUILD	2010-06-24 19:07:29 UTC (rev 83959)
@@ -3,14 +3,14 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=3.0.5
+pkgver=3.1
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/projects/thunderbird"
 depends=('gtk2>=2.20.1' 'gcc-libs>=4.5' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'shared-mime-info' 'alsa-lib>=1.0.23' 'dbus-glib>=0.82')
-makedepends=('zip' 'pkg-config' 'libgnomeui' 'python' 'libidl2')
+makedepends=('zip' 'pkg-config' 'libgnomeui' 'python' 'libidl2' 'wireless_tools')
 optdepends=('libcanberra: for sound support')
 options=('!makeflags')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
@@ -18,39 +18,41 @@
         thunderbird.desktop
         thunderbird-3.0-lang.patch
         thunderbird-appversion.patch
-        thunderbird-shared-error.patch)
-md5sums=('564911289b5d895ba5eaf4b3fbed51e8'
-         'c459e9a8881183bb7b4bf9c20f019634'
-         '7a119d30341dca4eadecedd523404fdb'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         '2af84c5fa1095373e0b2b450fec0d655'
-         '3dca714ee8054634e6dfdb059464dc42')
-
+        thunderbird-shared-error.patch
+        xulrunner-png14.patch)
 build() {
-  cd "${srcdir}/comm-1.9.1"
-  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" || return 1
-  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" || return 1
-  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" || return 1
+  cd "${srcdir}/comm-1.9.2"
+  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch"
+  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch"
+  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CXXFLAGS
   unset CFLAGS
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.0"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
 
-  make -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/bin/defaults"
 
   install -m755 -d "${pkgdir}/usr/share/applications"
   install -m755 -d "${pkgdir}/usr/share/pixmaps"
 
-  install -m644 "${srcdir}/comm-1.9.1/mail/branding/nightly/mailicon48.png" \
-      "${pkgdir}/usr/share/pixmaps/thunderbird.png" || return 1
+  install -m644 mail/branding/unofficial/mailicon48.png \
+  	"${pkgdir}/usr/share/pixmaps/thunderbird.png"
 
   install -m644 "${srcdir}/thunderbird.desktop" \
-      "${pkgdir}/usr/share/applications/" || return 1
+      "${pkgdir}/usr/share/applications/"
 
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
 }
+md5sums=('feb4d737d568066076879a09bd0d506e'
+         '44c6ce8e84c972c0a1795edd46d618cf'
+         '7a119d30341dca4eadecedd523404fdb'
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         '48ffcdb877a69d383b7d354e330f7658'
+         '3dca714ee8054634e6dfdb059464dc42'
+         '989b15f6bc9e2e9233fe4c6b23f412b1')

Modified: mozconfig
===================================================================
--- mozconfig	2010-06-24 13:42:52 UTC (rev 83958)
+++ mozconfig	2010-06-24 19:07:29 UTC (rev 83959)
@@ -11,9 +11,11 @@
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --disable-installer
-ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
 ac_add_options --disable-official-branding
 ac_add_options --disable-xprint
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-strip
 ac_add_options --enable-pango
 ac_add_options --enable-xft
@@ -21,9 +23,8 @@
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-optimize
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
 ac_add_options --prefix=/usr
+ac_add_options --with-branding=mail/branding/unofficial
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

Modified: thunderbird-appversion.patch
===================================================================
--- thunderbird-appversion.patch	2010-06-24 13:42:52 UTC (rev 83958)
+++ thunderbird-appversion.patch	2010-06-24 19:07:29 UTC (rev 83959)
@@ -1,12 +1,12 @@
-diff -Nur comm-1.9.1.orig/mail/installer/Makefile.in comm-1.9.1/mail/installer/Makefile.in
---- comm-1.9.1.orig/mail/installer/Makefile.in	2009-12-05 03:53:48.000000000 +0200
-+++ comm-1.9.1/mail/installer/Makefile.in	2010-01-17 18:14:54.000000000 +0200
+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="3.0"
++MOZ_APP_VERSION="3.1"
 +
- NO_PKG_FILES = \
- 	thunderbird-bin.elf \
- 	thunderbird-config \
+ include $(topsrcdir)/config/rules.mk
+ 
+ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in

Added: xulrunner-png14.patch
===================================================================
--- xulrunner-png14.patch	                        (rev 0)
+++ xulrunner-png14.patch	2010-06-24 19:07:29 UTC (rev 83959)
@@ -0,0 +1,11 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-01-17 00:15:53.979744638 +0100
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+ 
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)



More information about the arch-commits mailing list