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

2020-12-14 Thread Levente Polyak via arch-commits 
Date: Monday, December 14, 2020 @ 22:36:24
  Author: anthraxx
Revision: 404329

upgpkg: thunderbird 78.5.1-1: enable system addons and rust 1.48 compat

System addon sideloading isn't of a concern in our case, lets just allow
it and make system packages for localization work.

Added:
  thunderbird/trunk/thunderbird-78.5-rust-1.48.patch
Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig.cfg
Deleted:
  thunderbird/trunk/thunderbird-78.4.3-gpgme-double-armored-fix.patch

---+
 PKGBUILD  |  120 
 mozconfig.cfg |4 
 thunderbird-78.4.3-gpgme-double-armored-fix.patch |   62 
 thunderbird-78.5-rust-1.48.patch  | 3941 
 4 files changed, 4005 insertions(+), 122 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 404328:404329 to see the changes.

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

2017-10-12 Thread Jan Steffens 
Date: Thursday, October 12, 2017 @ 18:43:53
  Author: heftig
Revision: 307782

52.4.0-1

Added:
  
thunderbird/trunk/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
Modified:
  thunderbird/trunk/PKGBUILD
Deleted:
  thunderbird/trunk/clip-ft-glyph-52esr.diff
  thunderbird/trunk/harmony-fix.diff

-+
 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch |   48 +++
 PKGBUILD|   47 +--
 clip-ft-glyph-52esr.diff|  147 
--
 harmony-fix.diff|   16 -
 4 files changed, 69 insertions(+), 189 deletions(-)

Added: 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
===
--- 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch 
(rev 0)
+++ 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch 
2017-10-12 18:43:53 UTC (rev 307782)
@@ -0,0 +1,48 @@
+From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
+From: Ralph Giles 
+Date: Fri, 10 Feb 2017 12:58:18 -0800
+Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
+
+We use the cheddar crate to generate a C header file
+for our mp4parse_capi wrapper crate. Currently we
+do this at code check-in time via update-rust.sh.
+
+Cargo 0.18 and later will try to execute a build.rs
+file in the crate source tree regardless of whether
+it's specified in Cargo.toml so patching out that
+line just results in 'crate cheddar not found'.
+
+This change restores the old behaviour by substituting
+a 'build = false' line instead.
+
+We do have syntex vendored, but we don't currently build
+it by default, so I prefer this solution to just vendoring
+cheddar and generating the header at build time. The syntex
+crate is quite large and adds significantly to our compile
+time.
+
+MozReview-Commit-ID: InJRRODWAdP
+
+--HG--
+extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
+---
+ media/libstagefright/binding/mp4parse-cargo.patch | 5 +++--
+ media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml 
b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee947151a27c..d7e3f55119d3f4b6 100644
+--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
 b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+@@ -18,6 +18,8 @@ exclude = [
+   "*.mp4",
+ ]
+ 
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
+-- 
+2.12.2
+

Modified: PKGBUILD
===
--- PKGBUILD2017-10-12 18:22:43 UTC (rev 307781)
+++ PKGBUILD2017-10-12 18:43:53 UTC (rev 307782)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Jan Alexander Steffens (heftig) 
 # Contributor: Ionut Biru 
 # Contributor: Alexander Baldeck 
 # Contributor: Dale Blount 
@@ -6,8 +6,8 @@
 # Contributor: Anders Bostrom 
 
 pkgname=thunderbird
-pkgver=52.3.0
-pkgrel=2
+pkgver=52.4.0
+pkgrel=1
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
@@ -15,22 +15,21 @@
 depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types 
dbus-glib alsa-lib ffmpeg
  nss hunspell sqlite ttf-font icu libvpx)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse 
