Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a0ec456c9f00dbfbd5b42c05d2ec64db42627f4

commit 3a0ec456c9f00dbfbd5b42c05d2ec64db42627f4
Author: crazy <cr...@frugalware.org>
Date:   Fri Jul 2 16:04:59 2010 +0200

thunderbird-3.1-1-x86_64
* Version bump
* added libpng14 patch

diff --git a/source/xapps/thunderbird/FrugalBuild 
b/source/xapps/thunderbird/FrugalBuild
index 850f4bc..9251919 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -3,12 +3,12 @@
# Contributor: Krisztian VASAS <i...@frugalware.org>

pkgname=thunderbird
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.1
+pkgrel=1
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/";
-depends=('alsa-lib' 'curl' 'cairo>=1.8.10-2' 'dbus-glib' 'gtk+2>=2.20.0-2' 
'libpng>=1.4.1' 'nss>=3.12' \
-       'nspr>=4.7.1' 'pango>=1.28.0-2' 'wireless_tools' 'libstdc++' 
'libxt>=1.0.5' 'libidl' 'sqlite3>=3.6.23.1')
+depends=('alsa-lib' 'curl' 'cairo>=1.8.10-2' 'dbus-glib' 'gtk+2>=2.20.0-2' 
'libpng>=1.4.1' 'nss>=3.12.6' \
+       'nspr>=4.8.4' 'pango>=1.28.0-2' 'wireless_tools' 'libstdc++' 
'libxt>=1.0.5' 'libidl' 'sqlite3>=3.6.23.1' 'libnotify')
makedepends=('zip')
groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
@@ -16,15 +16,15 @@ options=('scriptlet')
up2date="Flastarchive 
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest/source 
'\.source\.tar\.bz2'"
source=(http://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
 \
$pkgname.desktop \
-       mozilla-gcc44.patch \
thunderbird-locale.patch \
-       thunderbird-shared-error.patch)
+       thunderbird-shared-error.patch \
+       libpng14.patch)
signatures=("${source[0]}.asc" '' '' '' '')

build()
{
-       #unset MAKEFLAGS
-       Fcd comm-1.9.1
+       unset MAKEFLAGS
+       Fcd comm-1.9.*

## and again > -Os broken weird .. use -Os here *again*
export CFLAGS="${cfla...@]/-O2/-Os}"
@@ -76,7 +76,6 @@ build()
--enable-system-sqlite \
--enable-xft \
--enable-xsl \
-               --enable-xterm-updates \
--with-distribution-id=Frugalware \
--with-pthreads \
--with-system-bz2 \
diff --git a/source/xapps/thunderbird/libpng14.patch 
b/source/xapps/thunderbird/libpng14.patch
new file mode 100644
index 0000000..1dc0ecd
--- /dev/null
+++ b/source/xapps/thunderbird/libpng14.patch
@@ -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)
diff --git a/source/xapps/thunderbird/mozilla-gcc44.patch 
b/source/xapps/thunderbird/mozilla-gcc44.patch
deleted file mode 100644
index adbeabf..0000000
--- a/source/xapps/thunderbird/mozilla-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 
mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.orig
   2009-06-10 00:17:41.000000000 +0200
-+++ 
mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
        2009-06-10 00:17:52.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdio.h>
-
- #include <cassert>
- #include <cstdlib>
---- 
mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.orig
  2009-06-10 00:18:06.000000000 +0200
-+++ 
mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
       2009-06-10 00:18:19.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <cstdlib>
- #include <ctime>
- #include <string.h>
-+#include <stdio.h>
-
- #include "common/linux/file_id.h"
- #include "client/linux/handler/linux_thread.h"
---- 
mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.orig
        2009-06-10 00:15:23.000000000 +0200
-+++ 
mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc  
   2009-06-10 00:16:06.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <functional>
- #include <vector>
- #include <string.h>
-+#include <stdio.h>
-
- #include "common/linux/dump_symbols.h"
- #include "common/linux/file_id.h"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to