[arch-commits] Commit in thunderbird/trunk (PKGBUILD libpng14.patch mozconfig)

[Ionut Biru]

    Date: Tuesday, March 30, 2010 @ 15:27:53
  Author: ibiru
Revision: 74330

upgpkg: thunderbird 3.0.4-1 update to 3.0.4, added disable-update, added libcanberra as optional dependency and removed libpng14 patch

Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig
Deleted:
  thunderbird/trunk/libpng14.patch

----------------+
 PKGBUILD       |   16 +++++++---------
 libpng14.patch |   12 ------------
 mozconfig      |    1 +
 3 files changed, 8 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-30 19:19:13 UTC (rev 74329)
+++ PKGBUILD	2010-03-30 19:27:53 UTC (rev 74330)
@@ -3,36 +3,34 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/projects/thunderbird"
 depends=('gtk2>=2.18.5' 'gcc-libs>=4.4' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'shared-mime-info' 'alsa-lib>=1.0.21.a' 'dbus-glib>=0.82')
-makedepends=('zip' 'pkgconfig' 'libgnomeui')
+makedepends=('zip' 'pkgconfig' 'libgnomeui' 'python')
+optdepends=('libcanberra: for sound support')
 options=('!makeflags')
 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-appversion.patch
-	thunderbird-shared-error.patch
-	libpng14.patch)
-md5sums=('89e759fd7a6ab0f1cb0d089d9c89f3ee'
-         'aacdcab7732af31a16cd4dc86665f4a3'
+	thunderbird-shared-error.patch)
+md5sums=('bb87ca7e62d5869422137765126798be'
+         'c459e9a8881183bb7b4bf9c20f019634'
          '7a119d30341dca4eadecedd523404fdb'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '2af84c5fa1095373e0b2b450fec0d655'
-         '3dca714ee8054634e6dfdb059464dc42'
-         '8868360dc354baa129c5a244cb840339')
+         '3dca714ee8054634e6dfdb059464dc42')
 
 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
-  patch -Np1 -i "${srcdir}/libpng14.patch" || return 1
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CXXFLAGS

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2010-03-30 19:19:13 UTC (rev 74329)
+++ libpng14.patch	2010-03-30 19:27:53 UTC (rev 74330)
@@ -1,12 +0,0 @@
-diff -Nur comm-1.9.1.orig/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp comm-1.9.1/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
---- comm-1.9.1.orig/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2009-12-05 03:56:19.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 18:34:32.000000000 +0200
-@@ -135,7 +135,7 @@
- 
-   // initialize
-   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                 png_voidp_NULL,
-+                                 NULL,
-                                  ErrorCallback,
-                                  ErrorCallback);
-   if (! mPNG)

Modified: mozconfig
===================================================================
--- mozconfig	2010-03-30 19:19:13 UTC (rev 74329)
+++ mozconfig	2010-03-30 19:27:53 UTC (rev 74330)
@@ -22,6 +22,7 @@
 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
 
 export BUILD_OFFICIAL=1