inetutils xorg-server-xvfb
- autoconf2.13 rust)
+ autoconf2.13 rust clang llvm)
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
 
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
-thunderbird.desktop
-clip-ft-glyph-52esr.diff harmony-fix.diff glibc-2.26-fix.diff
-thunderbird-install-dir.patch no-crmf.diff rust-i686.patch 
fix-wifi-scanner.diff)
-sha256sums=('050acc320a9c50365a53e4faa6538a0ad7f9a302d5f2cfb6edf0c6fe1b573b18'
-'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
-'dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a'
-'16bb776e9f3039321db747b2eaece0cda1320f3711fb853a68d67247b0aa065d'
-'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
-'24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
+0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+no-crmf.diff rust-i686.patch glibc-2.26-fix.diff fix-wifi-scanner.diff
+$pkgname.desktop

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

2017-09-18 Thread Jan Steffens 
Date: Monday, September 18, 2017 @ 17:56:49
  Author: heftig
Revision: 305820

52.3.0-2

Added:
  thunderbird/trunk/clip-ft-glyph-52esr.diff
  thunderbird/trunk/glibc-2.26-fix.diff
  thunderbird/trunk/harmony-fix.diff
Modified:
  thunderbird/trunk/PKGBUILD

--+
 PKGBUILD |   21 ++-
 clip-ft-glyph-52esr.diff |  147 +
 glibc-2.26-fix.diff  |  258 +
 harmony-fix.diff |   16 ++
 4 files changed, 437 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-18 16:47:14 UTC (rev 305819)
+++ PKGBUILD2017-09-18 17:56:49 UTC (rev 305820)
@@ -7,7 +7,7 @@
 
 pkgname=thunderbird
 pkgver=52.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
@@ -15,14 +15,18 @@
 depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types 
dbus-glib alsa-lib ffmpeg
  nss hunspell sqlite ttf-font icu libvpx)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse 
inetutils xorg-server-xvfb
- autoconf2.13 cargo)
+ autoconf2.13 rust)
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
 
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
 thunderbird.desktop
+clip-ft-glyph-52esr.diff harmony-fix.diff glibc-2.26-fix.diff
 thunderbird-install-dir.patch no-crmf.diff rust-i686.patch 
fix-wifi-scanner.diff)
 sha256sums=('050acc320a9c50365a53e4faa6538a0ad7f9a302d5f2cfb6edf0c6fe1b573b18'
 'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
+'dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a'
+'16bb776e9f3039321db747b2eaece0cda1320f3711fb853a68d67247b0aa065d'
+'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
 '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
 'a7317caba56e89932bd9e3b9352d94701dd9a419685057f238b1ded8dc0adcd7'
 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
@@ -50,9 +54,19 @@
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i ../no-crmf.diff
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1385667
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1394149
+  patch -d mozilla/toolkit/crashreporter/google-breakpad/src/client -Np4 < 
../glibc-2.26-fix.diff
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
   patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1393467
+  patch -d mozilla -Np1 < ../clip-ft-glyph-52esr.diff
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1400721
+  patch -d mozilla -Np1 < ../harmony-fix.diff
+
   # Build with the rust targets we actually ship
   patch -d mozilla -Np1 < ../rust-i686.patch
 
@@ -108,9 +122,6 @@
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
-
   export PATH="$srcdir/path:$PATH"
 
   # Do PGO

Added: clip-ft-glyph-52esr.diff
===
--- clip-ft-glyph-52esr.diff(rev 0)
+++ clip-ft-glyph-52esr.diff2017-09-18 17:56:49 UTC (rev 305820)
@@ -0,0 +1,147 @@
+# HG changeset patch
+# User Lee Salzman 
+# Date 1504640559 14400
+#  Tue Sep 05 15:42:39 2017 -0400
+# Node ID 923246286b9858fb103e100f886c03714b97b5ec
+# Parent  3fff2b174212af40a7b7ba75a047db431f81c780
+clip FreeType glyph bitmap to mask in Skia (52 ESR)
+
+diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp 
b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
+--- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
 b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
+@@ -350,58 +350,118 @@ void SkScalerContext_FreeType_Base::gene
+ const SkMatrix& bitmapTransform)
+ {
+ const bool doBGR = SkToBool(fRec.fFlags & 
SkScalerContext::kLCD_BGROrder_Flag);
+ const bool doVert = SkToBool(fRec.fFlags & 
SkScalerContext::kLCD_Vertical_Flag);
+ 
+ switch ( face->glyph->format ) {
+ case FT_GLYPH_FORMAT_OUTLINE: {
+ FT_Outline* outline = >glyph->outline;
+-FT_BBox bbox;
+-FT_Bitmap   target;
+ 
+ int dx = 0, dy = 0;
+ if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
+ dx = SkFixedToFDot6(glyph.getSubXFixed());
+ dy = SkFixedToFDot6(glyph.getSubYFixed());
+ // negate dy since freetype-y-goes-up and skia-y-goes-down
+ dy = -dy;
+ }
+-FT_Outline_Get_CBox(outline, );
+-/*
+-what we really want to do for subpixel is
+-

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

2012-04-25 Thread Ionut Biru 
Date: Wednesday, April 25, 2012 @ 04:44:38
  Author: ibiru
Revision: 157168

update to 12.0

Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/clrf.patch
  thunderbird/trunk/gcc47.patch
Deleted:
  thunderbird/trunk/libvpx.patch

--+
 PKGBUILD |   15 +++
 clrf.patch   |  114 -
 gcc47.patch  |   46 +--
 libvpx.patch |   12 --
 4 files changed, 74 insertions(+), 113 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-25 07:53:13 UTC (rev 157167)
+++ PKGBUILD2012-04-25 08:44:38 UTC (rev 157168)
@@ -5,8 +5,8 @@
 # Contributor: Anders Bostrom anders.bost...@home.se
 
 pkgname=thunderbird
-pkgver=11.0.1
-pkgrel=2
+pkgver=12.0
+pkgrel=1
 pkgdesc=Standalone Mail/News reader
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -20,24 +20,21 @@
 thunderbird.desktop
 thunderbird-install-dir.patch
 vendor.js
-libvpx.patch
 gcc47.patch
 clrf.patch)
-md5sums=('b500560a006cb10194281263c78841f2'
+md5sums=('7b30b72472a65bce74ba0ae60e4d4e6c'
  '41511a6bcdd04cf56706218e4670e631'
  'af3e5b344d2edf1c7d61bb0a5a96de9a'
  'aea906acf72c43dd82ead2fabcc1c6db'
  '5a53179d14ae9631b7afe5e4d0fc0b25'
- '5b2aaff7dfe7f1f94ad965905b20e782'
- '07b255039a2ffbcab5b5be7986245e36'
- '5c8d79a9f1ecadffa818205ce1c23f2f')
+ '1e3ad86899c61f0993c429d10913edb4'
+ 'abe8f73faa71ea2a1e4c6f5a33f56c27')
 
 build() {
   cd $srcdir/comm-release
   patch -Np1 -i $srcdir/thunderbird-install-dir.patch
-  patch -Np1 -i $srcdir/libvpx.patch
   patch -Np1 -i $srcdir/gcc47.patch
-  patch -Np2 -i $srcdir/clrf.patch
+  patch -Np1 -i $srcdir/clrf.patch
 
   cp $srcdir/mozconfig .mozconfig
 

Modified: clrf.patch
===
--- clrf.patch  2012-04-25 07:53:13 UTC (rev 157167)
+++ clrf.patch  2012-04-25 08:44:38 UTC (rev 157168)
@@ -1,7 +1,7 @@
-diff -up 
thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867
 thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
 
thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp.733867
   2012-03-13 03:37:12.0 +0100
-+++ 
thunderbird-11.0/comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp   
   2012-03-16 07:20:29.299342799 +0100
-@@ -688,7 +688,7 @@ nsresult nsMsgSearchAdapter::EncodeImapV
+diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 
comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+--- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp  
2012-04-25 01:09:10.468804374 +
 comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp   
2012-04-25 01:09:45.928528202 +
+@@ -688,7 +688,7 @@
  PL_strcat(encoding, {);
  lengthStr.AppendInt((PRInt32) strlen(value));
  PL_strcat(encoding, lengthStr.get());
@@ -10,10 +10,10 @@
  PL_strcat(encoding, value);
  return NS_OK;
}
-diff -up 
thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 
thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
 
thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp.733867 
   2012-03-13 03:37:13.0 +0100
-+++ thunderbird-11.0/comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp   
2012-03-16 07:20:29.300342735 +0100
-@@ -753,7 +753,7 @@ nsFolderCompactState::OnDataAvailable(ns
+diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 
comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp   
2012-04-25 01:09:10.475470988 +
 comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp2012-04-25 
01:09:45.928528202 +
+@@ -758,7 +758,7 @@
}
  }
}
@@ -22,7 +22,7 @@
  
 // if status offset isn't in the first block, this code won't work. 
There's no good reason
// for the status offset not to be at the beginning of the message 
anyway.
-@@ -1203,7 +1203,7 @@ nsOfflineStoreCompactState::OnDataAvaila
+@@ -1216,7 +1216,7 @@
  // check if there's an envelope header; if not, write one.
  if (strncmp(m_dataBuffer, From , 5))
  {
@@ -31,19 +31,19 @@
m_offlineMsgSize += bytesWritten;
  }
}
-diff -up 
thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867 
thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
 
thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp.733867
   2012-03-13 03:37:13.0 +0100
-+++ thunderbird-11.0/comm-release/mailnews/compose/src/nsSmtpProtocol.cpp  
2012-03-16 07:23:01.225877457 +0100
-@@ -1722,7 +1722,7 @@ PRInt32 nsSmtpProtocol::SendQuit()
+diff -Nur

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

2011-04-29 Thread Ionut Biru 
Date: Friday, April 29, 2011 @ 12:46:22
  Author: ibiru
Revision: 121234

update to 3.1.10

Added:
  thunderbird/trunk/gcc46.patch
Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/mozconfig
  thunderbird/trunk/thunderbird.install

-+
 PKGBUILD|   32 +++-
 gcc46.patch |   12 
 mozconfig   |   13 ++---
 thunderbird.install |1 +
 4 files changed, 38 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-29 16:46:13 UTC (rev 121233)
+++ PKGBUILD2011-04-29 16:46:22 UTC (rev 121234)
@@ -3,14 +3,14 @@
 # Contributor: Dale Blount d...@archlinux.org
 # Contributor: Anders Bostrom anders.bost...@home.se
 pkgname=thunderbird
-pkgver=3.1.9
-pkgrel=2
+pkgver=3.1.10
+pkgrel=1
 pkgdesc=Standalone Mail/News reader
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url=http://www.mozilla.org/projects/thunderbird;
-depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 
'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3=3.7.4' 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 
'wireless_tools' 'autoconf2.13')
+depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 
'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3=3.7.4' 'desktop-file-utils' 
'libnotify')
+makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 
'autoconf2.13')
 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
@@ -19,35 +19,33 @@
 thunderbird-3.0-lang.patch
 thunderbird-appversion.patch
 thunderbird-shared-error.patch
-thunderbird-preferences.patch
 xulrunner-png14.patch
 python2.7.patch
-mozilla-notify.patch)
-md5sums=('e6917c419d3aaa8083a1d4b53fb80d8c'
- 'c1551d308480d241247c5662d8bebbcb'
+gcc46.patch)
+md5sums=('2a81f3ee7ea7acff0ee2eaee6574ea11'
+ '529d4caad3027116ab9e000438ca70fa'
  '37457073c7f6feeb86c053701d23197f'
  '25b6fe16ac24cd5c852213e5c1adb272'
  '48ffcdb877a69d383b7d354e330f7658'
  '3dca714ee8054634e6dfdb059464dc42'
- '1d4f9978e8228ace523b18a09cf41e4e'
  '989b15f6bc9e2e9233fe4c6b23f412b1'
  '78a4d0c920cbb8ec6a9a36974cd775ef'
- '7d411e5c7476e73d2a4419e41dad9f44')
+ 'a2bced1791fb8eca978d31b129f92a28')
 
 build() {
   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 -Np1 -i ${srcdir}/thunderbird-preferences.patch
+  patch -Np1 -i ${srcdir}/gcc46.patch
   patch -Np0 -i ${srcdir}/xulrunner-png14.patch
   patch -Np0 -i ${srcdir}/python2.7.patch
-  patch -Np1 -i ${srcdir}/mozilla-notify.patch
 
   cp ${srcdir}/mozconfig .mozconfig
   unset CXXFLAGS
   unset CFLAGS
 
+  export CXXFLAGS=-fpermissive
   export LDFLAGS=-Wl,-rpath,/usr/lib/thunderbird-3.1
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS=${MAKEFLAGS}
@@ -65,13 +63,13 @@
   rm -rf ${pkgdir}/usr/bin/defaults
 
   install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
 
-  install -m644 mail/branding/unofficial/mailicon48.png \
-   ${pkgdir}/usr/share/pixmaps/thunderbird.png
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+  install -d $pkgdir/usr/share/icons/hicolor/$i/apps
+  cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png 
$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png
+  done
 
-  install -m644 ${srcdir}/thunderbird.desktop \
-  ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/thunderbird.desktop 
${pkgdir}/usr/share/applications/
 
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
 }

Added: gcc46.patch
===
--- gcc46.patch (rev 0)
+++ gcc46.patch 2011-04-29 16:46:22 UTC (rev 121234)
@@ -0,0 +1,12 @@
+diff -Nur comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc 
comm-1.9.2/mozilla/gfx/ots/src/os2.cc
+--- comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc2011-04-14 
11:37:21.0 -0700
 comm-1.9.2/mozilla/gfx/ots/src/os2.cc  2011-04-29 09:10:23.635807433 
-0700
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include cstddef
++
+ #include os2.h
+ 
+ #include head.h

Modified: mozconfig
===
--- mozconfig   2011-04-29 16:46:13 UTC (rev 121233)
+++ mozconfig   2011-04-29 16:46:22 UTC (rev 121234)
@@ -21,14 +21,21 @@
 ac_add_options --enable-strip
 ac_add_options --enable-pango
 ac_add_options --enable-xft
-#disabled because of

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

2011-03-01 Thread Ionut Biru 
Date: Tuesday, March 1, 2011 @ 12:40:43
  Author: ibiru
Revision: 111885

upgpkg: thunderbird 3.1.8-1
update to 3.1.8. fixed integration with future application lookup from glib2 
2.28.

Added:
  thunderbird/trunk/thunderbird.install
Modified:
  thunderbird/trunk/PKGBUILD
  thunderbird/trunk/thunderbird-preferences.patch
  thunderbird/trunk/thunderbird.desktop

---+
 PKGBUILD  |   17 +++--
 thunderbird-preferences.patch |   12 ++--
 thunderbird.desktop   |3 +++
 thunderbird.install   |   11 +++
 4 files changed, 31 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-01 15:16:49 UTC (rev 111884)
+++ PKGBUILD2011-03-01 17:40:43 UTC (rev 111885)
@@ -3,15 +3,16 @@
 # Contributor: Dale Blount d...@archlinux.org
 # Contributor: Anders Bostrom anders.bost...@home.se
 pkgname=thunderbird
-pkgver=3.1.7
-pkgrel=3
+pkgver=3.1.8
+pkgrel=1
 pkgdesc=Standalone Mail/News reader
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
 url=http://www.mozilla.org/projects/thunderbird;
-depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 
'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3=3.7.4')
+depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 
'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3=3.7.4' 'desktop-file-utils')
 makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 
'wireless_tools' 'autoconf2.13')
 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
 mozconfig
 thunderbird.desktop
@@ -21,13 +22,13 @@
 thunderbird-preferences.patch
 xulrunner-png14.patch
 python2.7.patch)
-md5sums=('be64630152a2d5a824a76752594e7596'
+md5sums=('bb4564eba437adceb22292249d186e11'
  'c1551d308480d241247c5662d8bebbcb'
- '7a119d30341dca4eadecedd523404fdb'
+ '37457073c7f6feeb86c053701d23197f'
  '25b6fe16ac24cd5c852213e5c1adb272'
  '48ffcdb877a69d383b7d354e330f7658'
  '3dca714ee8054634e6dfdb059464dc42'
- 'fce17db6057c58a17ca1a02f31adef5a'
+ '1d4f9978e8228ace523b18a09cf41e4e'
  '989b15f6bc9e2e9233fe4c6b23f412b1'
  '78a4d0c920cbb8ec6a9a36974cd775ef')
 
@@ -47,6 +48,10 @@
   export LDFLAGS=-Wl,-rpath,/usr/lib/thunderbird-3.1
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS=${MAKEFLAGS}
+}
+
+package() {
+  cd ${srcdir}/comm-1.9.2
   make -j1 DESTDIR=${pkgdir} install
 
   #Remove included dictionaries, add symlink to system myspell path.

Modified: thunderbird-preferences.patch
===
--- thunderbird-preferences.patch   2011-03-01 15:16:49 UTC (rev 111884)
+++ thunderbird-preferences.patch   2011-03-01 17:40:43 UTC (rev 111885)
@@ -15,16 +15,16 @@
 +++ comm-1.9.2/mail/branding/nightly/thunderbird-branding.js   2010-06-25 
00:36:10.605569121 +0300
 @@ -1,11 +1,11 @@
  // Default start page
--pref(mailnews.start_page.url,http://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
-+pref(mailnews.start_page.url,http://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
+-pref(mailnews.start_page.url,https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
++pref(mailnews.start_page.url,https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
  
  // first launch welcome page
--pref(mailnews.start_page.welcome_url,http://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
-+pref(mailnews.start_page.welcome_url,http://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
+-pref(mailnews.start_page.welcome_url,https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
++pref(mailnews.start_page.welcome_url,https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
  
  // start page override to load after an update
--pref(mailnews.start_page.override_url,http://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
-+pref(mailnews.start_page.override_url,http://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);
+-pref(mailnews.start_page.override_url,https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%version=%VERSION%os=%OS%buildid=%APPBUILDID%;);

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

2010-06-24 Thread Ionut Biru 
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
===
--- PKGBUILD2010-06-24 13:42:52 UTC (rev 83958)
+++ PKGBUILD2010-06-24 19:07:29 UTC (rev 83959)
@@ -3,14 +3,14 @@
 # Contributor: Dale Blount d...@archlinux.org
 # Contributor: Anders Bostrom anders.bost...@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
===
---